From baad919dcae4c579501dda427e512698dbd59cd1 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Mon, 30 Apr 2012 14:29:22 -0400 Subject: [PATCH] Fix logic error and update docs --- classes/query_builder.php | 6 +- docs/classes/DB_PDO.html | 2 +- docs/classes/DB_Reg.html | 2 +- docs/classes/DB_SQL.html | 2 +- docs/classes/DB_Util.html | 2 +- docs/classes/Firebird.html | 2 +- docs/classes/Firebird_Result.html | 2 +- docs/classes/Firebird_SQL.html | 2 +- docs/classes/Firebird_Util.html | 2 +- docs/classes/MySQL.html | 2 +- docs/classes/MySQL_SQL.html | 2 +- docs/classes/MySQL_Util.html | 2 +- docs/classes/ODBC.html | 2 +- docs/classes/ODBC_SQL.html | 2 +- docs/classes/ODBC_Util.html | 2 +- docs/classes/PgSQL.html | 2 +- docs/classes/PgSQL_SQL.html | 2 +- docs/classes/PgSQL_Util.html | 2 +- docs/classes/Query_Builder.html | 2 +- docs/classes/SQLite.html | 2 +- docs/classes/SQLite_SQL.html | 2 +- docs/classes/SQLite_Util.html | 2 +- docs/classes/Settings.html | 2 +- docs/deprecated.html | 2 +- docs/errors.html | 2 +- docs/graph_class.html | 2 +- docs/markers.html | 2 +- docs/namespaces/default.html | 2 +- docs/packages/.html | 2 +- docs/packages/Default.html | 2 +- docs/packages/Query.Drivers.html | 2 +- docs/packages/Query.Helper Classes.html | 2 +- docs/packages/Query.Query.html | 2 +- docs/packages/Query.html | 2 +- docs/structure.xml | 436 ++++++++++++------------ tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes 36 files changed, 256 insertions(+), 252 deletions(-) diff --git a/classes/query_builder.php b/classes/query_builder.php index dfdb84c..f86f27f 100644 --- a/classes/query_builder.php +++ b/classes/query_builder.php @@ -870,7 +870,11 @@ class Query_Builder { foreach($key as $k => $v) { $this->set_array[$k] = $v; - $this->values[] = $val; + + foreach($vals as $v) + { + $this->values[] = $v; + } } } diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index ea9a69c..47209aa 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -662,7 +662,7 @@ the connection/database
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index 83c8269..fb26c60 100644 --- a/docs/classes/DB_Reg.html +++ b/docs/classes/DB_Reg.html @@ -151,7 +151,7 @@ and organizes database connections

+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index d93db18..d89a52d 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -268,7 +268,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 3b584bc..be55220 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index 5a1538c..164881b 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -812,7 +812,7 @@ the last query executed
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index b2f25c8..b532da2 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -503,7 +503,7 @@ the query
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index c89b38b..b043f8f 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index 0821030..1177e8b 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -211,7 +211,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index 80513cd..9f76e0e 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -848,7 +848,7 @@ the connection/database
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index dc89138..92650b8 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index 24df0c7..bd1f69a 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index a5981d0..5e1f0e1 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index 0f44429..7ecd0d5 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 14429b1..5470dee 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -202,7 +202,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index 55de411..efe7d1f 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index 840714a..db8a7e5 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index f00ff0c..f173150 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index 3f1cdfc..ab657db 100644 --- a/docs/classes/Query_Builder.html +++ b/docs/classes/Query_Builder.html @@ -1086,7 +1086,7 @@ for complex select queries
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index 03de5c6..2a4e57f 100644 --- a/docs/classes/SQLite.html +++ b/docs/classes/SQLite.html @@ -865,7 +865,7 @@ method if the database does not support 'TRUNCATE';
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index 7cd461e..e7673fb 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index 2add45c..d119c01 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index e2fe468..5f74927 100644 --- a/docs/classes/Settings.html +++ b/docs/classes/Settings.html @@ -243,7 +243,7 @@ directly - the settings should be safe!
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index 4955405..5cbb4d5 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -66,7 +66,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/errors.html b/docs/errors.html index da4b6c4..67d5061 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -92,7 +92,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 36f9160..835f425 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -63,7 +63,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/markers.html b/docs/markers.html index 4c67c0a..151e5a5 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -68,7 +68,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index af98aa1..cc6349d 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -282,7 +282,7 @@ instantiates the specific db driver

+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/.html b/docs/packages/.html index f1befe2..5c8ce16 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -66,7 +66,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index d602b30..0e4ee30 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -93,7 +93,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index 5800683..b691644 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -210,7 +210,7 @@ data-fetching methods

+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 3f45feb..9e3ec49 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -96,7 +96,7 @@
+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index be2f0ea..9849cb8 100644 --- a/docs/packages/Query.Query.html +++ b/docs/packages/Query.Query.html @@ -114,7 +114,7 @@ instantiates the specific db driver

+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index 158fa78..af5bd22 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -315,7 +315,7 @@ instantiates the specific db driver

+ generated on 2012-04-30T14:28:37-04:00.
diff --git a/docs/structure.xml b/docs/structure.xml index 73ca393..aa36916 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -922,7 +922,7 @@ the connection/database]]> - + Free Query Builder / Database Abstraction Layer

]]> @@ -1369,758 +1369,758 @@ for complex select queries]]> - + not_like function - + - + string - + mixed - + string - + \$this - + $field - + $val - + $pos - + or_not_like function - + - + string - + mixed - + string - + \$this - + $field - + $val - + $pos - + having function - + - + mixed - + mixed - + \$this - + $key - + $val - + or_having function - + - + mixed - + mixed - + \$this - + $key - + $val - + _where function - + - + mixed - + mixed - + array - + $key - + + $val + + + + + + where + function + + + + + mixed + + + mixed + + + \$this + + + + $key + + + + $val - where - function - - - - - mixed - - - mixed - - - \$this - - - - $key - - - - - $val - - - - - or_where function - + - + string - + mixed - + \$this - + $field - + $val - + where_in function - + - + mixed - + mixed - + \$this - + $field - + $val - + or_where_in function - + - + string - + mixed - + \$this - + $field - + $val - + where_not_in function - + - + string - + mixed - + \$this - + $field - + $val - + or_where_not_in function - + - + string - + mixed - + \$this - + $field - + $val - + set function - + - + mixed - + mixed - + \$this - + $key - + $val - + join function - + - + string - + string - + string - + \$this - + $table - + $condition - + $type - + group_by function - + - + mixed - + \$this - + $field - + order_by function - + - + string - + string - + \$this - + $field - + $type - + limit function - + - + int - + int - + string - + $limit - + $offset - + group_start function - + - + \$this - + or_group_start function - + - + \$this - + or_not_group_start function - + - + \$this - + group_end function - + - + \$this - + get function - + - - + + int - + int - + object - + $table - + $limit - + $offset - + get_where function - + - + string - + array - + int - + int - + object - + $table - + $where - + $limit - + $offset - + count_all function - + - + string - + int - + $table - + count_all_results function - + - + string - + int - + $table - + insert function - + - + string - + mixed - + mixed - + $table - + $data - + update function - + - + string - + mixed - + mixed - + $table - + $data - + delete function - + - + string - + mixed - + mixed - + $table - + $where - + __call function - + - + string - + array - + mixed - + $name - + $params - + _reset function - + - + _compile function - + - + string - + string - + \$string - + $type - + $table - + diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB index 375a5b25885b9df66b8519c619e1d76f71cbd2d3..81abab29e9ce3cf3f3f192c2ed185f2dff57a359 100644 GIT binary patch delta 388 zcmYL_ze@vA49D}XclNy(iV+c<^!nqlio@L`j@sc+5gm%76wy&!IyxKEhz9ORuy`JGi*(yR&LS@=ZecKoUhk6a||Mmi@CL{2O7E8+ECMF2K480E=C| z0o0dX=boq29)Q3y-pFcZau_G4&g^)raehLIm?BG2PLZw1Q8cC~uZSxWZIU*zjo5Le z%i~H_zUP%M+dkU2yCt5{{?ZPcgeLdkUV6|(7oLO*Hdeuw1-KCKT88a5XIkK?##K9BP%MT5WW2KA_y@ch_(k>MA0HxN)QAavGD^O7HcO71h%jf z8#{~W*=S{NE5RZsq)9+OLfo82XP9~OV|XtJDnU@$VOU?e%;LWU1&Lo8sqX@tdH{o6 zb%5I1tM`%_F(6>*uE#gi+Yh6LwUBPsTjxRwCWRqILJCs~ONt38l2X`GOg;#13bqwm zE_dy4vBW#ci(#3E!!lWS2lIBE_qX=hGzz?kcB+Ika&eq0qTsmLqa51gV43nTsf71b z9ygjBTDv@tN9}28j?2kmhCA5i;bE5yd&+Zx=lH`gYERuqw97no)FWTZZI7y2PQIwD x-acuLEve{({Os8G;}RIN8K*$!Sbcg@*Imk}PM=m8RC+*FwGq*5csihF?HhC|N?8B^