Commit Graph

432 Commits

Author SHA1 Message Date
Qiang Xue
5e9015c89a Fixes #2968. 2014-04-07 20:07:25 -04:00
Qiang Xue
0e143338d7 Finished refactoring find() . 2014-04-07 16:29:12 -04:00
Qiang Xue
b7d6f6141a Added isAssociative() and isIndexed() to yii\helpers\ArrayHelper 2014-04-07 16:02:55 -04:00
Alexander Makarov
75154d351d Refactored AR find 2014-04-07 09:43:03 +04:00
Qiang Xue
02c3c37a00 Fixes #2986. 2014-04-05 11:55:26 -04:00
Carsten Brandt
1a3accb6cb removed duplicated joins when using joinWith and via relations
fixes #2650
2014-04-04 15:34:19 +02:00
Carsten Brandt
44dbb2235a cleanup docs 2014-04-03 20:13:32 +02:00
Qiang Xue
54e08f3f01 fixed build break. 2014-04-03 11:57:49 -04:00
Qiang Xue
8b4dfcc876 Fixes #2955: Changed the signature of ActiveQuery constructors and ActiveRecord::createQuery() to simplify customizing ActiveQuery classes 2014-04-03 10:36:52 -04:00
Qiang Xue
0fa19291f1 refactored filterWhere(). 2014-04-02 20:03:42 -04:00
Qiang Xue
869d96ee0d Fixed test break. 2014-04-02 15:25:08 -04:00
Carsten Brandt
745c20538c Merge pull request #2885 branch 'query-filter'
* query-filter:
  added CHANGELOG lines
  added tests for redis
  added proper tests for elasticsearch
  removed unnecessary code duplication
  adjusted tests
  typo
  renamed Query::filter() to Query::filterWhere()
  reverted elasticsearch rename of filter
  Adjusted search model code generated by Gii CRUD generator
  Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query
  Gii CRUD generator now uses new addFilter method
  Query::filter() adjustments
  fixes #2002
  Added tests for Query::filter()

Conflicts:
	framework/db/QueryTrait.php
2014-04-02 19:33:40 +02:00
Carsten Brandt
e9e59483f4 removed unnecessary code duplication 2014-04-02 19:07:13 +02:00
Carsten Brandt
96f1c4c10b renamed Query::filter() to Query::filterWhere() 2014-04-02 18:48:14 +02:00
Carsten Brandt
a35ef1ce7a added andOnCondition and orOnCondition to ActiveQuery
fixes #2957
2014-04-02 16:17:50 +02:00
Evgeniy Tkachenko
90caa527f2 Update ActiveRecord.php
fix for https://github.com/yiisoft/yii2/pull/2958
2014-04-02 17:00:39 +03:00
Qiang Xue
271dccdc6b Fixes #2931. 2014-03-31 11:34:47 -04:00
Alexander Makarov
06fdb79730 Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query 2014-03-31 15:09:33 +04:00
Qiang Xue
338b6aa7d3 Refactored ActiveRecord::find() so that find(null) will also return an ActiveRecord instance instead of ActiveQuery. 2014-03-30 19:01:02 -04:00
Alexander Makarov
ecf019e311 Merge branch 'master' 2014-03-31 02:20:56 +04:00
Alexander Makarov
05afeb4831 Merge branch 'master' 2014-03-31 01:06:09 +04:00
Alexander Makarov
cb4488ae4c Implemented Oracle column comment reading from another schema 2014-03-30 19:41:47 +04:00
Alexander Makarov
ab799d8ea9 Fixes #2911: Removed tbl_ default for table prefix 2014-03-30 19:33:46 +04:00
Alexander Makarov
8cd247730a Query::filter() adjustments 2014-03-29 23:26:02 +04:00
Alexander Makarov
a884c80fe3 Merge branch 'master' 2014-03-29 22:55:59 +04:00
Qiang Xue
d44e42ab9e Fixed oci querybuilder. 2014-03-27 11:01:00 -04:00
Qiang Xue
13c0931b23 Fixes #2880 2014-03-27 10:58:56 -04:00
Carsten Brandt
c73cfe147f Fixed inconsistencies with setting old attributes and pks
issue #2892
2014-03-27 13:17:54 +01:00
Carsten Brandt
f4395206b7 reset dirty attributes after afterSave
so information about changed values is available in `afterSave`-event.

fixes #2892
2014-03-27 12:14:03 +01:00
Alexander Makarov
372220450b Merge branch 'master' 2014-03-27 12:56:01 +04:00
Alexander Makarov
3c1a8141fd fixes #2002 2014-03-27 12:41:16 +04:00
Qiang Xue
ec3aadfffb Fixes #2862: Using DbCache while enabling schema caching may cause infinite loops 2014-03-26 20:26:22 -04:00
Qiang Xue
f3c26d3c6b Fixes #2880. 2014-03-26 19:52:17 -04:00
Qiang Xue
39667aa6b7 Fixed activequery select issue. 2014-03-26 15:51:10 -04:00
Qiang Xue
5567caf4e8 Merge branch 'master' of git://github.com/yiisoft/yii2 2014-03-26 15:03:06 -04:00
Qiang Xue
bc378d1cae properly quote table names for join(). 2014-03-26 15:02:56 -04:00
Carsten Brandt
27659d1776 fixed FileHelper private method static call 2014-03-26 17:51:52 +01:00
Qiang Xue
2105f092f3 Merge branch 'master' of git://github.com/yiisoft/yii2 2014-03-26 11:19:11 -04:00
Qiang Xue
78136d4278 Fixes #2880: filterByModels() should prefix key columns in a join query. 2014-03-26 11:19:01 -04:00
Carsten Brandt
8a6eceb852 phpdoc fixes 2014-03-26 15:13:11 +01:00
Carsten Brandt
9b8372d580 phpdoc 2014-03-26 14:25:00 +01:00
Carsten Brandt
488767914a do not remove records that have no primary key selected
this problem occurs when joining active record but not selecting the
primary key field. records get populated but they do not have primary
key value populated which results in only one record left over in the
result.
2014-03-25 13:35:25 +01:00
Carsten Brandt
bf3c75147d reverted breaking PHPdoc codestyle changes
issue #2852
2014-03-23 20:51:09 +01:00
Qiang Xue
8053082e0c Fixes #2848: Individual queries should be enclosed within parenthesis in a UNION query 2014-03-22 12:45:14 -04:00
Koudy
411dc71b09 Fixed getting the count for queries with the union 2014-03-22 13:48:09 +04:00
Qiang Xue
3c518c4207 Merge commit 'f605508bb2805d24df98037ea239f8f582deda0e' into feature-container 2014-03-20 23:51:02 -04:00
Qiang Xue
7f4c28231b Fixes #2826 2014-03-20 13:30:58 -04:00
Alexander Makarov
af030c5f5b Added $skipIfSet to ActiveRecord::loadDefaultValues 2014-03-20 19:43:59 +04:00
Alexander Makarov
c24ae25be2 Fixed getting default values from schema for SQLite 2014-03-20 13:54:13 +04:00
Alexander Makarov
1ff9dedf60 Fixed getting default value from postgres schema 2014-03-20 13:29:36 +04:00