1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

'v3.3.4.1'

This commit is contained in:
gnosygnu
2016-03-27 23:44:59 -04:00
parent de67253a9c
commit baaef32df2
903 changed files with 13339 additions and 8695 deletions

View File

@@ -22,92 +22,89 @@ public class Db_qry__select_cmd implements Db_qry {
public int Tid() {return Db_qry_.Tid_select;}
public boolean Exec_is_rdr() {return Bool_.Y;}
public String Base_table() {return from.Base_tbl.Name;}
public Sql_from_itm From() {return from;} private Sql_from_itm from;
public Sql_from_clause From() {return from;} private Sql_from_clause from;
public Db_qry__select_cmd From_(String tbl) {return From_(tbl, Sql_tbl_itm.Alias__null);}
public Db_qry__select_cmd From_(String name, String alias) {return From_(Sql_tbl_itm.Db__null, name, alias);}
public Db_qry__select_cmd From_(String db, String tbl, String alias) {
if (from != null) throw Err_.new_("sql_qry", "super table already defined", "from", from.Base_tbl.Name);
from = new Sql_from_itm(new Sql_tbl_itm(Sql_tbl_itm.Tid__from, db, tbl, alias, Sql_join_itm.Ary__empty));
from = new Sql_from_clause(new Sql_tbl_itm(Sql_tbl_itm.Tid__from, db, tbl, alias, Sql_join_fld.Ary__empty));
return this;
}
public Db_qry__select_cmd Join_(String name, String alias, Sql_join_itm... join_flds) {return Join_(Sql_tbl_itm.Db__null, name, alias, join_flds);}
public Db_qry__select_cmd Join_(String db, String name, String alias, Sql_join_itm... join_flds) {
public Db_qry__select_cmd Join_(String name, String alias, Sql_join_fld... join_flds) {return Join_(Sql_tbl_itm.Tid__inner, Sql_tbl_itm.Db__null , name, alias, join_flds);}
public Db_qry__select_cmd Join_(String db, String name, String alias, Sql_join_fld... join_flds) {return Join_(Sql_tbl_itm.Tid__inner, db , name, alias, join_flds);}
public Db_qry__select_cmd Join_(int join_tid, String db, String name, String alias, Sql_join_fld... join_flds) {
if (from == null) throw Err_.new_("sql_qry", "super table is not defined");
from.Tbls.Add(new Sql_tbl_itm(Sql_tbl_itm.Tid__inner, db, name, alias, join_flds));
from.Tbls.Add(new Sql_tbl_itm(join_tid, db, name, alias, join_flds));
return this;
}
public Sql_select_itm Cols() {return cols;} private Sql_select_itm cols = Sql_select_itm.All;
public Sql_select_clause Cols() {return cols;} private Sql_select_clause cols = new Sql_select_clause();
public Db_qry__select_cmd Distinct_() {cols.Distinct = true; return this;}
public Db_qry__select_cmd Cols_all_() {cols = Sql_select_itm.All; return this;}
public Db_qry__select_cmd Cols_(String... ary) {return Cols_w_tbl_(Sql_select_fld.Tbl_null, ary);}
public Db_qry__select_cmd Cols_all_() {cols.Flds.Clear().Add(Sql_select_fld.Wildcard); return this;}
public Db_qry__select_cmd Cols_(String... ary) {return Cols_w_tbl_(Sql_select_fld.Tbl__null, ary);}
public Db_qry__select_cmd Cols_w_tbl_(String tbl, String... ary) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
for (String itm : ary)
cols.Flds.Add(Sql_select_fld.New_fld(tbl, itm, itm));
return this;
}
public Db_qry__select_cmd Cols_w_alias_(String expr, String alias) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
cols.Flds.Add(Sql_select_fld.New_fld(Sql_select_fld.Tbl_null, expr, alias));
cols.Flds.Add(Sql_select_fld.New_fld(Sql_select_fld.Tbl__null, expr, alias));
return this;
}
public Sql_where_itm Where_itm() {return where_itm;} private Sql_where_itm where_itm = Sql_where_itm.All;
public Sql_where_clause Where_itm() {return where_itm;} private Sql_where_clause where_itm = Sql_where_clause.All;
public Db_qry__select_cmd Where_(Criteria root) {
if (where_itm == Sql_where_itm.All) where_itm = new Sql_where_itm();
if (where_itm == Sql_where_clause.All) where_itm = new Sql_where_clause();
where_itm.Root = root;
return this;
}
public Db_qry__select_cmd Where_and(Criteria crt) {
if (where_itm == Sql_where_itm.All) throw Err_.new_("sql_qry", "where is not defined");
if (where_itm == Sql_where_clause.All) throw Err_.new_("sql_qry", "where is not defined");
where_itm.Root = Criteria_.And(where_itm.Root, crt);
return this;
}
public Sql_order_itm Order() {return order;} private Sql_order_itm order = null;
public Sql_order_clause Order() {return order;} private Sql_order_clause order = null;
public Db_qry__select_cmd Order_asc_(String fld) {return Order_(fld, Bool_.Y);}
public Db_qry__select_cmd Order_(String fld, boolean asc) {return Order_(Sql_order_fld.Tbl__null, fld, asc);}
public Db_qry__select_cmd Order_(String fld) {return Order_(Sql_order_fld.Tbl__null, fld, Bool_.Y);}
public Db_qry__select_cmd Order_(String fld, boolean asc) {return Order_(Sql_order_fld.Tbl__null, fld, asc);}
public Db_qry__select_cmd Order_(String tbl, String fld) {return Order_(tbl, fld, Bool_.Y);}
public Db_qry__select_cmd Order_(String tbl, String fld, boolean asc) {
if (order == null) order = new Sql_order_clause();
Sql_order_fld item = new Sql_order_fld(tbl, fld, asc ? Sql_order_fld.Sort__nil : Sql_order_fld.Sort__dsc);
order = new Sql_order_itm(new Sql_order_fld[] {item});
order.Flds__add(item);
return this;
}
public Db_qry__select_cmd Order_asc_many_(String... flds) {
if (order == null) order = new Sql_order_clause();
int flds_len = flds.length;
Sql_order_fld[] ary = new Sql_order_fld[flds_len];
for (int i = 0; i < flds_len; ++i)
ary[i] = new Sql_order_fld(Sql_order_fld.Tbl__null, flds[i], Sql_order_fld.Sort__nil);
order = new Sql_order_itm(ary);
order.Flds__add(new Sql_order_fld(Sql_order_fld.Tbl__null, flds[i], Sql_order_fld.Sort__nil));
return this;
}
public int Limit() {return limit;} public Db_qry__select_cmd Limit_(int v) {this.limit = v; return this;} private int limit = Limit__disabled; public static final int Limit__disabled = Int_.Min_value;
public int Offset() {return offset;} public Db_qry__select_cmd Offset_(int v) {this.offset = v; return this;} private int offset = Offset__disabled; public static final int Offset__disabled = Int_.Min_value;
public String Indexed_by() {return indexed_by;} public Db_qry__select_cmd Indexed_by_(String v) {indexed_by = v; return this;} private String indexed_by;
public Sql_group_itm GroupBy() {return groupBy;} private Sql_group_itm groupBy = null;
public Sql_group_clause GroupBy() {return groupBy;} private Sql_group_clause groupBy = null;
public Db_qry__select_cmd GroupBy_(String... flds) {
if (groupBy != null) throw Err_.new_("sql_qry", "group by already defined", "group", groupBy);
groupBy = Sql_group_itm.new_(flds);
groupBy = Sql_group_clause.new_(flds);
return this;
}
public Db_qry__select_cmd Cols_groupBy_max(String fld) {return Cols_groupBy_max(fld, fld);}
public Db_qry__select_cmd Cols_groupBy_max(String fld, String alias) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
cols.Flds.Add(Sql_select_fld.New_max(Sql_select_fld.Tbl_null, fld, alias));
cols.Flds.Add(Sql_select_fld.New_max(Sql_select_fld.Tbl__null, fld, alias));
return this;
}
public Db_qry__select_cmd Cols_groupBy_min(String fld, String alias) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
cols.Flds.Add(Sql_select_fld.New_min(Sql_select_fld.Tbl_null, fld, alias));
cols.Flds.Add(Sql_select_fld.New_min(Sql_select_fld.Tbl__null, fld, alias));
return this;
}
public Db_qry__select_cmd Cols_groupBy_count(String fld, String alias) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
cols.Flds.Add(Sql_select_fld.New_count(Sql_select_fld.Tbl_null, fld, alias));
cols.Flds.Add(Sql_select_fld.New_count(Sql_select_fld.Tbl__null, fld, alias));
return this;
}
public Db_qry__select_cmd Cols_groupBy_sum(String fld) {return Cols_groupBy_sum(fld, fld);}
public Db_qry__select_cmd Cols_groupBy_sum(String fld, String alias) {
if (cols == Sql_select_itm.All) cols = new Sql_select_itm();
cols.Flds.Add(Sql_select_fld.New_sum(Sql_select_fld.Tbl_null, fld, alias));
cols.Flds.Add(Sql_select_fld.New_sum(Sql_select_fld.Tbl__null, fld, alias));
return this;
}

View File

@@ -26,7 +26,7 @@ public class Db_qry_insert implements Db_arg_owner {
public String Base_table() {return base_table;} private String base_table;
public String[] Cols_for_insert() {return cols_for_insert;} private String[] cols_for_insert;
public Db_arg_owner From_(String tbl) {base_table = tbl; return this;}
public KeyValHash Args() {return args;} private final KeyValHash args = KeyValHash.new_();
public Keyval_hash Args() {return args;} private final Keyval_hash args = new Keyval_hash();
public Db_arg_owner Val_byte(String k, byte v) {return Val_obj_type(k, v, Db_val_type.Tid_byte);}
public Db_arg_owner Val_int(String k, int v) {return Val_obj_type(k, v, Db_val_type.Tid_int32);}
public Db_arg_owner Val_long(String k, long v) {return Val_obj_type(k, v, Db_val_type.Tid_int64);}
@@ -48,7 +48,7 @@ public class Db_qry_insert implements Db_arg_owner {
public Db_qry_insert Cols_(String... ary) {
if (cols == null) cols = new Sql_select_fld_list();
for (String fld : ary)
cols.Add(Sql_select_fld.New_fld(Sql_select_fld.Tbl_null, fld, fld));
cols.Add(Sql_select_fld.New_fld(Sql_select_fld.Tbl__null, fld, fld));
return this;
}
public Sql_select_fld_list Cols() {return cols;} private Sql_select_fld_list cols;

View File

@@ -26,7 +26,7 @@ public class Db_qry_sql implements Db_qry {
public static Db_qry_sql dml_(String sql) {return sql_(sql);}
public static Db_qry_sql ddl_(String sql) {return sql_(sql);}
public static Db_qry_sql xtn_(String sql) {return sql_(sql);}
static Db_qry_sql sql_(String sql) {
public static Db_qry_sql sql_(String sql) {
Db_qry_sql rv = new Db_qry_sql();
rv.sql = sql; rv.isReader = false;
return rv;

View File

@@ -26,7 +26,7 @@ public class Db_qry_update implements Db_arg_owner {
public String[] Cols_for_update() {return cols_for_update;} private String[] cols_for_update;
public Criteria Where() {return where;} public Db_qry_update Where_(Criteria crt) {where = crt; return this;} private Criteria where;
public Db_arg_owner From_(String tbl) {base_table = tbl; return this;}
public KeyValHash Args() {return args;} private final KeyValHash args = KeyValHash.new_();
public Keyval_hash Args() {return args;} private final Keyval_hash args = new Keyval_hash();
public Db_arg_owner Val_byte(String k, byte v) {return Val_obj_type(k, v, Db_val_type.Tid_byte);}
public Db_arg_owner Val_int(String k, int v) {return Val_obj_type(k, v, Db_val_type.Tid_int32);}
public Db_arg_owner Val_long(String k, long v) {return Val_obj_type(k, v, Db_val_type.Tid_int64);}

View File

@@ -129,7 +129,7 @@ public class Db_stmt_cmd implements Db_stmt {
catch (Exception e) {
this.Rls();
Reset_stmt();
throw Err_.new_exc(e, "db_stmt", "insert failed", "url", engine.Conn_info().Xto_api(), "sql", sql);
throw Err_.new_exc(e, "db_stmt", "insert failed", "url", engine.Conn_info().Db_api(), "sql", sql);
}
}
public int Exec_update() {
@@ -137,7 +137,7 @@ public class Db_stmt_cmd implements Db_stmt {
catch (Exception e) {
this.Rls();
Reset_stmt();
throw Err_.new_exc(e, "db_stmt", "update failed", "url", engine.Conn_info().Xto_api(), "sql", sql);
throw Err_.new_exc(e, "db_stmt", "update failed", "url", engine.Conn_info().Db_api(), "sql", sql);
}
}
public int Exec_delete() {
@@ -145,7 +145,7 @@ public class Db_stmt_cmd implements Db_stmt {
catch (Exception e) {
this.Rls();
Reset_stmt();
throw Err_.new_exc(e, "db_stmt", "delete failed", "url", engine.Conn_info().Xto_api(), "sql", sql);
throw Err_.new_exc(e, "db_stmt", "delete failed", "url", engine.Conn_info().Db_api(), "sql", sql);
}
}
public DataRdr Exec_select() {