Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move Query to ActiveQuery

  • Loading branch information...
commit 5ce810f0b319f1456485f9c7a61f3e5218324975 1 parent cbb7e9b
@willdurand willdurand authored
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
View
2  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);
View
2  src/Propel/Generator/Builder/Om/ObjectBuilder.php
@@ -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',
View
2  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'
);
}
View
6 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');
View
2  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);
View
14 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.
View
4 ...pel/Runtime/Query/Criterion/AbstractCriterion.php → ...ntime/ActiveQuery/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;
View
4 ...untime/Query/Criterion/AbstractModelCriterion.php → .../ActiveQuery/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.
View
6 ...Propel/Runtime/Query/Criterion/BasicCriterion.php → .../Runtime/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,
View
4 ...l/Runtime/Query/Criterion/BasicModelCriterion.php → ...ime/ActiveQuery/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,
View
4 ...ropel/Runtime/Query/Criterion/CustomCriterion.php → ...Runtime/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'
View
2  ...ry/Criterion/Exception/InvalidClauseException.php → ...ry/Criterion/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;
View
2  ...ery/Criterion/Exception/InvalidValueException.php → ...ery/Criterion/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;
View
4 src/Propel/Runtime/Query/Criterion/InCriterion.php → ...pel/Runtime/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 (?, ?)
View
2  ...opel/Runtime/Query/Criterion/InModelCriterion.php → ...untime/ActiveQuery/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,
View
4 src/Propel/Runtime/Query/Criterion/LikeCriterion.php → ...l/Runtime/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;
/**
View
4 ...el/Runtime/Query/Criterion/LikeModelCriterion.php → ...time/ActiveQuery/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;
/**
View
6 src/Propel/Runtime/Query/Criterion/RawCriterion.php → ...el/Runtime/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;
View
6 ...pel/Runtime/Query/Criterion/RawModelCriterion.php → ...ntime/ActiveQuery/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;
View
4 ...Runtime/Query/Criterion/SeveralModelCriterion.php → ...e/ActiveQuery/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 ?'
View
2  ...untime/Query/Exception/UnknownColumnException.php → .../ActiveQuery/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;
View
2  ...Runtime/Query/Exception/UnknownModelException.php → ...e/ActiveQuery/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;
View
2  ...time/Query/Exception/UnknownRelationException.php → ...ctiveQuery/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;
View
4 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;
View
26 src/Propel/Runtime/Query/ModelCriteria.php → src/Propel/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
View
2  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;
View
2  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;
View
2  src/Propel/Runtime/Query/PropelQuery.php → src/Propel/Runtime/ActiveQuery/PropelQuery.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Query;
+namespace Propel\Runtime\ActiveQuery;
use Propel\Runtime\Exception\ClassNotFoundException;
View
2  src/Propel/Runtime/Adapter/AdapterInterface.php
@@ -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.
View
2  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
@@ -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.
View
2  src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php
@@ -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.
View
12 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
@@ -18,7 +18,7 @@
use Propel\Runtime\Exception\InvalidArgumentException;
use Propel\Runtime\Map\ColumnMap;
use Propel\Runtime\Map\DatabaseMap;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\PropelDateTime;
use Propel\Runtime\Util\PropelColumnTypes;
@@ -324,7 +324,7 @@ public function useQuoteIdentifier()
*
* @param string $sql The sql statement
* @param array $params array('column' => ..., 'table' => ..., 'value' => ...)
- * @param Propel\Runtime\Query\Criteria $values
+ * @param Propel\Runtime\ActiveQuery\Criteria $values
* @param Propel\Runtime\Map\DatabaseMap $dbMap
*/
public function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap $dbMap)
@@ -334,7 +334,7 @@ public function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap
/**
* Returns the "DELETE FROM <table> [AS <alias>]" part of DELETE query.
*
- * @param Propel\Runtime\Query\Criteria $criteria
+ * @param Propel\Runtime\ActiveQuery\Criteria $criteria
* @param string $tableName
*
* @return string
@@ -366,7 +366,7 @@ public function getDeleteFromClause(Criteria $criteria, $tableName)
* taking into account select columns and 'as' columns (i.e. columns aliases)
* Move from BasePeer to PdoAdapter and turn from static to non static
*
- * @param Propel\Runtime\Query\Criteria $criteria
+ * @param Propel\Runtime\ActiveQuery\Criteria $criteria
* @param array $fromClause
* @param boolean $aliasAll
*
@@ -441,8 +441,8 @@ public function createSelectSqlPart(Criteria $criteria, &$fromClause, $aliasAll
*
* @see http://propel.phpdb.org/trac/ticket/795
*
- * @param Propel\Runtime\Query\Criteria $criteria
- * @return Propel\Runtime\Query\Criteria The input, with Select columns replaced by aliases
+ * @param Propel\Runtime\ActiveQuery\Criteria $criteria
+ * @return Propel\Runtime\ActiveQuery\Criteria The input, with Select columns replaced by aliases
*/
public function turnSelectColumnsToAliases(Criteria $criteria)
{
View
4 src/Propel/Runtime/Adapter/Pdo/PgsqlAdapter.php
@@ -14,7 +14,7 @@
use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Exception\InvalidArgumentException;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
@@ -144,7 +144,7 @@ public function random($seed=NULL)
/**
* @see PdoAdapter::getDeleteFromClause()
*
- * @param Propel\Runtime\Query\Criteria $criteria
+ * @param Propel\Runtime\ActiveQuery\Criteria $criteria
* @param string $tableName
*
* @return string
View
2  src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php
@@ -14,7 +14,7 @@
use Propel\Runtime\Adapter\Exception\UnsupportedEncodingException;
use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Connection\StatementInterface;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Map\ColumnMap;
use Propel\Runtime\Map\DatabaseMap;
View
2  src/Propel/Runtime/Collection/ObjectCollection.php
@@ -17,7 +17,7 @@
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Exception\RuntimeException;
use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Query\PropelQuery;
+use Propel\Runtime\ActiveQuery\PropelQuery;
use Propel\Runtime\Util\BasePeer;
/**
View
2  src/Propel/Runtime/Formatter/AbstractFormatter.php
@@ -13,7 +13,7 @@
use Propel\Runtime\Propel;
use Propel\Runtime\Connection\StatementInterface;
use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
* Abstract class for query formatter
View
2  src/Propel/Runtime/Formatter/OnDemandFormatter.php
@@ -11,7 +11,7 @@
namespace Propel\Runtime\Formatter;
use Propel\Runtime\Exception\LogicException;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
use Propel\Runtime\Connection\StatementInterface;
/**
View
2  src/Propel/Runtime/Util/BasePeer.php
@@ -13,7 +13,7 @@
use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Exception\RuntimeException;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* This is a utility class for all generated Peer classes in the system.
View
2  src/Propel/Runtime/Util/PropelModelPager.php
@@ -10,7 +10,7 @@
namespace Propel\Runtime\Util;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
* Implements a pager based on a ModelCriteria
Please sign in to comment.
Something went wrong with that request. Please try again.