Merge pull request #288 from willdurand/naming

Move Om to ActiveRecord
propelorm · Jul 30, 2012 · 901cc87 · 901cc87
2 parents cb24f84 + 2596d09
commit 901cc87
Show file tree

Hide file tree

Showing 128 changed files with 239 additions and 240 deletions.
diff --git a/src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehavior.php b/src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehavior.php
@@ -46,7 +46,7 @@ protected function getColumnGetter()
     public function objectMethods($builder)
     {
         $this->builder = $builder;
-        $this->builder->declareClasses('Propel\Runtime\Query\PropelQuery');
+        $this->builder->declareClasses('Propel\Runtime\ActiveQuery\PropelQuery');
         $script = '';
         $this->addHasChildObject($script);
         $this->addGetChildObject($script);

diff --git a/src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php b/src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
@@ -232,7 +232,7 @@ public function objectMethods($builder)
         $this->addDeleteDescendants($script);
 
         $this->builder->declareClass(
-            '\Propel\Runtime\Om\NestedSetRecursiveIterator'
+            '\Propel\Runtime\ActiveRecord\NestedSetRecursiveIterator'
         );
         $this->addGetIterator($script);
 

diff --git a/src/Propel/Generator/Builder/Om/ObjectBuilder.php b/src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -260,8 +260,8 @@ protected function addClassBody(&$script)
             '\Propel\Runtime\Collection\ObjectCollection',
             '\Propel\Runtime\Exception\BadMethodCallException',
             '\Propel\Runtime\Exception\PropelException',
-            '\Propel\Runtime\Query\Criteria',
-            '\Propel\Runtime\Om\ActiveRecordInterface',
+            '\Propel\Runtime\ActiveQuery\Criteria',
+            '\Propel\Runtime\ActiveRecord\ActiveRecordInterface',
             '\Propel\Runtime\Parser\AbstractParser',
             '\Propel\Runtime\Propel',
             '\Propel\Runtime\Util\BasePeer'

diff --git a/src/Propel/Generator/Builder/Om/PeerBuilder.php b/src/Propel/Generator/Builder/Om/PeerBuilder.php
@@ -144,7 +144,7 @@ protected function addClassBody(&$script)
             '\Propel\Runtime\Connection\StatementInterface',
             '\Propel\Runtime\Exception\PropelException',
             '\Propel\Runtime\Util\BasePeer',
-            '\Propel\Runtime\Query\Criteria',
+            '\Propel\Runtime\ActiveQuery\Criteria',
             '\PDO'
         );
     }

diff --git a/src/Propel/Generator/Builder/Om/QueryBuilder.php b/src/Propel/Generator/Builder/Om/QueryBuilder.php
@@ -164,9 +164,9 @@ protected function addClassBody(&$script)
         // namespaces
         $this->declareClasses(
             '\Propel\Runtime\Propel',
-            '\Propel\Runtime\Query\ModelCriteria',
-            '\Propel\Runtime\Query\Criteria',
-            '\Propel\Runtime\Query\ModelJoin',
+            '\Propel\Runtime\ActiveQuery\ModelCriteria',
+            '\Propel\Runtime\ActiveQuery\Criteria',
+            '\Propel\Runtime\ActiveQuery\ModelJoin',
             '\Exception'
         );
         $this->declareClassFromBuilder($this->getStubQueryBuilder(), 'Child');

diff --git a/src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php b/src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
@@ -163,7 +163,7 @@ protected function addClassBody(&$script)
         $this->declareClassFromBuilder($this->getStubPeerBuilder());
         $this->declareClasses(
             '\Propel\Runtime\Connection\ConnectionInterface',
-            '\Propel\Runtime\Query\Criteria'
+            '\Propel\Runtime\ActiveQuery\Criteria'
         );
         $this->addFactory($script);
         $this->addPreSelect($script);

diff --git a/src/Propel/Runtime/Query/Criteria.php → src/Propel/Runtime/ActiveQuery/Criteria.php b/src/Propel/Runtime/Query/Criteria.php → src/Propel/Runtime/ActiveQuery/Criteria.php
@@ -8,18 +8,18 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
 use Propel\Runtime\Propel;
 use Propel\Runtime\Exception\LogicException;
 use Propel\Runtime\Util\BasePeer;
 use Propel\Runtime\Util\PropelConditionalProxy;
-use Propel\Runtime\Query\Criterion\AbstractCriterion;
-use Propel\Runtime\Query\Criterion\BasicCriterion;
-use Propel\Runtime\Query\Criterion\InCriterion;
-use Propel\Runtime\Query\Criterion\CustomCriterion;
-use Propel\Runtime\Query\Criterion\LikeCriterion;
-use Propel\Runtime\Query\Criterion\RawCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\AbstractCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\BasicCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\InCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\CustomCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\LikeCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\RawCriterion;
 
 /**
  * This is a utility class for holding criteria information for a query.

diff --git a/...ime/Query/Criterion/AbstractCriterion.php → ...tiveQuery/Criterion/AbstractCriterion.php b/...ime/Query/Criterion/AbstractCriterion.php → ...tiveQuery/Criterion/AbstractCriterion.php
@@ -8,12 +8,12 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
 use \Exception;
 
 use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Adapter\AdapterInterface;
 use Propel\Runtime\Map\ColumnMap;

diff --git a/...uery/Criterion/AbstractModelCriterion.php → ...uery/Criterion/AbstractModelCriterion.php b/...uery/Criterion/AbstractModelCriterion.php → ...uery/Criterion/AbstractModelCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 /**
  * This is an "inner" class that describes an object in the criteria.

diff --git a/...untime/Query/Criterion/BasicCriterion.php → .../ActiveQuery/Criterion/BasicCriterion.php b/...untime/Query/Criterion/BasicCriterion.php → .../ActiveQuery/Criterion/BasicCriterion.php
@@ -8,10 +8,10 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidValueException;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 /**
  * Specialized Criterion used for traditional expressions,

diff --git a/...e/Query/Criterion/BasicModelCriterion.php → ...veQuery/Criterion/BasicModelCriterion.php b/...e/Query/Criterion/BasicModelCriterion.php → ...veQuery/Criterion/BasicModelCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidClauseException;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException;
 
 /**
  * Specialized ModelCriterion used for traditional expressions,

diff --git a/...ntime/Query/Criterion/CustomCriterion.php → ...ActiveQuery/Criterion/CustomCriterion.php b/...ntime/Query/Criterion/CustomCriterion.php → ...ActiveQuery/Criterion/CustomCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 /**
  * Specialized Criterion used for custom expressions with no binding, e.g. 'NOW() = 1'

diff --git a/...rion/Exception/InvalidClauseException.php → ...rion/Exception/InvalidClauseException.php b/...rion/Exception/InvalidClauseException.php → ...rion/Exception/InvalidClauseException.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion\Exception;
+namespace Propel\Runtime\ActiveQuery\Criterion\Exception;
 
 use Propel\Runtime\Exception\InvalidArgumentException;
 

diff --git a/...erion/Exception/InvalidValueException.php → ...erion/Exception/InvalidValueException.php b/...erion/Exception/InvalidValueException.php → ...erion/Exception/InvalidValueException.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion\Exception;
+namespace Propel\Runtime\ActiveQuery\Criterion\Exception;
 
 use Propel\Runtime\Exception\InvalidArgumentException;
 

diff --git a/...l/Runtime/Query/Criterion/InCriterion.php → ...ime/ActiveQuery/Criterion/InCriterion.php b/...l/Runtime/Query/Criterion/InCriterion.php → ...ime/ActiveQuery/Criterion/InCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 /**
  * Specialized Criterion used for IN expressions, e.g. table.column IN (?, ?) or table.column NOT IN (?, ?)

diff --git a/...time/Query/Criterion/InModelCriterion.php → ...ctiveQuery/Criterion/InModelCriterion.php b/...time/Query/Criterion/InModelCriterion.php → ...ctiveQuery/Criterion/InModelCriterion.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
 /**
  * Specialized ModelCriterion used for IN or NOT IN model clauses,

diff --git a/...Runtime/Query/Criterion/LikeCriterion.php → ...e/ActiveQuery/Criterion/LikeCriterion.php b/...Runtime/Query/Criterion/LikeCriterion.php → ...e/ActiveQuery/Criterion/LikeCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Adapter\Pdo\PgsqlAdapter;
 
 /**

diff --git a/...me/Query/Criterion/LikeModelCriterion.php → ...iveQuery/Criterion/LikeModelCriterion.php b/...me/Query/Criterion/LikeModelCriterion.php → ...iveQuery/Criterion/LikeModelCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidClauseException;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException;
 use Propel\Runtime\Adapter\Pdo\PgsqlAdapter;
 
 /**

diff --git a/.../Runtime/Query/Criterion/RawCriterion.php → ...me/ActiveQuery/Criterion/RawCriterion.php b/.../Runtime/Query/Criterion/RawCriterion.php → ...me/ActiveQuery/Criterion/RawCriterion.php
@@ -8,10 +8,10 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidClauseException;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 use \PDO;
 

diff --git a/...ime/Query/Criterion/RawModelCriterion.php → ...tiveQuery/Criterion/RawModelCriterion.php b/...ime/Query/Criterion/RawModelCriterion.php → ...tiveQuery/Criterion/RawModelCriterion.php
@@ -8,10 +8,10 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidClauseException;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException;
+use Propel\Runtime\ActiveQuery\Criteria;
 
 use \PDO;
 

diff --git a/...Query/Criterion/SeveralModelCriterion.php → ...Query/Criterion/SeveralModelCriterion.php b/...Query/Criterion/SeveralModelCriterion.php → ...Query/Criterion/SeveralModelCriterion.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Criterion;
+namespace Propel\Runtime\ActiveQuery\Criterion;
 
-use Propel\Runtime\Query\Criterion\Exception\InvalidValueException;
+use Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException;
 
 /**
  * Specialized ModelCriterion used for ternary model clause, e.G 'book.ID BETWEEN ? AND ?'

diff --git a/...uery/Exception/UnknownColumnException.php → ...uery/Exception/UnknownColumnException.php b/...uery/Exception/UnknownColumnException.php → ...uery/Exception/UnknownColumnException.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
 
 use Propel\Runtime\Exception\RuntimeException;
 

diff --git a/...Query/Exception/UnknownModelException.php → ...Query/Exception/UnknownModelException.php b/...Query/Exception/UnknownModelException.php → ...Query/Exception/UnknownModelException.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
 
 use Propel\Runtime\Exception\RuntimeException;
 

diff --git a/...ry/Exception/UnknownRelationException.php → ...ry/Exception/UnknownRelationException.php b/...ry/Exception/UnknownRelationException.php → ...ry/Exception/UnknownRelationException.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
 
 use Propel\Runtime\Exception\RuntimeException;
 

diff --git a/src/Propel/Runtime/Query/Join.php → src/Propel/Runtime/ActiveQuery/Join.php b/src/Propel/Runtime/Query/Join.php → src/Propel/Runtime/ActiveQuery/Join.php
@@ -8,9 +8,9 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
-use Propel\Runtime\Query\Criterion\AbstractCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\AbstractCriterion;
 use Propel\Runtime\Adapter\AdapterInterface;
 use Propel\Runtime\Exception\LogicException;
 

diff --git a/src/Propel/Runtime/Query/ModelCriteria.php → ...pel/Runtime/ActiveQuery/ModelCriteria.php b/src/Propel/Runtime/Query/ModelCriteria.php → ...pel/Runtime/ActiveQuery/ModelCriteria.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
 use Propel\Runtime\Propel;
 use Propel\Runtime\Collection\ObjectCollection;
@@ -25,18 +25,18 @@
 use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Util\BasePeer;
 use Propel\Runtime\Util\PropelModelPager;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\AbstractCriterion;
-use Propel\Runtime\Query\Criterion\InModelCriterion;
-use Propel\Runtime\Query\Criterion\BasicModelCriterion;
-use Propel\Runtime\Query\Criterion\CustomCriterion;
-use Propel\Runtime\Query\Criterion\LikeModelCriterion;
-use Propel\Runtime\Query\Criterion\RawCriterion;
-use Propel\Runtime\Query\Criterion\RawModelCriterion;
-use Propel\Runtime\Query\Criterion\SeveralModelCriterion;
-use Propel\Runtime\Query\Exception\UnknownColumnException;
-use Propel\Runtime\Query\Exception\UnknownModelException;
-use Propel\Runtime\Query\Exception\UnknownRelationException;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\AbstractCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\InModelCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\BasicModelCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\CustomCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\LikeModelCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\RawCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\RawModelCriterion;
+use Propel\Runtime\ActiveQuery\Criterion\SeveralModelCriterion;
+use Propel\Runtime\ActiveQuery\Exception\UnknownColumnException;
+use Propel\Runtime\ActiveQuery\Exception\UnknownModelException;
+use Propel\Runtime\ActiveQuery\Exception\UnknownRelationException;
 
 /**
  * This class extends the Criteria by adding runtime introspection abilities

diff --git a/src/Propel/Runtime/Query/ModelJoin.php → src/Propel/Runtime/ActiveQuery/ModelJoin.php b/src/Propel/Runtime/Query/ModelJoin.php → src/Propel/Runtime/ActiveQuery/ModelJoin.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
 use Propel\Runtime\Map\RelationMap;
 use Propel\Runtime\Map\TableMap;

diff --git a/src/Propel/Runtime/Query/ModelWith.php → src/Propel/Runtime/ActiveQuery/ModelWith.php b/src/Propel/Runtime/Query/ModelWith.php → src/Propel/Runtime/ActiveQuery/ModelWith.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
 use Propel\Runtime\Map\RelationMap;
 

diff --git a/src/Propel/Runtime/Query/PropelQuery.php → ...ropel/Runtime/ActiveQuery/PropelQuery.php b/src/Propel/Runtime/Query/PropelQuery.php → ...ropel/Runtime/ActiveQuery/PropelQuery.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
 
 use Propel\Runtime\Exception\ClassNotFoundException;
 

diff --git a/...opel/Runtime/Om/ActiveRecordInterface.php → ...me/ActiveRecord/ActiveRecordInterface.php b/...opel/Runtime/Om/ActiveRecordInterface.php → ...me/ActiveRecord/ActiveRecordInterface.php
@@ -8,14 +8,13 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
 
 /**
- * This ActiveRecord interface help to find Propel Object
+ * This ActiveRecord interface helps to find Propel Object
  *
  * @author jaugustin
  */
 interface ActiveRecordInterface
 {
-
 }
diff --git a/...Runtime/Om/NestedSetRecursiveIterator.php → ...tiveRecord/NestedSetRecursiveIterator.php b/...Runtime/Om/NestedSetRecursiveIterator.php → ...tiveRecord/NestedSetRecursiveIterator.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
 
 /**
  * Pre-order node iterator for Node objects.

diff --git a/src/Propel/Runtime/Om/NodeObject.php → ...ropel/Runtime/ActiveRecord/NodeObject.php b/src/Propel/Runtime/Om/NodeObject.php → ...ropel/Runtime/ActiveRecord/NodeObject.php
@@ -8,7 +8,7 @@
  * @license MIT License
  */
 
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
 
 use Propel\Runtime\Connection\ConnectionInterface;