Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.10.2.1

Browse Source
This commit is contained in:
gnosygnu
2014-10-13 00:13:41 -04:00
parent cd5a440404
commit d6561b3c1f
514 changed files with 1899 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
140_dbs/.classpath
View File

@@ -16,6 +16,6 @@
<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.12-bin.jar"/>
<classpathentry kind="lib" path="lib/postgresql-8.4-701.jdbc4.jar"/>
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.7.15-M1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

8
140_dbs/src_110_dbQry/gplx/dbs/Db_stmt_sql.java
View File

@@ -65,7 +65,7 @@ class Db_stmt_sql implements Db_stmt {
try {
Bry_bfr bfr = Bry_bfr.new_();
gplx.ios.Io_stream_rdr_.Load_all_to_bfr(bfr, v);
Add(++val_idx, bfr.XtoStrAndClear());
Add(++val_idx, bfr.Xto_str_and_clear());
} catch (Exception e) {throw Err_.err_(e, "failed to add value: type={0} val={1}", "rdr", v);}
return this;
}
@@ -99,8 +99,8 @@ class Db_stmt_sql implements Db_stmt {
public void Add(String v) {Add(-1, v);}
public void Add(int idx, String v) {args.Add(v);} ListAdp args = ListAdp_.new_();
public String Xto_sql() {
tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.XtoAryAndClear(Object.class));
return tmp_bfr.XtoStrAndClear();
tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.Xto_ary_and_clear(Object.class));
return tmp_bfr.Xto_str_and_clear();
}
String sql_orig;
public Db_stmt Parse(String sql_str) {
@@ -119,7 +119,7 @@ class Db_stmt_sql implements Db_stmt {
pos_prv = pos_cur + 1;
}
tmp_bfr.Add_mid(src, pos_prv, src.length);
tmp_fmtr.Fmt_(tmp_bfr.XtoAryAndClear());
tmp_fmtr.Fmt_(tmp_bfr.Xto_bry_and_clear());
return this;
}
}

6
140_dbs/src_120_sql/gplx/dbs/Db_obj_ary_tst.java
View File

@@ -33,10 +33,10 @@ class Db_obj_ary_fxt {
public Db_obj_ary_fxt Test_sql(String expd) {
Sql_cmd_wtr_ansi cmd_wtr = (Sql_cmd_wtr_ansi)Sql_cmd_wtr_ansi_.default_();
String_bldr sb = String_bldr_.new_();
crt.Flds_((Db_fld[])flds_list.XtoAryAndClear(Db_fld.class));
crt.Vals_((Object[][])vals_list.XtoAryAndClear(Object[].class));
crt.Flds_((Db_fld[])flds_list.Xto_ary_and_clear(Db_fld.class));
crt.Vals_((Object[][])vals_list.Xto_ary_and_clear(Object[].class));
cmd_wtr.Append_db_obj_ary(sb, crt);
Tfds.Eq(expd, sb.XtoStrAndClear());
Tfds.Eq(expd, sb.Xto_str_and_clear());
return this;
}
}

2
140_dbs/src_400_tdbs/gplx/dbs/TdbSelect.java
View File

@@ -28,7 +28,7 @@ class TdbSelectWkr implements Db_qryWkr {
if (cmd.GroupBy() != null)
rv = TdbGroupByWkr.GroupByExec(cmd, rv, tbl);
if (cmd.OrderBy() != null) { // don't use null pattern here; if null ORDER BY, then don't call .Sort on GfoNdeList
ComparerAble comparer = Sql_order_by_sorter.new_((Sql_order_by_itm[])cmd.OrderBy().Flds().XtoAry(Sql_order_by_itm.class));
ComparerAble comparer = Sql_order_by_sorter.new_((Sql_order_by_itm[])cmd.OrderBy().Flds().Xto_ary(Sql_order_by_itm.class));
rv.SortBy(comparer);
}
return GfoNdeRdr_.peers_(rv, false);