Commit Graph

245 Commits

Author SHA1 Message Date
Paul Klimov
96e794b4d3 Merge branch 'master' of github.com:yiisoft/yii2 into mongo 2013-12-03 11:20:02 +02:00
Qiang Xue
24621c3dd1 improved doc 2013-12-02 07:29:46 -05:00
Klimov Paul
cddb878360 ActiveRelationTrait::getModelKey() updated to work with non scalar keys. 2013-12-01 17:46:21 +02:00
Qiang Xue
73442fb12a doc fix. 2013-11-30 15:51:20 -05:00
Qiang Xue
f5f443abbd Merge pull request #1359 from yiisoft/activerecord-interface
ActiveRecord Interface and BaseAR
2013-11-30 11:01:33 -08:00
Carsten Brandt
d0fc987f0b fixed test break 2013-11-30 03:15:35 +01:00
Qiang Xue
79866ee3e0 Improved Query::select() doc. 2013-11-29 19:26:01 -05:00
Carsten Brandt
c3eb4d926c created BaseActiveRecord 2013-11-29 21:28:27 +01:00
Carsten Brandt
1499480934 Merge branch 'master' into activerecord-interface
* master: (30 commits)
  replaced inheritdoc tags.
  doc cleanup.
  Moved key serialization from data provider to data viewers.
  Fixes #1356: Alias for authFile in rbac/PhpManager not resolved
  Fixes #1296: stricter check of dashes in route.
  Fixes #1362: added itemOptions to Html::radioList and checkboxList.
  Fixes #1362: doc fix.
  really small doc typo fix
  Fixes #1332: generate subdirectories when needed during message extraction process.
  typo fix.
  Fixes #1335: support view extension fallback
  More TDB for the guide
  Added reference to Composer section of the guide from 1.1.x differences page
  Better docs structure and minor fixes
  More docs on performance
  Structure for console application docs
  Docs on using behaviors
  doc fix.
  Refactored MessageInterface::send().
  refactored EmailTarget with the new mailer interfaces.
  ...
2013-11-29 19:56:31 +01:00
Qiang Xue
a5e3c00d75 replaced inheritdoc tags. 2013-11-29 12:49:07 -05:00
Qiang Xue
fb3ebe7000 doc cleanup. 2013-11-29 12:47:10 -05:00
Carsten Brandt
9238434db7 ActiveRecord Interface 2013-11-29 15:41:14 +01:00
Qiang Xue
0390a99833 Use backquotes to quote column and table names for sqlite (related with #1318) 2013-11-28 09:04:16 -05:00
Qiang Xue
3b5768b40a avoid throwing the same type of new db exception. 2013-11-27 23:35:43 -05:00
Carsten Brandt
83527e85ca made Model::attributes() non static again
- allows to have dynamic definition of attributes depended on the
  instance
- there was no real need for it to be static. Places that used it static
  have been refactored.

fixes #1318
2013-11-28 01:01:48 +01:00
Panagiotis Moustafellos
58bd2fb958 Only whitespace removal 2013-11-27 20:19:56 +02:00
Qiang Xue
bf708aa824 Fixes #1334: foreign key is incorrectly determined for pgsql. 2013-11-27 11:55:35 -05:00
Panagiotis Moustafellos
21014b4064 swapped docs and Exception to type InvalidParamException 2013-11-26 04:56:07 +02:00
Qiang Xue
16739ec3f0 Merge pull request #1321 from pmoust/inheritdoc-fix
fixed PhpDoc by swapping to {@inheritdoc}
2013-11-25 18:29:59 -08:00
Panagiotis Moustafellos
2ff8ac3d61 fixed PhpDoc by swapping to {@inheritdoc} 2013-11-26 04:24:20 +02:00
Carsten Brandt
324e10694d updated sphinx active record with changes from DB AR 2013-11-26 01:48:52 +01:00
Qiang Xue
25fb11e93f Merge pull request #1295 from yiisoft/elasticsearch
[WIP] Elasticsearch
2013-11-25 16:28:11 -08:00
Alexander Makarov
4205623918 Fixes #1312: fixed types map for MSSQL 2013-11-26 01:26:39 +04:00
Carsten Brandt
5164a1671c finalized Query interface + general cleanup 2013-11-25 20:12:45 +01:00
Carsten Brandt
084f6666f1 Merge branch 'master' into elasticsearch
* master:
  fixed broken sphinx AR::attributes() declaration
  updated properties of extensions
  fixed cubrid limit
  added redis Session
  allow redis connection to be configure directly in cache
  removed unneeded setting.
  refactored redis cache.

Conflicts:
	extensions/redis/README.md
2013-11-25 15:49:06 +01:00
Carsten Brandt
8be4f3778a updated properties of extensions 2013-11-25 15:33:59 +01:00
Carsten Brandt
de1b533a08 fixed cubrid limit 2013-11-25 14:52:36 +01:00
Carsten Brandt
b6b2689853 Merge branch 'master' into elasticsearch
* master:
  Fixes #1253
  Fixes #1310: ActiveRelation does not preserve order of items on find via() and viaTable()
  fixed limit/offset for sqlite,mysql and cubrid
  fixed test break.
  Fixed test break.
  Fixes #1301: fixed scenario generation when there are "except" scenarios.
  support for batch insert in sqlite older than 3.7.11
  Fixes #1298: supporting route with trailing slash.
  Fixes #1296: stricter check of dashes in route.
  Fixes #1307: move batchInsert() to base class.
  Update apps-advanced.md
2013-11-24 20:51:26 +01:00
Qiang Xue
cf73f40d79 Merge pull request #1309 from nineinchnick/batch-insert
support for batch insert in sqlite older than 3.7.11
2013-11-24 11:36:57 -08:00
Qiang Xue
0b43aa4f81 Fixes #1310: ActiveRelation does not preserve order of items on find via() and viaTable() 2013-11-24 13:47:40 -05:00
Carsten Brandt
6920da4a80 fixed limit/offset for sqlite,mysql and cubrid
tests for this are on elasticsearch branch (due to huge refactoring
there) and will come later by merge
2013-11-24 19:22:51 +01:00
Carsten Brandt
f017ba357f refactored unit tests. put common AR tests in trait 2013-11-24 19:18:16 +01:00
John Was
e9fcde3264 support for batch insert in sqlite older than 3.7.11 2013-11-24 11:53:27 +01:00
Qiang Xue
69fa7bab6b Fixes #1307: move batchInsert() to base class. 2013-11-23 20:44:36 -05:00
Carsten Brandt
58b1538b39 refactored elasticsearch Querybuilder build conditions 2013-11-24 02:00:27 +01:00
Carsten Brandt
e15860c3fa more on elasticsearch Query interface added facet search 2013-11-24 00:30:36 +01:00
Carsten Brandt
679da53390 polished Query API 2013-11-23 18:07:19 +01:00
Carsten Brandt
c6347d6d01 polished elasticsearch AR api, added mget and fixed AR::equals() 2013-11-23 15:26:00 +01:00
Qiang Xue
a07facf434 Refactored hasMany and hasOne so that they support cross-DBMS relationship. 2013-11-22 20:47:39 -05:00
Carsten Brandt
cb4504a10f refactored Model and redis AR to allow drop of RecordSchema 2013-11-22 18:44:22 +01:00
Carsten Brandt
bc4324c041 Merge branch 'master' into redis
* master: (613 commits)
  fixed typo
  Fixes #1222: refactored jui/Widget, intorduced jui/Slider and jui/SliderInput
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Correct Nav.php comments/PHP doc to reflect BS3 dropdown support.
  Added example for dividers to bootstrap Nav
  Checkboxlist documentation fix
  Added "Using controller action to render errors"
  Fix doc
  Renamed DetailView attribute type to format
  encode email in Formatter
  Added default status code setting.
  "yii\swiftmailer\Mailer" transport setup has been advanced to support constructor arguments and plugins.
  fix rbac select statement
  Comments cleanup.
  Reverted closeButton
  Nomenclature and code realignment.
  better nginx config
  guide about using bootstrap less files
  Include Schema in new migrations by default
  ...

Conflicts:
	framework/yii/db/ActiveRecord.php
	framework/yii/db/ActiveRelation.php
	tests/unit/data/config.php
2013-11-22 15:04:08 +01:00
Qiang Xue
fb945866c7 Fixes #1255: typecast empty string to null for non-string DB columns. 2013-11-20 16:00:10 -05:00
Qiang Xue
9ef3560f5a Fixed test break. 2013-11-19 18:03:52 -05:00
Qiang Xue
f67ddb17f6 Fixes #1242: Gii Model generation added dropped table fields in Postgresql 2013-11-19 17:25:05 -05:00
Qiang Xue
dbf35253b7 Fixes #1237. 2013-11-19 10:25:07 -05:00
Carsten Brandt
a0824422b2 removed duplicate assignment of primaryKey in cubrid 2013-11-17 15:43:05 +01:00
Qiang Xue
a2fe128455 refactored query and relation. 2013-11-17 00:02:27 -05:00
Qiang Xue
c7ff329e3c doc fix. 2013-11-16 21:30:34 -05:00
Carsten Brandt
6a4ed5a1e8 fixed cubrid schema primary key detection 2013-11-17 00:42:39 +01:00
Carsten Brandt
77840adf65 Made ActiveRecord::isPrimaryKey() public
+ added tests and fixed behavior
2013-11-16 16:53:50 +01:00