Commit Graph

463 Commits

Author SHA1 Message Date
Carsten Brandt
266df50702 better fix for issues #124
changed position of JOIN in UPDATE by overwriting applyJoin()
2012-08-28 21:27:26 +02:00
Carsten Brandt
d77234b1e7 Merge branch 'master' of https://github.com/yiisoft/yii into issue-124
* 'master' of https://github.com/yiisoft/yii: (651 commits)
  Updated guide Gii Model Generator page screenshot.
  adjusted CHANGELOG
  Requirements checking slightly improved.
  Enhanced CHANGELOG description
  Requirements checker: added support of the Oracle database (pdo_oci extension)
  MSSQL driver types refinements.
  Requirements checker: added support of the MSSQL (pdo_dblib and pdo_sqlsrv extensions).
  Language fixes.
  Preparations for merging fixes of the #556 into 1.1.13 codebase.
  [docs][blog] 'yiic' to 'Gii'
  ajaxUpdate is never false in jquery.yiilistview.js
  Added /docs/guide/fr/caching.overview.twt
  Added /docs/guide/fr/basics.controller.txt
  Added /docs/guide/fr/basics.mvc.txt
  Update framework/web/filters/CHttpCacheFilter.php
  Update docs/guide/fr/toc.txt
  [NL] Dutch messages translation updated
  added history.js license
  prepare for next release.
  prepare for 1.1.12 release.
  ...

Conflicts:
	CHANGELOG
2012-08-28 21:21:27 +02:00
resurtm
054e6247af Language fixes. 2012-08-25 18:02:26 +06:00
resurtm
4565d1efee Preparations for merging fixes of the #556 into 1.1.13 codebase. 2012-08-25 10:16:26 +06:00
resurtm
81cd764447 Merge branch 'master' of git://github.com/yiisoft/yii into 556-mysql-column-comment 2012-08-25 10:02:11 +06:00
mdomba (mdwork)
c29be19d59 doc fix
[ci skip]
2012-08-10 12:49:14 +02:00
mdomba (mdwork)
c9c7c796b9 grammar fix 2012-08-10 12:28:49 +02:00
Qiang Xue
22265fc13d Merge pull request #741 from jamesmoey/fix-591
Fix for issue #591 CActiveRecord::getRelated doesn't call afterFind() wi...
2012-08-06 13:35:38 -07:00
Leo R. Lundgren
226774ddf8 Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria(). 2012-08-06 14:12:34 +02:00
resurtm
79e4373155 Added comment retrieving from Oracle. (Tested with Oracle 11g XE.) 2012-08-04 12:16:54 +06:00
Leo R. Lundgren
b4f888484c Fix invalid HTML in PHPdoc for CMssqlCommandBuilder::applyLimit(). 2012-08-04 02:45:14 +02:00
resurtm
5ebb590047 Removed extra spare space. [ci skip] 2012-08-03 20:33:09 +06:00
resurtm
9199e92f79 Enh #556: Added CDbColumnSchema::$comment which stores comment for the table column, comment retrieving is working for MySQL and PgSQL. 2012-08-03 20:31:55 +06:00
Leo R. Lundgren
7a194496a5 Fix a bunch of @param and @return phpdoc errors in various files. 2012-08-03 16:17:58 +02:00
Paul Klimov
e22af736c1 Merge branch 'master' of git://github.com/yiisoft/yii into 636-many-to-many-relation-resolve-junction-data 2012-08-01 13:17:45 +03:00
Alexander Kochetov
33cabc62c8 #1070 fix 2012-07-30 21:52:28 +04:00
Paul Klimov
c76cd470b7 Visibility modifiers for internal fields in "CManyManyRelation" have been changed to "private", garbage return in "CManyManyRelation::initJunctionData()" has been removed. 2012-07-30 11:31:28 +03:00
CeBe
55820a135b added params to profiling token, on paramlogging
this makes execute() consistent with queryInternal()
as described in #1000
2012-07-29 12:34:08 +02:00
Alexander Makarov
5140e0dcd9 Merge pull request #1050 from suralc/1045-clean-fix-builtQuery
#1045 Fixes incorrect sql-string when passing empty values to buildQuery
2012-07-28 07:19:44 -07:00
Suralc
a056c28e08 Removed unnecessary comparison in buildQuery 2012-07-28 15:48:51 +02:00
Suralc
d25601d56a Solution for #1045 2012-07-28 14:27:01 +02:00
Alexander Kochetov
75c4722f2b CActiveFinder refactoring
As author of the original parametrized scopes, I propose to make some
refactoring in CActiveFinder class. Unit tests passed.
2012-07-27 21:51:31 +04:00
Alexander Kochetov
820df8fce4 Revert "CActiveFinder refactoring"
This reverts commit 9c6cc60b50.
2012-07-27 19:09:41 +04:00
Alexander Kochetov
9c6cc60b50 CActiveFinder refactoring 2012-07-27 19:05:37 +04:00
Alexander Kochetov
fca49df5b6 Fix the beforeFind() behavior of the framework 2012-07-27 17:50:34 +04:00
CeBe
928ec818ce fixed typo rollBack -> rollback
used case setting of methods implementation in CDbTransaction as
reference.
2012-07-16 04:59:40 +02:00
Paul Klimov
d4d28f36fe Join table exception message composition has been fixed: missing join table name has been returned. 2012-07-10 13:12:13 +03:00
resurtm
628acb4854 Fixed indentation issues in CDbSchema and CMysqlSchema. 2012-06-28 18:02:33 +06:00
Paul Klimov
ed9180404f Code indenting at "CManyManyRelation" has been fixed: whitespaces have been replaced by tabs. 2012-06-26 15:17:56 +03:00
Paul Klimov
ca200147d3 Class "CActiveFinder" has been updated to use "CManyManyRelation" internal methods while performing relational queries. 2012-06-25 14:35:16 +03:00
Paul Klimov
b3f31f3b06 Class "CManyManyRelation" has been updated allowing to determine junction data from foreign key internally. 2012-06-25 14:33:15 +03:00
Carsten Schmitz
8b54782983 Fixes issue #842: Active Records insert fails in MSSQL if a column has a default value of (NULL) 2012-06-19 21:57:18 +02:00
Carsten Schmitz
2ca997001e Fixes issue #98 https://github.com/yiisoft/yii/issues/98 along with the problem that no identity value is returned on certain occasions (for example Active Record usage) see http://www.yiiframework.com/forum/index.php/topic/24275-solved-sql-server-2008-returning-blank-lastinsertid/ for further discussion. Solution has been tested and is in live production for quite some time. 2012-06-19 08:23:59 +02:00
Carsten Schmitz
5367d95488 Fixes issue #98 https://github.com/yiisoft/yii/issues/98 along with the problem that no identity value is returned on certain occasions (for example Active Record usage) see http://www.yiiframework.com/forum/index.php/topic/24275-solved-sql-server-2008-returning-blank-lastinsertid/ for further discussion. Solution has been tested and is in live production for quite some time. 2012-06-18 22:38:36 +02:00
Carsten Brandt
b3e2dc78b1 fixed #749: CActiveRecord::refresh() in afterSave
CActiveRecord::refresh() did not work in afterSave() for new records.
refresh() will now always populate model with new data, when db entry exists
2012-05-29 21:36:41 +02:00
James Moey
8d591c95d1 Fix for issue #591 CActiveRecord::getRelated doesn't call afterFind() with through relation
It was only expecting joinTree only contain 1 child, if you use through relation, that might not be true. Therefore, use a loop to go though the children and call afterFind on them.
2012-05-23 13:29:18 +10:00
Alexander Makarov
f1ec2e7db9 API documentation fix 2012-05-10 17:01:42 +04:00
Alexander Makarov
3a12a9a585 Fixes #392: There was no way to get and modify criteria in CActiveRecord::beforeFind 2012-05-09 15:05:21 +04:00
Alexander Makarov
bd147db6e9 fixed formatting, better changelog description 2012-05-01 23:16:35 +04:00
Alexander Makarov
2a5fc9d219 Merge pull request #554 from marcovtwout/553-cactivefinder-reset-related-criteria
AR: Restore criteria on related model after find when using 'with' and 'scopes'.
2012-05-01 12:08:13 -07:00
Alexander Makarov
b74caf3606 Added usage example to CDbCriteria phpdoc 2012-04-15 11:55:54 +02:00
marcovtwout
781691e5c8 FIX: Issue #553 - restore criteria on related model after find when using 'with' and 'scopes'. 2012-03-27 11:43:21 +02:00
Carsten Brandt
f37a3dac2e added @since annotation 2012-03-19 17:25:44 +01:00
Carsten Brandt
fdabdb2b45 added docblocks to CMysqlCommandBuilder+CHANGELOG 2012-03-19 17:07:12 +01:00
DaSourcerer
4ac67ea223 Add CMysqlCommandBuilder to handle joins on update
Fixes issue #124
CDbCommandBuilder produced faulty mysql update queries
when joins are involved. JOIN has to come before SET in mysql.
2012-03-19 16:46:59 +01:00
Alexander Makarov
f094f2c1a1 Fixes issue #206: Added ability to pass CDbCriteria object as AR relation parameter 2012-03-10 15:42:35 +04:00
mdomba (mdwork)
26a6e9f6a1 parameter fix 2012-03-07 10:59:25 +01:00
mdomba (mdwork)
fe5694448e Issue #454 removed translation from open() 2012-03-06 15:12:06 +01:00
mdomba (mdwork)
2699ac24b9 Fixes issue #454 endless loop 2012-03-06 11:39:26 +01:00
CeBe
f3b41a9897 Fixed datetime column type for postgresql
'time' -> 'timestamp' which will hold date and time, not only time
this fixes issue #193
2012-02-17 20:17:19 +01:00