From 5b908f5816ea7d0d6c44e498fa902f83b2d8ea47 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Wed, 26 Mar 2014 21:33:58 -0400
Subject: [PATCH] Add abstract class for sql classes to have base limit method

---
 classes/abstract_sql.php          | 45 ++++++++++++++++++++++++++++
 classes/{idb_sql.php => isql.php} | 14 ++++-----
 drivers/firebird/firebird_sql.php | 50 +++++++++++++++----------------
 drivers/mysql/mysql_sql.php       |  2 +-
 drivers/pgsql/pgsql_sql.php       | 28 ++---------------
 drivers/sqlite/sqlite_sql.php     | 24 +--------------
 6 files changed, 82 insertions(+), 81 deletions(-)
 create mode 100644 classes/abstract_sql.php
 rename classes/{idb_sql.php => isql.php} (95%)

diff --git a/classes/abstract_sql.php b/classes/abstract_sql.php
new file mode 100644
index 0000000..800fb72
--- /dev/null
+++ b/classes/abstract_sql.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @author		Timothy J. Warren
+ * @copyright	Copyright (c) 2012 - 2014
+ * @link 		https://github.com/aviat4ion/Query
+ * @license		http://philsturgeon.co.uk/code/dbad-license
+ * @package		Query
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * parent for database manipulation subclasses
+ *
+ * @package Query
+ * @subpackage Query
+ */
+abstract class Abstract_SQL implements iSQL {
+
+	/**
+	 * Limit clause
+	 *
+	 * @param string $sql
+	 * @param int $limit
+	 * @param int $offset
+	 * @return string
+	 */
+	public function limit($sql, $limit, $offset=FALSE)
+	{
+		$sql .= "\nLIMIT {$limit}";
+
+		if (is_numeric($offset))
+		{
+			$sql .= " OFFSET {$offset}";
+		}
+
+		return $sql;
+	}
+
+}
+// End of abstract_sql.php
diff --git a/classes/idb_sql.php b/classes/isql.php
similarity index 95%
rename from classes/idb_sql.php
rename to classes/isql.php
index 31492dd..7767068 100644
--- a/classes/idb_sql.php
+++ b/classes/isql.php
@@ -19,7 +19,7 @@
  * @package Query
  * @subpackage Query
  */
-interface iDB_SQL {
+interface iSQL {
 
 	/**
 	 * Get database specific sql for limit clause
@@ -31,7 +31,7 @@ interface iDB_SQL {
 	 * @return string
 	 */
 	public function limit($sql, $limit, $offset=FALSE);
-	
+
 	/**
 	 * Modify the query to get the query plan
 	 *
@@ -47,7 +47,7 @@ interface iDB_SQL {
 	 * @return string
 	 */
 	public function random();
-	
+
 	/**
 	 * Returns sql to list other databases
 	 *
@@ -103,16 +103,16 @@ interface iDB_SQL {
 	 * @return string
 	 */
 	public function sequence_list();
-	
+
 	/**
 	 * Return sql to list database field types
 	 *
 	 * @return mixed
 	 */
 	public function type_list();
-	
+
 	/**
-	 * Get information about the columns in the 
+	 * Get information about the columns in the
 	 * specified table
 	 *
 	 * @param string $table
@@ -121,4 +121,4 @@ interface iDB_SQL {
 	public function column_list($table);
 
 }
-// End of db_sql.php
\ No newline at end of file
+// End of isql.php
\ No newline at end of file
diff --git a/drivers/firebird/firebird_sql.php b/drivers/firebird/firebird_sql.php
index c54c12c..24a0ea0 100644
--- a/drivers/firebird/firebird_sql.php
+++ b/drivers/firebird/firebird_sql.php
@@ -19,7 +19,7 @@
  * @package Query
  * @subpackage Drivers
  */
-class Firebird_SQL implements iDB_SQL {
+class Firebird_SQL extends Abstract_SQL {
 
 	/**
 	 * Limit clause
@@ -45,9 +45,9 @@ class Firebird_SQL implements iDB_SQL {
 
 		return $sql;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Get the query plan for the sql query
 	 *
@@ -71,9 +71,9 @@ class Firebird_SQL implements iDB_SQL {
 		return NULL;
 	}
 
-		
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Returns sql to list other databases
 	 *
@@ -83,9 +83,9 @@ class Firebird_SQL implements iDB_SQL {
 	{
 		return NULL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Returns sql to list tables
 	 *
@@ -100,9 +100,9 @@ class Firebird_SQL implements iDB_SQL {
 			ORDER BY "RDB\$RELATION_NAME" ASC
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Returns sql to list system tables
 	 *
@@ -117,9 +117,9 @@ SQL;
 			ORDER BY "RDB\$RELATION_NAME" ASC
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Returns sql to list views
 	 *
@@ -132,9 +132,9 @@ SQL;
 			FROM "RDB\$VIEW_RELATIONS"
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Returns sql to list triggers
 	 *
@@ -147,9 +147,9 @@ SQL;
 			WHERE "RDB\$SYSTEM_FLAG" = 0
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Return sql to list functions
 	 *
@@ -159,9 +159,9 @@ SQL;
 	{
 		return 'SELECT * FROM "RDB$FUNCTIONS"';
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Return sql to list stored procedures
 	 *
@@ -187,9 +187,9 @@ SQL;
 SQL;
 
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Return sql to list sequences
 	 *
@@ -203,14 +203,14 @@ SQL;
 			WHERE "RDB\$SYSTEM_FLAG" = 0
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * Return sql to list columns of the specified table
-	 * 
+	 *
 	 * @param string $table
-	 * @return string 
+	 * @return string
 	 */
 	public function column_list($table)
 	{
@@ -250,9 +250,9 @@ SQL;
 			ORDER BY r.RDB\$FIELD_POSITION
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * SQL to show list of field types
 	 *
diff --git a/drivers/mysql/mysql_sql.php b/drivers/mysql/mysql_sql.php
index ebfa16b..182dc2a 100644
--- a/drivers/mysql/mysql_sql.php
+++ b/drivers/mysql/mysql_sql.php
@@ -19,7 +19,7 @@
  * @package Query
  * @subpackage Drivers
  */
-class MySQL_SQL implements iDB_SQL {
+class MySQL_SQL extends Abstract_SQL {
 
 	/**
 	 * Limit clause
diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index efb75fb..7b82586 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -18,30 +18,8 @@
  * @package Query
  * @subpackage Drivers
  */
-class PgSQL_SQL implements iDB_SQL {
+class PgSQL_SQL extends Abstract_SQL {
 
-	/**
-	 * Limit clause
-	 *
-	 * @param string $sql
-	 * @param int $limit
-	 * @param int $offset
-	 * @return string
-	 */
-	public function limit($sql, $limit, $offset=FALSE)
-	{
-		$sql .= " LIMIT {$limit}";
-
-		if(is_numeric($offset))
-		{
-			$sql .= " OFFSET {$offset}";
-		}
-
-		return $sql;
-	}
-	
-	// --------------------------------------------------------------------------
-	
 	/**
 	 * Get the query plan for the sql query
 	 *
@@ -222,9 +200,9 @@ SQL;
 			ORDER BY ordinal_position;
 SQL;
 	}
-	
+
 	// --------------------------------------------------------------------------
-	
+
 	/**
 	 * SQL to show list of field types
 	 *
diff --git a/drivers/sqlite/sqlite_sql.php b/drivers/sqlite/sqlite_sql.php
index 6d8e4cc..c17a2f4 100644
--- a/drivers/sqlite/sqlite_sql.php
+++ b/drivers/sqlite/sqlite_sql.php
@@ -19,29 +19,7 @@
  * @package Query
  * @subpackage Drivers
  */
-class SQLite_SQL implements iDB_SQL {
-
-	/**
-	 * Limit clause
-	 *
-	 * @param string $sql
-	 * @param int $limit
-	 * @param int $offset
-	 * @return string
-	 */
-	public function limit($sql, $limit, $offset=FALSE)
-	{
-		$sql .= "\nLIMIT {$limit}";
-
-		if (is_numeric($offset))
-		{
-			$sql .= " OFFSET {$offset}";
-		}
-
-		return $sql;
-	}
-
-	// --------------------------------------------------------------------------
+class SQLite_SQL extends Abstract_SQL {
 
 	/**
 	 * Get the query plan for the sql query