* '1849-additions' of https://github.com/resurtm/yii:
Additions to #1849.
removed unnecessary spaces
replaced spaces to tabs
fix changelog
fix changelog
#1515 Use index support in relations
* '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
* '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii:
removed occasional FormInput file
fix#2378 CActiveRecord::tableName() in namespaced model
Ability to substitute model attribute name, to use custom data getter. It is not dangerous to use any custom fields and getters, because it will work for read-only.
The message in line 1520 is different from the ones in lines 542 and 1034, only differ in punctuation and case. Changed 1520 to match 542 and 1034. Message from 1520 should disappear in next "build message" command run.
$this->getMetaData()->tableSchema replaced with $this->getTableSchema() in CActiveRecord::insert(), CActiveRecord::getPrimaryKey() and CActiveRecord::setPrimaryKey() to match usage in other methods.
* '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
* '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
