Permalink
Browse files

Move Query to ActiveQuery

  • Loading branch information...
willdurand committed Jul 30, 2012
1 parent cbb7e9b commit 5ce810f0b319f1456485f9c7a61f3e5218324975
Showing with 80 additions and 80 deletions.
  1. +1 −1 src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehavior.php
  2. +1 −1 src/Propel/Generator/Builder/Om/ObjectBuilder.php
  3. +1 −1 src/Propel/Generator/Builder/Om/PeerBuilder.php
  4. +3 −3 src/Propel/Generator/Builder/Om/QueryBuilder.php
  5. +1 −1 src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
  6. +7 −7 src/Propel/Runtime/{Query → ActiveQuery}/Criteria.php
  7. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/AbstractCriterion.php
  8. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/AbstractModelCriterion.php
  9. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/BasicCriterion.php
  10. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/BasicModelCriterion.php
  11. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/CustomCriterion.php
  12. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/Exception/InvalidClauseException.php
  13. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/Exception/InvalidValueException.php
  14. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/InCriterion.php
  15. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/InModelCriterion.php
  16. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/LikeCriterion.php
  17. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/LikeModelCriterion.php
  18. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/RawCriterion.php
  19. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/RawModelCriterion.php
  20. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/SeveralModelCriterion.php
  21. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownColumnException.php
  22. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownModelException.php
  23. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownRelationException.php
  24. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Join.php
  25. +13 −13 src/Propel/Runtime/{Query → ActiveQuery}/ModelCriteria.php
  26. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/ModelJoin.php
  27. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/ModelWith.php
  28. +1 −1 src/Propel/Runtime/{Query → ActiveQuery}/PropelQuery.php
  29. +1 −1 src/Propel/Runtime/Adapter/AdapterInterface.php
  30. +1 −1 src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
  31. +1 −1 src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php
  32. +6 −6 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
  33. +2 −2 src/Propel/Runtime/Adapter/Pdo/PgsqlAdapter.php
  34. +1 −1 src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php
  35. +1 −1 src/Propel/Runtime/Collection/ObjectCollection.php
  36. +1 −1 src/Propel/Runtime/Formatter/AbstractFormatter.php
  37. +1 −1 src/Propel/Runtime/Formatter/OnDemandFormatter.php
  38. +1 −1 src/Propel/Runtime/Util/BasePeer.php
  39. +1 −1 src/Propel/Runtime/Util/PropelModelPager.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);
@@ -260,7 +260,7 @@ protected function addClassBody(&$script)
'\Propel\Runtime\Collection\ObjectCollection',
'\Propel\Runtime\Exception\BadMethodCallException',
'\Propel\Runtime\Exception\PropelException',
- '\Propel\Runtime\Query\Criteria',
+ '\Propel\Runtime\ActiveQuery\Criteria',
'\Propel\Runtime\ActiveRecord\ActiveRecordInterface',
'\Propel\Runtime\Parser\AbstractParser',
'\Propel\Runtime\Propel',
@@ -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'
);
}
@@ -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');
@@ -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);
@@ -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.
@@ -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;
@@ -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.
@@ -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,
@@ -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,
@@ -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'
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query\Criterion\Exception;
+namespace Propel\Runtime\ActiveQuery\Criterion\Exception;
use Propel\Runtime\Exception\InvalidArgumentException;
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query\Criterion\Exception;
+namespace Propel\Runtime\ActiveQuery\Criterion\Exception;
use Propel\Runtime\Exception\InvalidArgumentException;
@@ -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 (?, ?)
@@ -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,
@@ -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;
/**
@@ -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;
/**
@@ -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;
@@ -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;
@@ -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 ?'
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
use Propel\Runtime\Exception\RuntimeException;
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
use Propel\Runtime\Exception\RuntimeException;
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query\Exception;
+namespace Propel\Runtime\ActiveQuery\Exception;
use Propel\Runtime\Exception\RuntimeException;
@@ -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;
@@ -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
@@ -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;
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
use Propel\Runtime\Map\RelationMap;
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
use Propel\Runtime\Exception\ClassNotFoundException;
@@ -14,7 +14,7 @@
use Propel\Runtime\Connection\StatementInterface;
use Propel\Runtime\Map\ColumnMap;
use Propel\Runtime\Map\DatabaseMap;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Interface for adapters.
@@ -16,7 +16,7 @@
use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Exception\InvalidArgumentException;
use Propel\Runtime\Map\DatabaseMap;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* This is used to connect to a MSSQL database.
@@ -16,7 +16,7 @@
use Propel\Runtime\Exception\InvalidArgumentException;
use Propel\Runtime\Map\ColumnMap;
use Propel\Runtime\Util\BasePeer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Oracle adapter.
Oops, something went wrong.

0 comments on commit 5ce810f

Please sign in to comment.