From d8e293e450da0e3ab8c4798fcfdb33c15a9408b5 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Fri, 27 Apr 2012 15:16:58 -0400 Subject: [PATCH] Partially revert previous commit --- classes/db_reg.php | 2 +- classes/settings.php | 2 +- docs/classes.svg | 214 +++++++++++------------- 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 | 8 +- 37 files changed, 141 insertions(+), 151 deletions(-) diff --git a/classes/db_reg.php b/classes/db_reg.php index 33b7a8c..2b82459 100644 --- a/classes/db_reg.php +++ b/classes/db_reg.php @@ -21,7 +21,7 @@ * @package Query * @subpackage Helper Classes */ -class DB_Reg extends StdClass { +class DB_Reg { /** * Static array of connections diff --git a/classes/settings.php b/classes/settings.php index e1599bc..e087205 100644 --- a/classes/settings.php +++ b/classes/settings.php @@ -19,7 +19,7 @@ * @package Query * @subpackage Helper Classes */ -class Settings extends StdClass { +class Settings { /** * Settings object represented by the currently loaded JSON file diff --git a/docs/classes.svg b/docs/classes.svg index 86f79ff..8687996 100644 --- a/docs/classes.svg +++ b/docs/classes.svg @@ -22,57 +22,42 @@ \\DB_Reg - -DB_Reg + +DB_Reg - -\\StdClass - -\StdClass - - -\\DB_Reg->\\StdClass - - - \\Settings - -Settings + +Settings - -\\Settings->\\StdClass - - - \\DB_SQL - -«abstract» -DB_SQL + +«abstract» +DB_SQL \\DB_PDO - -«abstract» -DB_PDO + +«abstract» +DB_PDO -\\PDO - -\PDO +\\PDO + +\PDO -\\DB_PDO->\\PDO - - +\\DB_PDO->\\PDO + + \\Query_Builder @@ -81,174 +66,179 @@ Query_Builder + +\\StdClass + +\StdClass + -\\Query_Builder->\\StdClass +\\Query_Builder->\\StdClass \\DB_Util - -«abstract» -DB_Util + +«abstract» +DB_Util \\PgSQL_SQL - -PgSQL_SQL + +PgSQL_SQL -\\PgSQL_SQL->\\DB_SQL - - +\\PgSQL_SQL->\\DB_SQL + + \\PgSQL_Util - -PgSQL_Util + +PgSQL_Util -\\PgSQL_Util->\\DB_Util - - +\\PgSQL_Util->\\DB_Util + + \\PgSQL - -PgSQL + +PgSQL -\\PgSQL->\\DB_PDO - - +\\PgSQL->\\DB_PDO + + \\ODBC_Util - -ODBC_Util + +ODBC_Util -\\ODBC_Util->\\DB_Util - - +\\ODBC_Util->\\DB_Util + + \\ODBC_SQL - -ODBC_SQL + +ODBC_SQL -\\ODBC_SQL->\\DB_SQL - - +\\ODBC_SQL->\\DB_SQL + + \\ODBC - -ODBC + +ODBC -\\ODBC->\\DB_PDO - - +\\ODBC->\\DB_PDO + + \\MySQL_Util - -MySQL_Util + +MySQL_Util -\\MySQL_Util->\\DB_Util - - +\\MySQL_Util->\\DB_Util + + \\MySQL - -MySQL + +MySQL -\\MySQL->\\DB_PDO - - +\\MySQL->\\DB_PDO + + \\MySQL_SQL - -MySQL_SQL + +MySQL_SQL -\\MySQL_SQL->\\DB_SQL - - +\\MySQL_SQL->\\DB_SQL + + \\SQLite_Util - -SQLite_Util + +SQLite_Util -\\SQLite_Util->\\DB_Util - - +\\SQLite_Util->\\DB_Util + + \\SQLite - -SQLite + +SQLite -\\SQLite->\\DB_PDO - - +\\SQLite->\\DB_PDO + + \\SQLite_SQL - -SQLite_SQL + +SQLite_SQL -\\SQLite_SQL->\\DB_SQL - - +\\SQLite_SQL->\\DB_SQL + + \\Firebird_SQL - -Firebird_SQL + +Firebird_SQL -\\Firebird_SQL->\\DB_SQL - - +\\Firebird_SQL->\\DB_SQL + + \\Firebird_Result @@ -258,38 +248,38 @@ -\\PDOStatement +\\PDOStatement \PDOStatement -\\Firebird_Result->\\PDOStatement +\\Firebird_Result->\\PDOStatement \\Firebird - -Firebird + +Firebird -\\Firebird->\\DB_PDO - - +\\Firebird->\\DB_PDO + + \\Firebird_Util - -Firebird_Util + +Firebird_Util -\\Firebird_Util->\\DB_Util - - +\\Firebird_Util->\\DB_Util + + diff --git a/docs/classes/DB_PDO.html b/docs/classes/DB_PDO.html index c37eb59..cc7939f 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -662,7 +662,7 @@ the connection/database
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index eb46791..8468068 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-27T15:16:08-04:00.
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index 8a79fe5..a480d7b 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -268,7 +268,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index 6dfa036..f62da0d 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index e4d3509..36313cf 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -812,7 +812,7 @@ the last query executed
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index cd85566..d7dc015 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -503,7 +503,7 @@ the query
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index 2827c14..f9ee761 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index 63921db..19ee321 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -211,7 +211,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index e7c1102..c12ff8c 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -848,7 +848,7 @@ the connection/database
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index 2e25d5f..ee6034f 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index f740130..9251de2 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index f076914..5bd6c93 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index 7aa9f81..09bd365 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 9ce33e5..1b37b01 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -202,7 +202,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index a9f0032..1f13e22 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index fc01171..d3e1273 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index e774c8e..243961d 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index 01bf40b..393fe97 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-27T15:16:08-04:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index 96dd8ab..c792f7b 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-27T15:16:08-04:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index f80fbe0..a4a4954 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index 59daa83..4a3bb55 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index ed32d48..0ab3541 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-27T15:16:08-04:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index f57f1fa..deef0c1 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -66,7 +66,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/errors.html b/docs/errors.html index 1e556d4..5f19ff6 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -92,7 +92,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 41d8d4c..86b4db1 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -63,7 +63,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/markers.html b/docs/markers.html index 59ffd08..3c8891a 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -68,7 +68,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index ba5a3ee..fa2cbf8 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -282,7 +282,7 @@ instantiates the specific db driver

+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/packages/.html b/docs/packages/.html index 9e8458b..f1b2628 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -66,7 +66,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index 55a662b..2f4c93c 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -93,7 +93,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index b47b5d1..ed465ed 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -210,7 +210,7 @@ data-fetching methods

+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 35eb3a6..1a798c7 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -96,7 +96,7 @@
+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index 78a7e28..a6da266 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-27T15:16:08-04:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index bc337be..b64e7a7 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -315,7 +315,7 @@ instantiates the specific db driver

+ generated on 2012-04-27T15:16:08-04:00.
diff --git a/docs/structure.xml b/docs/structure.xml index 5b67250..310f261 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -1,6 +1,6 @@ - + Free Query Builder / Database Abstraction Layer

]]> @@ -12,7 +12,7 @@ DB_Reg \DB_Reg - \StdClass + Decouples the Settings class from the query builder @@ -95,7 +95,7 @@ and organizes database connections

]]> - + Free Query Builder / Database Abstraction Layer

]]> @@ -108,7 +108,7 @@ and organizes database connections

]]> Settings \Settings - \StdClass +