Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-06 16:16:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,149 Commits 3 Branches 54 Tags
fafe5926cb783023370286397c467abcec94de62
Commit Graph

215 Commits

Author SHA1 Message Date
Carsten Brandt
d2aab58d09 Merge PR #2705 branch '1849-additions' of https://github.com/resurtm/yii 
* '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
 2014-01-28 12:06:38 +01:00
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
Alexander Makarov
dcec697c06 Fixes #3115: Updated phpdoc for better code completion in modern IDEs 2013-12-31 12:12:09 +01:00
Carsten Brandt
eab509ff98 Allow changing the AR database in beforeCount() 
like it is possible in beforeFind() already.

fixes #3014
 2013-11-06 14:48:02 +01:00
Paul Klimov
a49e82999b Added support for scopes in CStatRelation 2013-10-02 15:37:56 +03:00
Carsten Brandt
9356b42c81 reverted #2048 as it breaks logic in createFindCommand() 
fixes #2884
 2013-09-18 13:59:05 +02:00
Carsten Brandt
f5e592f22d better fix for #2378 2013-09-04 15:05:17 +02:00
Carsten Brandt
10b4b0f063 Merge branch '2738-ActiveRecord.tableName' of https://github.com/velosipedist/yii into velosipedist-2738-ActiveRecord.tableName 
* '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.
 2013-09-04 14:54:35 +02:00
velosipedist
8dd39e27a1 fix #2378 CActiveRecord::tableName() in namespaced model 2013-08-07 20:20:42 +04:00
resurtm
87deced5b0 Additions to #1849. 2013-07-31 10:21:49 +06:00
resurtm
cdc5f01b90 Merge branch 'pr/1849' 2013-07-31 09:32:29 +06:00
Aleksei Vesnin
215ccce3e2 Consistent getting table schema in CActiveRecord 
$this->getMetaData()->tableSchema replaced with $this->getTableSchema() in CActiveRecord::insert(), CActiveRecord::getPrimaryKey() and CActiveRecord::setPrimaryKey() to match usage in other methods.
 2013-07-04 19:39:23 +04:00
Klimov Paul
63a3e57cc4 PR #2569 has been reverted. 2013-06-26 00:07:48 +03:00
Klimov Paul
1d64ee88d9 Redundant condition for "names" has been removed from "CActiveRecord::getAttributes()" 2013-06-25 23:41:33 +03:00
Klimov Paul
21b187776f Redundant has been removed from "CActiveRecord::refresh()" 2013-06-25 23:02:04 +03:00
Paul Klimov
6caa4822a3 "CActiveRecord::_attributes" has been renamed to "CActiveRecord::_dbAttributes". 2013-06-25 16:56:34 +03:00
Paul Klimov
4eae5a71ad Code style at "CActiveRecord" has been fixed. 2013-06-25 16:53:47 +03:00
AnatolyRugalev
f7eba14beb Fixed disrespect of overrides of CActiveRecord::attributeNames() 2013-06-18 23:06:55 +06:00
Alexander Kochetov
9f6162f3a9 BELONGS_TO through 2013-06-02 20:06:59 +04:00
ThePepster
3bac41e6c3 Update doc block for getRelated method in CActiveRecord class. 2013-05-27 13:23:36 -06:00
ThePepster
71f1eb132d Update doc block for getRelated method in CActiveRecord class. 2013-05-27 13:15:27 -06:00
Alexander Makarov
c7a7b55201 Adjusted phpdoc, fixed code style 2013-05-27 13:59:51 +04:00
Alexander Makarov
f284867b91 Merge branch '1863_enhance_CActive_hierarchy_extensibility' of github.com:denisarius/yii into denisarius-1863_enhance_CActive_hierarchy_extensibility 
Conflicts:
	CHANGELOG
 2013-05-27 13:46:51 +04:00
Carsten Brandt
8051cb9d36 Merge pull request #1823 branch '1353-on-before-count' of https://github.com/jakob-stoeck/yii into jakob-stoeck-1353-on-before-count 
* '1353-on-before-count' of https://github.com/jakob-stoeck/yii:
  docstring fixes #1353
  phpdoc correction for onbeforecount #1353
  Adds onBeforeCount for Active Records, fixes #1353
 2013-04-25 00:53:04 +02:00
Jakob Stoeck
b7e1207a92 docstring fixes #1353 2013-04-24 13:20:14 +02:00
Klimov Paul
3277db163a CActiveRecord::getMetaData() has been updated preventing recursive invokes via __get(). 2013-04-06 14:29:57 +03:00
Paul Klimov
557d30ff11 Field "CActiveRecordMetaData::$_modelClassName" has been added to track active record class and compose verbose exception messages. 2013-03-28 16:09:49 +02:00
Paul Klimov
3d00012ef6 Code indenting at "CActiveRecordMetaData" has been fixed. 2013-03-28 11:56:51 +02:00
Paul Klimov
3298c2c691 Extra "CActiveRecordMetaData::$_model" field has been removed. 2013-03-28 11:56:50 +02:00
Klimov Paul
9ddc5d4001 Note about overriding "CActiveRecord::__construct()" has been added. 2013-03-28 11:56:50 +02:00
Klimov Paul
e36aea5248 CActiveRecord has been refactored: meta data objects are now stored at the static field. 2013-03-28 11:56:48 +02:00
Alexander Makarov
fa787ce919 Merge pull request #2170 from yiiframework-com-ua/uk_docs 
Fixing typos, PHPDocs
 2013-03-06 16:05:59 -08:00
borales
6d19a150d4 Replacing spaces with tabs, removing dots 
[ci skip]
 2013-03-06 20:59:38 +02:00
borales
2f68a75235 Replacing spaces with tabs 
[ci skip]
 2013-03-06 08:48:59 +02:00
borales
07975cad64 Fixing spaces 
[ci skip]
 2013-03-06 01:06:46 +02:00
borales
a7af2c5371 Fixing some typos, PHPDocs 
[ci skip]
 2013-03-06 00:24:35 +02:00
Alexander Makarov
356c00247e Fixes #2048: AR now uses alias from CActiveRecord::getTableAlias instead of always using default "t" 2013-03-06 02:21:24 +04:00
Sergey Larionov
390b0e797c Удалил дополнительную проверку в ar->update, которая приводила к ошибкам 2013-02-05 14:34:18 +11:00
Sergey
729a333d84 Fix table alias in ar->exists method 2013-02-05 03:25:30 +11:00
Sergey
826be39504 Update framework/db/ar/CActiveRecord.php 
method save() always returns true, even if the record does not exist in the database
 2013-02-01 02:43:18 +11:00
Sergey
8afb3b5855 Update framework/db/ar/CActiveRecord.php 
Если в ActiveRecord переопределить метод getTableAlias, то будут возникать ошибки неизвестной таблицы t, а так он будет использовать текущий алиас у таблицы
 2013-01-28 16:01:08 +11:00
resurtm
40dca168e1 PHPDoc: cache dependency related methods' arguments type changed from CCacheDependency to CCacheDependency|ICacheDependency 2013-01-18 14:38:07 +06:00
Abdul Malik Ikhsan
6247adaf26 change copyright symbol 2013-01-15 18:38:02 +07:00
Abdul Malik Ikhsan
46c8ef0d9a update copyright year 
from 2011 to 2013
 2013-01-15 17:28:17 +07:00
slavcopost
3c737f7d25 Update ActiveRecord phpDoc 2013-01-14 21:34:58 +02:00
denisarius
154d903f7d Enhancing extensibility of CActive* class hierarchy: CActiveFinder and CActiveRecord::model factory methods 
Author:    denisarius <denisarius@gmail.com>
 2012-12-17 17:26:46 +04:00
Konovalov Maxim
d0d2710104 replaced spaces to tabs 2012-12-13 00:20:57 +10:00
Konovalov Maxim
85efd7bb0a #1515 Use index support in relations 2012-12-12 22:04:07 +10:00
Jakob Stoeck
6c4f9a5b24 phpdoc correction for onbeforecount #1353 2012-12-09 16:43:41 +01:00
Jakob Stoeck
81368da67a Adds onBeforeCount for Active Records, fixes #1353 2012-12-07 10:04:43 +01:00