Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Move Om to ActiveRecord #288

Merged
merged 3 commits into from

4 participants

@willdurand
Owner

No description provided.

@travisbot

This pull request passes (merged cbb7e9b into cb24f84).

...tedSet/NestedSetBehaviorObjectBuilderModifierTest.php
@@ -22,7 +22,7 @@
use Propel\Runtime\Collection\ObjectCollection;
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Om\NestedSetRecursiveIterator;
+use Propel\Runtime\ActiveRecord\NestedSetRecursiveIterator;
@jaugustin Collaborator

alphabetical order should be apply ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@fzaninotto

How about Builder\Om?

@willdurand
Owner
@fzaninotto

So Generator\Builder\Om will become... Generator\Builder\Class?

@willdurand
Owner
@fzaninotto

Not sure I understand you

@willdurand
Owner

I also moved Query to ActiveQuery, what do you think?

I did that because I think it's better for everyone to understand the two distinct APIs.

@willdurand
Owner

In the generator, we could have:

  • Builders\ActiveRecord
  • Builders\ActiveQuery
@travisbot

This pull request passes (merged 2596d09 into cb24f84).

@fzaninotto

ah ok. I'm fine with that. But shouldn't we first remove the Peer stuff?

@willdurand
Owner

Yep, that's why I didn't rename the generator part yet.

@willdurand willdurand merged commit 901cc87 into from
@willdurand
Owner

Tadam!

@jeremyFreeAgent jeremyFreeAgent referenced this pull request from a commit in jeremyFreeAgent/Propel2
@K-Phoen K-Phoen Fix: port PR #288 from Propel a9a8181
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 239 additions and 240 deletions.
  1. +1 −1  src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceParentBehavior.php
  2. +1 −1  src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
  3. +2 −2 src/Propel/Generator/Builder/Om/ObjectBuilder.php
  4. +1 −1  src/Propel/Generator/Builder/Om/PeerBuilder.php
  5. +3 −3 src/Propel/Generator/Builder/Om/QueryBuilder.php
  6. +1 −1  src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
  7. +7 −7 src/Propel/Runtime/{Query → ActiveQuery}/Criteria.php
  8. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/AbstractCriterion.php
  9. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/AbstractModelCriterion.php
  10. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/BasicCriterion.php
  11. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/BasicModelCriterion.php
  12. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/CustomCriterion.php
  13. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Criterion/Exception/InvalidClauseException.php
  14. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Criterion/Exception/InvalidValueException.php
  15. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/InCriterion.php
  16. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Criterion/InModelCriterion.php
  17. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/LikeCriterion.php
  18. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/LikeModelCriterion.php
  19. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/RawCriterion.php
  20. +3 −3 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/RawModelCriterion.php
  21. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Criterion/SeveralModelCriterion.php
  22. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownColumnException.php
  23. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownModelException.php
  24. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/Exception/UnknownRelationException.php
  25. +2 −2 src/Propel/Runtime/{Query → ActiveQuery}/Join.php
  26. +13 −13 src/Propel/Runtime/{Query → ActiveQuery}/ModelCriteria.php
  27. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/ModelJoin.php
  28. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/ModelWith.php
  29. +1 −1  src/Propel/Runtime/{Query → ActiveQuery}/PropelQuery.php
  30. +2 −3 src/Propel/Runtime/{Om → ActiveRecord}/ActiveRecordInterface.php
  31. +1 −1  src/Propel/Runtime/{Om → ActiveRecord}/NestedSetRecursiveIterator.php
  32. +1 −1  src/Propel/Runtime/{Om → ActiveRecord}/NodeObject.php
  33. +1 −1  src/Propel/Runtime/{Om → ActiveRecord}/PreOrderNodeIterator.php
  34. +1 −1  src/Propel/Runtime/Adapter/AdapterInterface.php
  35. +1 −1  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
  36. +1 −1  src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php
  37. +6 −6 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
  38. +2 −2 src/Propel/Runtime/Adapter/Pdo/PgsqlAdapter.php
  39. +1 −1  src/Propel/Runtime/Adapter/Pdo/SqlsrvAdapter.php
  40. +1 −1  src/Propel/Runtime/Collection/ObjectCollection.php
  41. +1 −1  src/Propel/Runtime/Formatter/AbstractFormatter.php
  42. +1 −1  src/Propel/Runtime/Formatter/OnDemandFormatter.php
  43. +1 −1  src/Propel/Runtime/Util/BasePeer.php
  44. +1 −1  src/Propel/Runtime/Util/PropelModelPager.php
  45. +1 −1  tests/Propel/Tests/BookstoreTest.php
  46. +1 −1  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
  47. +1 −1  tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php
  48. +2 −2 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
  49. +1 −1  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php
  50. +1 −1  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierTest.php
  51. +1 −1  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php
  52. +1 −1  tests/Propel/Tests/Generator/Behavior/PeerBehaviorTest.php
  53. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php
  54. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php
  55. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorPeerBuilderModifierTest.php
  56. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorPeerBuilderModifierWithScopeTest.php
  57. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php
  58. +1 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php
  59. +1 −1  tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php
  60. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php
  61. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
  62. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php
  63. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
  64. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
  65. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
  66. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php
  67. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php
  68. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerTest.php
  69. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php
  70. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php
  71. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php
  72. +8 −8 tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php
  73. +1 −1  tests/Propel/Tests/Generator/Util/QuickBuilderTest.php
  74. +1 −1  tests/Propel/Tests/Helpers/Bookstore/Behavior/BookstoreNestedSetTestBase.php
  75. +1 −1  tests/Propel/Tests/Helpers/Bookstore/Behavior/BookstoreSortableTestBase.php
  76. +1 −1  tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php
  77. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/CriteriaCombineTest.php
  78. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/CriteriaFluidConditionTest.php
  79. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/CriteriaFluidOperatorTest.php
  80. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/CriteriaMergeTest.php
  81. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/CriteriaTest.php
  82. +4 −4 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/BasicCriterionTest.php
  83. +4 −4 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/BasicModelCriterionTest.php
  84. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/CustomCriterionTest.php
  85. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/InCriterionTest.php
  86. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/InModelCriterionTest.php
  87. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/LikeCriterionTest.php
  88. +4 −4 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/LikeModelCriterionTest.php
  89. +4 −4 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/RawCriterionTest.php
  90. +4 −4 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/RawModelCriterionTest.php
  91. +5 −5 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/Criterion/SeveralModelCriterionTest.php
  92. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/JoinTest.php
  93. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaForUseQuery.php
  94. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaHooksTest.php
  95. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaSelectTest.php
  96. +9 −9 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaTest.php
  97. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaWithNamespaceTest.php
  98. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelCriteriaWithSchemaTest.php
  99. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelJoinTest.php
  100. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/ModelWithTest.php
  101. +3 −3 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/PropelQueryTest.php
  102. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/SubQueryTest.php
  103. +2 −2 tests/Propel/Tests/Runtime/{Query → ActiveQuery}/TestableModelCriteria.php
  104. +1 −1  tests/Propel/Tests/Runtime/{Om → ActiveRecord}/BaseObjectConvertTest.php
  105. +1 −1  tests/Propel/Tests/Runtime/{Om → ActiveRecord}/BaseObjectSerializeTest.php
  106. +1 −1  tests/Propel/Tests/Runtime/{Om → ActiveRecord}/BaseObjectTest.php
  107. +1 −1  tests/Propel/Tests/Runtime/Adapter/DBAdapterTest.php
  108. +1 −1  tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php
  109. +2 −2 tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php
  110. +1 −1  tests/Propel/Tests/Runtime/Collection/ObjectCollectionTest.php
  111. +2 −2 tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php
  112. +2 −2 tests/Propel/Tests/Runtime/Collection/OnDemandCollectionTest.php
  113. +2 −2 tests/Propel/Tests/Runtime/Collection/OnDemandIteratorTest.php
  114. +1 −1  tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php
  115. +1 −1  tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php
  116. +1 −1  tests/Propel/Tests/Runtime/Formatter/ArrayFormatterWithTest.php
  117. +1 −1  tests/Propel/Tests/Runtime/Formatter/ObjectFormatterInheritanceTest.php
  118. +1 −1  tests/Propel/Tests/Runtime/Formatter/ObjectFormatterTest.php
  119. +2 −2 tests/Propel/Tests/Runtime/Formatter/ObjectFormatterWithTest.php
  120. +1 −1  tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterTest.php
  121. +1 −1  tests/Propel/Tests/Runtime/Formatter/OnDemandFormatterWithTest.php
  122. +1 −1  tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php
  123. +1 −1  tests/Propel/Tests/Runtime/Formatter/StatementFormatterTest.php
  124. +1 −1  tests/Propel/Tests/Runtime/Util/BasePeerExceptionsTest.php
  125. +1 −1  tests/Propel/Tests/Runtime/Util/BasePeerTest.php
  126. +1 −1  tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
  127. +1 −1  tests/Propel/Tests/Runtime/Util/PropelModelPagerTest.php
  128. +1 −1  tests/Propel/Tests/Ticket520Test.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/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);
View
4 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'
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
5 src/Propel/Runtime/Om/ActiveRecordInterface.php → ...el/Runtime/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
{
-
}
View
2  src/Propel/Runtime/Om/NestedSetRecursiveIterator.php → ...ntime/ActiveRecord/NestedSetRecursiveIterator.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
/**
* Pre-order node iterator for Node objects.
View
2  src/Propel/Runtime/Om/NodeObject.php → src/Propel/Runtime/ActiveRecord/NodeObject.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
use Propel\Runtime\Connection\ConnectionInterface;
View
2  src/Propel/Runtime/Om/PreOrderNodeIterator.php → ...pel/Runtime/ActiveRecord/PreOrderNodeIterator.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Runtime\Om;
+namespace Propel\Runtime\ActiveRecord;
/**
* Pre-order node iterator for Node objects.
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
View
2  tests/Propel/Tests/BookstoreTest.php
@@ -10,7 +10,7 @@
namespace Propel\Tests;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Tests\Helpers\Bookstore\BookstoreEmptyTestBase;
View
2  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
@@ -27,7 +27,7 @@
use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Map\RelationMap;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Generator\Util\QuickBuilder;
View
2  tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifierTest.php
@@ -14,7 +14,7 @@
use Propel\Generator\Behavior\I18n\I18nBehavior;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
View
4 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
@@ -21,8 +21,8 @@
use Propel\Runtime\Propel;
use Propel\Runtime\Collection\ObjectCollection;
use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Om\NestedSetRecursiveIterator;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveRecord\NestedSetRecursiveIterator;
/**
* Tests for NestedSetBehaviorObjectBuilderModifier class
View
2  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierWithScopeTest.php
@@ -17,7 +17,7 @@
use Propel\Tests\Bookstore\Behavior\Table10Peer;
use Propel\Tests\Bookstore\Behavior\Table10Query;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Exception\PropelException;
/**
View
2  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierTest.php
@@ -15,7 +15,7 @@
use Propel\Tests\Bookstore\Behavior\Table9;
use Propel\Tests\Bookstore\Behavior\Table9Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for NestedSetBehaviorPeerBuilderModifier class
View
2  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php
@@ -17,7 +17,7 @@
use Propel\Tests\Bookstore\Behavior\Table10;
use Propel\Tests\Bookstore\Behavior\Table10Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for NestedSetBehaviorPeerBuilderModifier class
View
2  tests/Propel/Tests/Generator/Behavior/PeerBehaviorTest.php
@@ -14,7 +14,7 @@
use Propel\Tests\Bookstore\Behavior\Table3Peer;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the generated Peer behavior hooks.
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierTest.php
@@ -15,7 +15,7 @@
use Propel\Tests\Bookstore\Behavior\Table11;
use Propel\Tests\Bookstore\Behavior\Table11Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for SortableBehavior class
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorObjectBuilderModifierWithScopeTest.php
@@ -15,7 +15,7 @@
use Propel\Tests\Bookstore\Behavior\Table12;
use Propel\Tests\Bookstore\Behavior\Table12Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for SortableBehavior class
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorPeerBuilderModifierTest.php
@@ -14,7 +14,7 @@
use Propel\Tests\Bookstore\Behavior\Table11Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for SortableBehavior class
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorPeerBuilderModifierWithScopeTest.php
@@ -14,7 +14,7 @@
use Propel\Tests\Bookstore\Behavior\Table12Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests for SortableBehavior class
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierTest.php
@@ -16,7 +16,7 @@
use Propel\Tests\Bookstore\Behavior\Table11Peer;
use Propel\Tests\Bookstore\Behavior\Table11Query;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Collection\ObjectCollection;
/**
View
2  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorQueryBuilderModifierWithScopeTest.php
@@ -16,7 +16,7 @@
use Propel\Tests\Bookstore\Behavior\Table12Peer;
use Propel\Tests\Bookstore\Behavior\Table12Query;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Collection\ObjectCollection;
/**
View
2  tests/Propel/Tests/Generator/Builder/Om/Fixtures/ComplexColumnTypeEntityWithConstructor.php
@@ -20,4 +20,4 @@ public function __construct()
array('foo', 'bar')
);
}
-}
+}
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectArrayColumnTypeTest.php
@@ -13,7 +13,7 @@
use Propel\Tests\Generator\Builder\Om\Fixtures\ComplexColumnTypeEntityWithConstructor;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
use MyNameSpace\ComplexColumnTypeEntity2;
use MyNameSpace\ComplexColumnTypeEntity2Peer;
use MyNameSpace\ComplexColumnTypeEntity2Query;
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
@@ -17,7 +17,7 @@
use Propel\Tests\Bookstore\Media;
use Propel\Tests\Bookstore\MediaPeer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
if (!defined('TESTS_BASE_DIR')) {
define('TESTS_BASE_DIR', realpath(__DIR__ . '/../../../../..'));
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectObjectColumnTypeTest.php
@@ -13,7 +13,7 @@
use Propel\Generator\Util\QuickBuilder;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
* Tests the generated objects for object column types accessor & mutator
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
@@ -33,7 +33,7 @@
use Propel\Tests\Bookstore\Review;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Collection\ObjectCollection;
use \DateTime;
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
@@ -46,7 +46,7 @@
use Propel\Runtime\Propel;
use Propel\Runtime\Collection\ObjectCollection;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
use Propel\Generator\Util\QuickBuilder;
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
@@ -30,7 +30,7 @@
use Propel\Tests\Bookstore\ReviewPeer;
use Propel\Runtime\Exception\PropelException;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php
@@ -34,7 +34,7 @@
use Propel\Tests\Bookstore\ReaderFavoritePeer;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the delete methods of the generated Peer classes.
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php
@@ -38,7 +38,7 @@
use Propel\Tests\Bookstore\ReaderFavoritePeer;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerTest.php
@@ -18,7 +18,7 @@
use Propel\Tests\Bookstore\MediaPeer;
use Propel\Tests\Bookstore\PublisherPeer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the generated Peer classes.
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryArrayColumnTypeTest.php
@@ -13,7 +13,7 @@
use Propel\Generator\Util\QuickBuilder;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the generated queries for array column types filters
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryEnumColumnTypeTest.php
@@ -13,7 +13,7 @@
use Propel\Generator\Util\QuickBuilder;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the generated queries for enum column types filters
View
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedQueryObjectColumnTypeTest.php
@@ -13,7 +13,7 @@
use Propel\Generator\Util\QuickBuilder;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Tests the generated queries for object column types filters
View
16 tests/Propel/Tests/Generator/Builder/Om/QueryBuilderTest.php
@@ -38,9 +38,9 @@
use Propel\Runtime\Propel;
use Propel\Runtime\Connection\ConnectionInterface;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\ModelCriteria;
-use Propel\Runtime\Query\ModelJoin;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
use Propel\Runtime\Util\BasePeer;
use \ReflectionMethod;
@@ -98,7 +98,7 @@ public function testCreateCustom()
public function testBasePreSelect()
{
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table2Query', 'basePreSelect');
- $this->assertEquals('Propel\Runtime\Query\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreSelect() by default');
+ $this->assertEquals('Propel\Runtime\ActiveQuery\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreSelect() by default');
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table3Query', 'basePreSelect');
$this->assertEquals('Propel\Tests\Bookstore\Behavior\Base\Table3Query', $method->getDeclaringClass()->getName(), 'BaseQuery overrides basePreSelect() when a behavior is registered');
@@ -107,7 +107,7 @@ public function testBasePreSelect()
public function testBasePreDelete()
{
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table2Query', 'basePreDelete');
- $this->assertEquals('Propel\Runtime\Query\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreDelete() by default');
+ $this->assertEquals('Propel\Runtime\ActiveQuery\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreDelete() by default');
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table3Query', 'basePreDelete');
$this->assertEquals('Propel\Tests\Bookstore\Behavior\Base\Table3Query', $method->getDeclaringClass()->getName(), 'BaseQuery overrides basePreDelete() when a behavior is registered');
@@ -116,7 +116,7 @@ public function testBasePreDelete()
public function testBasePostDelete()
{
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table2Query', 'basePostDelete');
- $this->assertEquals('Propel\Runtime\Query\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePostDelete() by default');
+ $this->assertEquals('Propel\Runtime\ActiveQuery\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePostDelete() by default');
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table3Query', 'basePostDelete');
$this->assertEquals('Propel\Tests\Bookstore\Behavior\Base\Table3Query', $method->getDeclaringClass()->getName(), 'BaseQuery overrides basePostDelete() when a behavior is registered');
@@ -125,7 +125,7 @@ public function testBasePostDelete()
public function testBasePreUpdate()
{
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table2Query', 'basePreUpdate');
- $this->assertEquals('Propel\Runtime\Query\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreUpdate() by default');
+ $this->assertEquals('Propel\Runtime\ActiveQuery\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePreUpdate() by default');
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table3Query', 'basePreUpdate');
$this->assertEquals('Propel\Tests\Bookstore\Behavior\Base\Table3Query', $method->getDeclaringClass()->getName(), 'BaseQuery overrides basePreUpdate() when a behavior is registered');
@@ -134,7 +134,7 @@ public function testBasePreUpdate()
public function testBasePostUpdate()
{
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table2Query', 'basePostUpdate');
- $this->assertEquals('Propel\Runtime\Query\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePostUpdate() by default');
+ $this->assertEquals('Propel\Runtime\ActiveQuery\ModelCriteria', $method->getDeclaringClass()->getName(), 'BaseQuery does not override basePostUpdate() by default');
$method = new ReflectionMethod('\Propel\Tests\Bookstore\Behavior\Table3Query', 'basePostUpdate');
$this->assertEquals('Propel\Tests\Bookstore\Behavior\Base\Table3Query', $method->getDeclaringClass()->getName(), 'BaseQuery overrides basePostUpdate() when a behavior is registered');
View
2  tests/Propel/Tests/Generator/Util/QuickBuilderTest.php
@@ -12,7 +12,7 @@
use Propel\Generator\Platform\SqlitePlatform;
use Propel\Generator\Util\QuickBuilder;
-use Propel\Runtime\Om\ActiveRecordInterface;
+use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
use Propel\Runtime\Propel;
use MyNameSpace\QuickBuildFoo1;
View
2  tests/Propel/Tests/Helpers/Bookstore/Behavior/BookstoreNestedSetTestBase.php
@@ -14,7 +14,7 @@
use Propel\Tests\Bookstore\Behavior\Table9Peer;
use Propel\Tests\Bookstore\Behavior\Table10Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
abstract class BookstoreNestedSetTestBase extends BookstoreTestBase
{
View
2  tests/Propel/Tests/Helpers/Bookstore/Behavior/BookstoreSortableTestBase.php
@@ -16,7 +16,7 @@
use Propel\Tests\Bookstore\Behavior\Table12;
use Propel\Tests\Bookstore\Behavior\Table12Peer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
abstract class BookstoreSortableTestBase extends BookstoreTestBase
{
View
2  tests/Propel/Tests/Helpers/Bookstore/BookstoreDataPopulator.php
@@ -11,7 +11,7 @@
namespace Propel\Tests\Helpers\Bookstore;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Tests\Bookstore\AcctAccessRole;
use Propel\Tests\Bookstore\Author;
View
4 ...ropel/Tests/Runtime/Query/CriteriaCombineTest.php → ...Tests/Runtime/ActiveQuery/CriteriaCombineTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\BaseTestCase;
use Propel\Runtime\Propel;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
View
4 ...ests/Runtime/Query/CriteriaFluidConditionTest.php → ...untime/ActiveQuery/CriteriaFluidConditionTest.php
@@ -8,11 +8,11 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
/**
* Test class for Criteria fluid conditions.
View
4 ...Tests/Runtime/Query/CriteriaFluidOperatorTest.php → ...Runtime/ActiveQuery/CriteriaFluidOperatorTest.php
@@ -8,11 +8,11 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
View
4 .../Propel/Tests/Runtime/Query/CriteriaMergeTest.php → ...l/Tests/Runtime/ActiveQuery/CriteriaMergeTest.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
use Propel\Tests\Bookstore\AuthorPeer;
use Propel\Tests\Bookstore\BookPeer;
use Propel\Tests\Bookstore\PublisherPeer;
-use Propel\Runtime\Query\Criteria;
+use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Util\BasePeer;
/**
View
6 tests/Propel/Tests/Runtime/Query/CriteriaTest.php → ...Propel/Tests/Runtime/ActiveQuery/CriteriaTest.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
use Propel\Tests\Bookstore\BookPeer;
@@ -17,8 +17,8 @@
use Propel\Runtime\Adapter\Pdo\MysqlAdapter;
use Propel\Runtime\Adapter\Pdo\PgsqlAdapter;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Join;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
use Propel\Runtime\Util\BasePeer;
/**
View
8 ...ts/Runtime/Query/Criterion/BasicCriterionTest.php → ...time/ActiveQuery/Criterion/BasicCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\BasicCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\BasicCriterion;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
/**
@@ -120,7 +120,7 @@ public function testAppendPsCanHandleNotEqualToNull()
}
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidValueException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
*/
public function testAppendPsThrowsExceptionWhenValueIsNullAndComparisonIsComplex()
{
View
8 ...ntime/Query/Criterion/BasicModelCriterionTest.php → ...ActiveQuery/Criterion/BasicModelCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\BasicModelCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\BasicModelCriterion;
/**
* Test class for BasicModelCriterion.
@@ -38,7 +38,7 @@ public function testAppendPsToAddsBindingInfoForNotNullValues()
}
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidClauseException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
*/
public function testAppendPsToThrowsExceptionWhenBindingAValueToAClauseWithNoQuestionMark()
{
View
6 ...s/Runtime/Query/Criterion/CustomCriterionTest.php → ...ime/ActiveQuery/Criterion/CustomCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\CustomCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\CustomCriterion;
/**
* Test class for CustomCriterion.
View
6 ...Tests/Runtime/Query/Criterion/InCriterionTest.php → ...Runtime/ActiveQuery/Criterion/InCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\InCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\InCriterion;
/**
* Test class for InCriterion.
View
6 .../Runtime/Query/Criterion/InModelCriterionTest.php → ...me/ActiveQuery/Criterion/InModelCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\InModelCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\InModelCriterion;
/**
* Test class for InModelCriterion.
View
6 ...sts/Runtime/Query/Criterion/LikeCriterionTest.php → ...ntime/ActiveQuery/Criterion/LikeCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\LikeCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\LikeCriterion;
use Propel\Runtime\Adapter\Pdo\PgsqlAdapter;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
View
8 ...untime/Query/Criterion/LikeModelCriterionTest.php → .../ActiveQuery/Criterion/LikeModelCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\LikeModelCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\LikeModelCriterion;
use Propel\Runtime\Adapter\Pdo\PgsqlAdapter;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
@@ -55,7 +55,7 @@ public function testAppendPsToCreatesANotLikeConditionIfSpecified()
}
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidClauseException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
*/
public function testAppendPsToWithACaseInsensitiveLikeConditionThrowsAnException()
{
View
8 ...ests/Runtime/Query/Criterion/RawCriterionTest.php → ...untime/ActiveQuery/Criterion/RawCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\RawCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\RawCriterion;
use \PDO;
@@ -25,7 +25,7 @@
class RawCriterionTest extends BaseTestCase
{
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidClauseException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
*/
public function testAppendPsToThrowsExceptionWhenClauseHasNoQuestionMark()
{
View
8 ...Runtime/Query/Criterion/RawModelCriterionTest.php → ...e/ActiveQuery/Criterion/RawModelCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\RawModelCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\RawModelCriterion;
use \PDO;
@@ -25,7 +25,7 @@
class RawModelCriterionTest extends BaseTestCase
{
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidClauseException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidClauseException
*/
public function testAppendPsToThrowsExceptionWhenClauseHasNoQuestionMark()
{
View
10 ...ime/Query/Criterion/SeveralModelCriterionTest.php → ...tiveQuery/Criterion/SeveralModelCriterionTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query\Criterion;
+namespace Propel\Tests\Runtime\ActiveQuery\Criterion;
use Propel\Tests\Helpers\BaseTestCase;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Criterion\SeveralModelCriterion;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Criterion\SeveralModelCriterion;
/**
* Test class for SeveralModelCriterion.
@@ -39,7 +39,7 @@ public function testAppendPsToAddsBindingInfoForNotNullValues()
}
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidValueException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
*/
public function testAppendPsToThrowsExceptionWhenOneOfTheValuesIsNull()
{
@@ -51,7 +51,7 @@ public function testAppendPsToThrowsExceptionWhenOneOfTheValuesIsNull()
}
/**
- * @expectedException Propel\Runtime\Query\Criterion\Exception\InvalidValueException
+ * @expectedException Propel\Runtime\ActiveQuery\Criterion\Exception\InvalidValueException
*/
public function testAppendPsToThrowsExceptionWhenTheValueIsNull()
{
View
6 tests/Propel/Tests/Runtime/Query/JoinTest.php → tests/Propel/Tests/Runtime/ActiveQuery/JoinTest.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\BaseTestCase;
use Propel\Runtime\Propel;
use Propel\Runtime\Adapter\Pdo\SqliteAdapter;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Join;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Join;
/**
* Test class for Join.
View
6 .../Tests/Runtime/Query/ModelCriteriaForUseQuery.php → .../Runtime/ActiveQuery/ModelCriteriaForUseQuery.php
@@ -1,9 +1,9 @@
<?php
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
class ModelCriteriaForUseQuery extends ModelCriteria
{
View
4 ...el/Tests/Runtime/Query/ModelCriteriaHooksTest.php → ...ts/Runtime/ActiveQuery/ModelCriteriaHooksTest.php
@@ -8,12 +8,12 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
use Propel\Tests\Helpers\Bookstore\BookstoreDataPopulator;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
use Propel\Runtime\Connection\ConnectionInterface;
/**
View
4 ...l/Tests/Runtime/Query/ModelCriteriaSelectTest.php → ...s/Runtime/ActiveQuery/ModelCriteriaSelectTest.php
@@ -8,14 +8,14 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Bookstore\AuthorPeer;
use Propel\Tests\Bookstore\BookQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
use Propel\Tests\Helpers\Bookstore\BookstoreDataPopulator;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
* Test class for ModelCriteria select() method.
View
18 .../Propel/Tests/Runtime/Query/ModelCriteriaTest.php → ...l/Tests/Runtime/ActiveQuery/ModelCriteriaTest.php
@@ -8,7 +8,7 @@
* @license MIT License
*/
-namespace Propel\Tests\Runtime\Query;
+namespace Propel\Tests\Runtime\ActiveQuery;
use Propel\Tests\Helpers\Bookstore\BookstoreTestBase;
use Propel\Tests\Helpers\Bookstore\BookstoreDataPopulator;
@@ -36,10 +36,10 @@
use Propel\Runtime\Formatter\ArrayFormatter;
use Propel\Runtime\Util\BasePeer;
use Propel\Runtime\Util\PropelModelPager;
-use Propel\Runtime\Query\Criteria;
-use Propel\Runtime\Query\Exception\UnknownColumnException;
-use Propel\Runtime\Query\Exception\UnknownRelationException;
-use Propel\Runtime\Query\ModelCriteria;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\Exception\UnknownColumnException;
+use Propel\Runtime\ActiveQuery\Exception\UnknownRelationException;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
/**
* Test class for ModelCriteria.
@@ -1168,11 +1168,11 @@ public function testWith()
$c->with('Author');
$withs = $c->getWith();
$this->assertTrue(array_key_exists('Author', $withs), 'with() adds an entry to the internal list of Withs');
- $this->assertInstanceOf('Propel\Runtime\Query\ModelWith', $withs['Author'], 'with() references the ModelWith object');
+ $this->assertInstanceOf('Propel\Runtime\ActiveQuery\ModelWith', $withs['Author'], 'with() references the ModelWith object');
}
/**
- * @expectedException \Propel\Runtime\Query\Exception\UnknownRelationException
+ * @expectedException \Propel\Runtime\ActiveQuery\Exception\UnknownRelationException
*/
public function testWithThrowsExceptionWhenJoinLacks()
{
@@ -1190,7 +1190,7 @@ public function testWithAlias()
}
/**
- * @expectedException \Propel\Runtime\Query\Exception\UnknownRelationException
+ * @expectedException \Propel\Runtime\ActiveQuery\Exception\UnknownRelationException
*/
public function testWithThrowsExceptionWhenNotUsingAlias()
{
@@ -2448,7 +2448,7 @@ public function testUseQueryCustomClass()
$c->setLimit(10);
$c->leftJoin('b.Author a');
- $c2 = $c->useQuery('a', 'Propel\Tests\Runtime\Query\ModelCriteriaForUseQuery');