Commit Graph

33 Commits

Author SHA1 Message Date
Carsten Brandt
1273438eee Merge PR #2885 branch 'revert-2048' of https://github.com/cebe/yii
* 'revert-2048' of https://github.com/cebe/yii:
  added changelog line for #2884
  added unit test for #2884
  fixed wrong dependency in unit test
  reverted #2048 as it breaks logic in createFindCommand()

Conflicts:
	CHANGELOG
2014-01-28 12:00:04 +01:00
Paul Klimov
a49e82999b Added support for scopes in CStatRelation 2013-10-02 15:37:56 +03:00
Carsten Brandt
dee34ca54d added unit test for #2884 2013-09-18 14:00:37 +02:00
John Was
bb07a7abdd detect properly if criteria->select starts with a count() expression in CActiveFinder->count() method 2013-08-21 21:45:08 +02:00
Carsten Brandt
132b4fd612 added unit test to verify behavior for #2756 2013-08-14 23:49:48 +02:00
Klimov Paul
63a3e57cc4 PR #2569 has been reverted. 2013-06-26 00:07:48 +03:00
Paul Klimov
ccc0a45022 Test case "CActiveRecordTest::testCustomAttributes()" has been added. 2013-06-25 11:23:43 +03:00
Carsten Brandt
f8de04a066 Added unit test for #2530 2013-06-03 08:14:03 +02:00
Carsten Brandt
aebaff34c5 Merge pull request #2346 branch '662-lazy-load-through-relation' of https://github.com/klimov-paul/yii
* '662-lazy-load-through-relation' of https://github.com/klimov-paul/yii:
  Issue #662 has been added to CHANGELOG.
  "CActiveFinder::applyLazyCondition()" has been updated to use last relation in the join chain, while composing where condition.
  Test case for issue #662 has been improved.
  Test case "CActiveRecordTest::testHasOneThroughLazy()" has been added to expose issue #662

Conflicts:
	tests/framework/db/ar/CActiveRecordTest.php
2013-05-27 05:06:23 +02:00
Carsten Brandt
ffe6b94f7b Merge pull request #2350 branch '139-has-many-through-with-condition' of https://github.com/klimov-paul/yii into klimov-paul-139-has-many-through-with-condition
* '139-has-many-through-with-condition' of https://github.com/klimov-paul/yii:
  Test relation condition for "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been adjusted to be type aware.
  "CJoinElement::applyLazyCondition()" and "CActiveRecordTest" have been updated to match PHP 5.2.
  Issue #139 has been added to CHANGELOG.
  "CJoinElement::applyLazyCondition()" has been updated allowing to respect relation condition and params.
  Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been improved to cover relation params as well.
  Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been created to expose issue #139

Conflicts:
	tests/framework/db/ar/CActiveRecordTest.php
2013-05-27 03:50:05 +02:00
Paul Klimov
da49c8812b Merge pull request #2295 from klimov-paul/101-active-record-relation-merge-with
Issue 101: Active Record find through with custom select
2013-05-22 10:07:42 -07:00
Paul Klimov
72313fdf18 Test relation condition for "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been adjusted to be type aware. 2013-04-23 16:44:58 +03:00
Paul Klimov
a99a93769d Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been improved to cover relation params as well. 2013-04-15 17:03:42 +03:00
Paul Klimov
9a3e956d3a Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been created to expose issue #139 2013-04-15 16:14:52 +03:00
Paul Klimov
3bfb6a0246 Test case for issue #662 has been improved. 2013-04-15 12:46:00 +03:00
Paul Klimov
1721f026f3 Test case "CActiveRecordTest::testHasOneThroughLazy()" has been added to expose issue #662 2013-04-15 11:30:46 +03:00
resurtm
6533997042 CActiveRecord unit tests models: added properties PHPDocs. 2013-04-06 11:22:11 +06:00
Paul Klimov
45d7835391 Test case "CActiveRecordTest::testHasManyThroughHasManyWithCustomSelect()" has been added to expose issue #101 2013-04-04 11:38:29 +03:00
Carsten Brandt
c658823737 unit test for scenario described in #507
passing with current code, so not reproduceable
2012-09-07 17:58:25 +02:00
Carsten Brandt
f3e7a8f006 need to move beforeFindInternal() after adding scopes
fix #1102 was not 100% correct as it was not possible to apply
additional scopes in relation definition and query criteria.
2012-09-07 17:06:53 +02:00
Carsten Brandt
33ebfd63e8 fixes #1326, added unit tests for #741 2012-09-03 21:33:48 +02:00
Carsten Brandt
805b3653e6 unit tests for criteria modification in beforeFind
some are currently failing due to issue #93
2012-08-01 21:38:43 +02:00
Alexander Kochetov
33cabc62c8 #1070 fix 2012-07-30 21:52:28 +04:00
Alexander Kochetov
fca49df5b6 Fix the beforeFind() behavior of the framework 2012-07-27 17:50:34 +04:00
alexander.makarow
5bcb07f752 (Fixes issue 2647) Fixed inconvenient way of defining through relation.
(Fixes issue 2646)
(Fixes issue 2706) Added ability to join on a specific keys.
2011-10-13 17:41:55 +00:00
alexander.makarow
76a61a8c14 (Fixes issue 2637) Related table alias set dynamically in relational query is now available in the scopes of reated model 2011-07-12 21:05:22 +00:00
alexander.makarow
1680724f1f (Fixes issue 2029) Added scope support to Model::relations() 2011-07-06 21:49:58 +00:00
alexander.makarow
f7505c00f9 (Fixes issue 2319) Added support to call behavior scope through criteria 'with'=>array('scopes'=>'behaviorScope') 2011-04-17 10:38:14 +00:00
alexander.makarow
b1599035de (Fixes issue 2274) merging of "with" fails if there is joinType 2011-03-31 21:22:23 +00:00
alexander.makarow
78bf76d3ae (Fixes issue 1117) Added support for "through" in Active Record relations allowing to handle association table data 2011-02-28 17:19:09 +00:00
alexander.makarow
286d95aac3 Added ability to perform Relational JOIN without getting related models 2011-02-25 22:54:03 +00:00
alexander.makarow
486acc4f5c (Fixes issue 558) Added parametrized named scopes, added scopes to criteria, implemented scope criteria merging 2011-02-19 00:11:00 +00:00
alexander.makarow
1f757cbf53 improved unit tests 2011-02-18 15:25:38 +00:00