From 61156c7907415f0d1d0ccd5b6bcbac31d5d556b9 Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Fri, 27 Apr 2012 16:18:59 -0400 Subject: [PATCH] Better class hierarchy --- classes/db_sql.php | 2 +- classes/db_util.php | 2 +- classes/query_builder.php | 2 +- docs/classes.svg | 257 ++++++++++++------------ 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 | 12 +- 38 files changed, 173 insertions(+), 168 deletions(-) diff --git a/classes/db_sql.php b/classes/db_sql.php index 30f3d18..e74dbab 100644 --- a/classes/db_sql.php +++ b/classes/db_sql.php @@ -19,7 +19,7 @@ * @package Query * @subpackage Query */ -abstract class DB_SQL { +abstract class DB_SQL extends StdClass { // -------------------------------------------------------------------------- // ! Methods to override diff --git a/classes/db_util.php b/classes/db_util.php index fd3cc4c..252562f 100644 --- a/classes/db_util.php +++ b/classes/db_util.php @@ -19,7 +19,7 @@ * @package Query * @subpackage Query */ -abstract class DB_Util { +abstract class DB_Util extends StdClass { /** * Reference to the current connection object diff --git a/classes/query_builder.php b/classes/query_builder.php index d786c2a..2f7ea75 100644 --- a/classes/query_builder.php +++ b/classes/query_builder.php @@ -20,7 +20,7 @@ * @package Query * @subpackage Query */ -class Query_Builder extends StdClass { +class Query_Builder { /** * Compiled 'select' clause diff --git a/docs/classes.svg b/docs/classes.svg index 8687996..6f046f3 100644 --- a/docs/classes.svg +++ b/docs/classes.svg @@ -4,282 +4,287 @@ - - + + G - + cluster_default - - - - - - - - + + + + + + + + \\DB_Reg - -DB_Reg + +DB_Reg \\Settings - -Settings + +Settings \\DB_SQL - -«abstract» -DB_SQL + +«abstract» +DB_SQL + +\\StdClass + +\StdClass + + +\\DB_SQL->\\StdClass + + + \\DB_PDO - -«abstract» -DB_PDO + +«abstract» +DB_PDO -\\PDO - -\PDO +\\PDO + +\PDO -\\DB_PDO->\\PDO - - +\\DB_PDO->\\PDO + + \\Query_Builder - -Query_Builder + +Query_Builder - -\\StdClass - -\StdClass - - -\\Query_Builder->\\StdClass - - - \\DB_Util - -«abstract» -DB_Util + +«abstract» +DB_Util + +\\DB_Util->\\StdClass + + + \\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 - -Firebird_Result + +Firebird_Result -\\PDOStatement - -\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 cc7939f..63b1f7e 100644 --- a/docs/classes/DB_PDO.html +++ b/docs/classes/DB_PDO.html @@ -662,7 +662,7 @@ the connection/database
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/DB_Reg.html b/docs/classes/DB_Reg.html index 8468068..050099e 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-27T16:18:06-04:00.
diff --git a/docs/classes/DB_SQL.html b/docs/classes/DB_SQL.html index a480d7b..03ebc20 100644 --- a/docs/classes/DB_SQL.html +++ b/docs/classes/DB_SQL.html @@ -268,7 +268,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/DB_Util.html b/docs/classes/DB_Util.html index f62da0d..c8ba34a 100644 --- a/docs/classes/DB_Util.html +++ b/docs/classes/DB_Util.html @@ -208,7 +208,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Firebird.html b/docs/classes/Firebird.html index 36313cf..942d4bb 100644 --- a/docs/classes/Firebird.html +++ b/docs/classes/Firebird.html @@ -812,7 +812,7 @@ the last query executed
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Firebird_Result.html b/docs/classes/Firebird_Result.html index d7dc015..e3d32c0 100644 --- a/docs/classes/Firebird_Result.html +++ b/docs/classes/Firebird_Result.html @@ -503,7 +503,7 @@ the query
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Firebird_SQL.html b/docs/classes/Firebird_SQL.html index f9ee761..59bcb48 100644 --- a/docs/classes/Firebird_SQL.html +++ b/docs/classes/Firebird_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Firebird_Util.html b/docs/classes/Firebird_Util.html index 19ee321..1b7f316 100644 --- a/docs/classes/Firebird_Util.html +++ b/docs/classes/Firebird_Util.html @@ -211,7 +211,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/MySQL.html b/docs/classes/MySQL.html index c12ff8c..2703f3e 100644 --- a/docs/classes/MySQL.html +++ b/docs/classes/MySQL.html @@ -848,7 +848,7 @@ the connection/database
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/MySQL_SQL.html b/docs/classes/MySQL_SQL.html index ee6034f..34ba12b 100644 --- a/docs/classes/MySQL_SQL.html +++ b/docs/classes/MySQL_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/MySQL_Util.html b/docs/classes/MySQL_Util.html index 9251de2..b0eb70c 100644 --- a/docs/classes/MySQL_Util.html +++ b/docs/classes/MySQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/ODBC.html b/docs/classes/ODBC.html index 5bd6c93..a4cc719 100644 --- a/docs/classes/ODBC.html +++ b/docs/classes/ODBC.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/ODBC_SQL.html b/docs/classes/ODBC_SQL.html index 09bd365..d038947 100644 --- a/docs/classes/ODBC_SQL.html +++ b/docs/classes/ODBC_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/ODBC_Util.html b/docs/classes/ODBC_Util.html index 1b37b01..bc2735a 100644 --- a/docs/classes/ODBC_Util.html +++ b/docs/classes/ODBC_Util.html @@ -202,7 +202,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/PgSQL.html b/docs/classes/PgSQL.html index 1f13e22..1175e07 100644 --- a/docs/classes/PgSQL.html +++ b/docs/classes/PgSQL.html @@ -850,7 +850,7 @@ the connection/database
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/PgSQL_SQL.html b/docs/classes/PgSQL_SQL.html index d3e1273..e084a47 100644 --- a/docs/classes/PgSQL_SQL.html +++ b/docs/classes/PgSQL_SQL.html @@ -296,7 +296,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/PgSQL_Util.html b/docs/classes/PgSQL_Util.html index 243961d..2a9da28 100644 --- a/docs/classes/PgSQL_Util.html +++ b/docs/classes/PgSQL_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Query_Builder.html b/docs/classes/Query_Builder.html index 393fe97..ec165df 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-27T16:18:06-04:00.
diff --git a/docs/classes/SQLite.html b/docs/classes/SQLite.html index c792f7b..8aebf68 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-27T16:18:06-04:00.
diff --git a/docs/classes/SQLite_SQL.html b/docs/classes/SQLite_SQL.html index a4a4954..a73d829 100644 --- a/docs/classes/SQLite_SQL.html +++ b/docs/classes/SQLite_SQL.html @@ -280,7 +280,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/SQLite_Util.html b/docs/classes/SQLite_Util.html index 4a3bb55..35e7c48 100644 --- a/docs/classes/SQLite_Util.html +++ b/docs/classes/SQLite_Util.html @@ -207,7 +207,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/classes/Settings.html b/docs/classes/Settings.html index 0ab3541..9f4bc40 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-27T16:18:06-04:00.
diff --git a/docs/deprecated.html b/docs/deprecated.html index deef0c1..618c81c 100644 --- a/docs/deprecated.html +++ b/docs/deprecated.html @@ -66,7 +66,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/errors.html b/docs/errors.html index 5f19ff6..748f300 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -92,7 +92,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/graph_class.html b/docs/graph_class.html index 86b4db1..5107e9c 100644 --- a/docs/graph_class.html +++ b/docs/graph_class.html @@ -63,7 +63,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/markers.html b/docs/markers.html index 3c8891a..7961c4a 100644 --- a/docs/markers.html +++ b/docs/markers.html @@ -68,7 +68,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html index fa2cbf8..2808d22 100644 --- a/docs/namespaces/default.html +++ b/docs/namespaces/default.html @@ -282,7 +282,7 @@ instantiates the specific db driver

+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/packages/.html b/docs/packages/.html index f1b2628..443886c 100644 --- a/docs/packages/.html +++ b/docs/packages/.html @@ -66,7 +66,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/packages/Default.html b/docs/packages/Default.html index 2f4c93c..654d675 100644 --- a/docs/packages/Default.html +++ b/docs/packages/Default.html @@ -93,7 +93,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/packages/Query.Drivers.html b/docs/packages/Query.Drivers.html index ed465ed..9e70211 100644 --- a/docs/packages/Query.Drivers.html +++ b/docs/packages/Query.Drivers.html @@ -210,7 +210,7 @@ data-fetching methods

+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/packages/Query.Helper Classes.html b/docs/packages/Query.Helper Classes.html index 1a798c7..4767dce 100644 --- a/docs/packages/Query.Helper Classes.html +++ b/docs/packages/Query.Helper Classes.html @@ -96,7 +96,7 @@
+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/packages/Query.Query.html b/docs/packages/Query.Query.html index a6da266..02d8a72 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-27T16:18:06-04:00.
diff --git a/docs/packages/Query.html b/docs/packages/Query.html index b64e7a7..116b93a 100644 --- a/docs/packages/Query.html +++ b/docs/packages/Query.html @@ -315,7 +315,7 @@ instantiates the specific db driver

+ generated on 2012-04-27T16:18:06-04:00.
diff --git a/docs/structure.xml b/docs/structure.xml index 310f261..da7504f 100644 --- a/docs/structure.xml +++ b/docs/structure.xml @@ -297,7 +297,7 @@ directly - the settings should be safe!]]> - + Free Query Builder / Database Abstraction Layer

]]> @@ -310,7 +310,7 @@ directly - the settings should be safe!]]> DB_SQL \DB_SQL - + \StdClass @@ -922,7 +922,7 @@ the connection/database]]> - + Free Query Builder / Database Abstraction Layer

]]> @@ -935,7 +935,7 @@ the connection/database]]> Query_Builder \Query_Builder - \StdClass + @@ -2126,7 +2126,7 @@ in place of the get() method]]> - + Free Query Builder / Database Abstraction Layer

]]> @@ -2139,7 +2139,7 @@ in place of the get() method]]> DB_Util \DB_Util - + \StdClass