Fixing namespaces

moufmouf · moufmouf · commit ebf4976ea906 · 2013-01-12T17:07:14.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "mouf/database.querywritter",
-    "description": "TODO",
-    "keywords": ["security", "user", "user management"],
-    "homepage": "https://github.com/thecodingmachine/database.querywritter",
+    "name": "mouf/database.querywriter",
+    "description": "This package contains classes useful to generate SQL statements such as SELECT queries, etc...",
+    "keywords": ["database", "query", "mouf"],
+    "homepage": "https://github.com/thecodingmachine/database.querywriter",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -13,7 +13,9 @@
         }
     ],
     "require": {
-    	"php": ">=5.3.0"
+    	"php": ">=5.3.0",
+    	"mouf/database.dbconnection": "~2.0",
+    	"mouf/utils.common.connectioninterface": "~2.0"
     },
     "autoload": {
         "psr-0": {
diff --git a/package.xml b/package.xml
diff --git a/src/Mouf/Database/QueryWriter/Column.php b/src/Mouf/Database/QueryWriter/Column.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * The Column class represents one or many columns to be retrieved in a SQL Select statement
@@ -50,7 +50,7 @@ public function __construct($tableName = null, $columnName = null, $alias = null
 	
 	/**
 	 * (non-PHPdoc)
-	 * @see database\querywriter.SqlRenderInterface::toSql()
+	 * @see Mouf\Database\QueryWriter.SqlRenderInterface::toSql()
 	 */
 	public function toSql(\DB_ConnectionInterface $dbConnection) {
 		$sql = "";
diff --git a/src/Mouf/Database/QueryWriter/Filters/AndFilter.php b/src/Mouf/Database/QueryWriter/Filters/AndFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The AndFilter class translates into an "AND" SQL statement between many filters.
@@ -79,7 +79,7 @@ public function toSql(\DB_ConnectionInterface $dbConnection) {
 		$filters_sql = array();
 
 		foreach ($this->filters as $filter) {
-			if (!$filter instanceof \database\querywriter\filters\FilterInterface) {
+			if (!$filter instanceof \Mouf\Database\QueryWriter\Filters\FilterInterface) {
 				throw new \Exception("Error in AndFilter: One of the parameters is not a filter.");
 			}
 
diff --git a/src/Mouf/Database/QueryWriter/Filters/BetweenFilter.php b/src/Mouf/Database/QueryWriter/Filters/BetweenFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The BetweenFilter class translates into an "BETWEEN" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/DifferentFilter.php b/src/Mouf/Database/QueryWriter/Filters/DifferentFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The DifferentFilter class translates into an "<>" SQL statement (or a "IS NOT NULL" statement if the value to compare is null).
diff --git a/src/Mouf/Database/QueryWriter/Filters/EqualFilter.php b/src/Mouf/Database/QueryWriter/Filters/EqualFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The EqualFilter class translates into an "=" SQL statement (or a "IS NULL" statement if the value to compare is null).
diff --git a/src/Mouf/Database/QueryWriter/Filters/FilterInterface.php b/src/Mouf/Database/QueryWriter/Filters/FilterInterface.php
@@ -17,15 +17,15 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * Represents a SQL statement that can appear in a WHERE clause (or in a ON clause).
  * 
  * @author David Negrier
  * @Component
  */
-interface FilterInterface extends \database\querywriter\SqlRenderInterface {
+interface FilterInterface extends \Mouf\Database\QueryWriter\SqlRenderInterface {
 	
 	/**
 	 * Returns the tables used in the filter in an array.
diff --git a/src/Mouf/Database/QueryWriter/Filters/GreaterFilter.php b/src/Mouf/Database/QueryWriter/Filters/GreaterFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The GreaterFilter class translates into an ">" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/GreaterOrEqualFilter.php b/src/Mouf/Database/QueryWriter/Filters/GreaterOrEqualFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The GreaterOrEqualFilter class translates into an ">=" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/InFilter.php b/src/Mouf/Database/QueryWriter/Filters/InFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The InFilter class translates into an "IN" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/LessFilter.php b/src/Mouf/Database/QueryWriter/Filters/LessFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The LessFilter class translates into an "<" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/LessOrEqualFilter.php b/src/Mouf/Database/QueryWriter/Filters/LessOrEqualFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The LessOrEqualFilter class translates into an "<=" SQL statement (or a "IS NULL" statement if the value to compare is null).
diff --git a/src/Mouf/Database/QueryWriter/Filters/LikeFilter.php b/src/Mouf/Database/QueryWriter/Filters/LikeFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The LikeFilter class translates into an "LIKE" SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/NotFilter.php b/src/Mouf/Database/QueryWriter/Filters/NotFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The NotFilter class translates into an "NOT" SQL statement: it reverses the filter.
diff --git a/src/Mouf/Database/QueryWriter/Filters/OrFilter.php b/src/Mouf/Database/QueryWriter/Filters/OrFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The OrFilter class translates into an "Or" SQL statement between many filters.
diff --git a/src/Mouf/Database/QueryWriter/Filters/OrderByColumn.php b/src/Mouf/Database/QueryWriter/Filters/OrderByColumn.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The OrderByColumn class translates an ORDER BY [table_name].[column_name] [ASC|DESC] SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/OrderByInterface.php b/src/Mouf/Database/QueryWriter/Filters/OrderByInterface.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * Interface for the ORDER BY statements used in Service->getObjects method.
diff --git a/src/Mouf/Database/QueryWriter/Filters/OrderBySQLString.php b/src/Mouf/Database/QueryWriter/Filters/OrderBySQLString.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
 * The OrderBySQLString class translates an ORDER BY [table_name].[column_name] [ASC|DESC] SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/Filters/SqlStringFilter.php b/src/Mouf/Database/QueryWriter/Filters/SqlStringFilter.php
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-namespace database\querywriter\filters;
+namespace Mouf\Database\QueryWriter\Filters;
 
 /**
  * The SqlStringFilter class is directly put in the WHERE clause.
diff --git a/src/Mouf/Database/QueryWriter/Join.php b/src/Mouf/Database/QueryWriter/Join.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * Represents a LEFT JOIN, JOIN, RIGHT JOIN or OUTER JOIN in a SELECT query.
@@ -47,7 +47,7 @@ class Join implements TableReferenceInterface {
 	
 	/**
 	 * (non-PHPdoc)
-	 * @see database\querywriter.SqlRenderInterface::toSql()
+	 * @see Mouf\Database\QueryWriter.SqlRenderInterface::toSql()
 	 */
 	public function toSql(\DB_ConnectionInterface $dbConnection) {
 		$sql = "(".$this->left->toSql($dbConnection);
diff --git a/src/Mouf/Database/QueryWriter/Select.php b/src/Mouf/Database/QueryWriter/Select.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * The Select class represents a SQL Select statement
diff --git a/src/Mouf/Database/QueryWriter/SelectExpressionInterface.php b/src/Mouf/Database/QueryWriter/SelectExpressionInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * Classes implementing this interface can be added in the columns list of a SQL statement.
diff --git a/src/Mouf/Database/QueryWriter/SqlRenderInterface.php b/src/Mouf/Database/QueryWriter/SqlRenderInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * Objects implementing SqlRenderInterface can be rendered with the toSql method.
diff --git a/src/Mouf/Database/QueryWriter/TableReference.php b/src/Mouf/Database/QueryWriter/TableReference.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * Represents a SQL table in a SELECT query.
diff --git a/src/Mouf/Database/QueryWriter/TableReferenceInterface.php b/src/Mouf/Database/QueryWriter/TableReferenceInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace database\querywriter;
+namespace Mouf\Database\QueryWriter;
 
 /**
  * Represents a SQL table or JOIN clause to put in a WHERE SQL statement.
