Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-06 08:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,998 Commits 3 Branches 54 Tags
82d23f8c3b8a25f94de4322d56ada388b8bf2f7c
Commit Graph

269 Commits

Author SHA1 Message Date
Paul Klimov
ed7927ff8d "CDbCommandBuilder::createInCondition()" has been updated allowing to pass array of values with mixed keys for the single type column. 2013-03-20 13:22:54 +02:00
resurtm
28a3c79185 Fixes #2121: CMssqlSchema::resetSequence() incorrectly resets sequence. 2013-03-17 11:00:19 +06:00
CeBe
307a190a83 some adjustments to pull request #2159 2013-03-12 17:11:50 +01:00
CeBe
c70936afd2 Merge pull request #2160 branch '2159-fix-delete-with-join' of https://github.com/serebrov/yii into serebrov-2159-fix-delete-with-join 
* '2159-fix-delete-with-join' of https://github.com/serebrov/yii:
  Fixes #2159 - problem with command builder for delete with joins.

Conflicts:
	CHANGELOG
 2013-03-12 16:53:54 +01: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
Boris Serebrov
4fdf2d0044 Fixes #2159 - problem with command builder for delete with joins. 2013-03-01 22:19:46 +02:00
Ragazzo
07ec4be9b2 Small formatting fix 2013-02-19 05:19:11 +04:00
Ragazzo
f65ad8836c 2013-02-19 05:15:09 +04:00
Ragazzo
911ea9de2c Fixed formatting 2013-02-19 05:06:22 +04:00
Carsten Brandt
37b7d8b3d9 fixed problem with column comments 
mysql 4.x

fixed #2030
 2013-01-23 21:19:56 +01: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
Carsten Brandt
ca9de83d88 Fixed #138 support Mysql ANSI mode 2012-11-30 18:00:15 +01:00
Vlas Korzhov
d6fda90a65 Fixes #1746: CDbCriteria::mergeWith() is now more consistent with all other class methods 2012-11-24 15:37:54 +04:00
Alexander Makarov
911b330289 Fixes #1657: CDbCommandBuilder::createUpdateCounterCommand now can be used with float values 2012-11-15 01:38:13 +04:00
Carsten Brandt
bdfe8acdfe fixed whitespace issues introduced with #851 2012-11-09 19:14:19 +01:00
Tom Ridge
840d19a3a3 Merge branch 'master' of github.com:yiisoft/yii into 848-add-pk-support-to-migrations 
Conflicts:
	CHANGELOG
	framework/db/schema/CDbSchema.php
 2012-11-09 13:57:58 +10:00
Tom Ridge
56ae99b57d Added addPrimaryKey and dropPrimaryKey commands to CDbMigration class in response to enh req #848 2012-11-09 13:46:13 +10:00
resurtm
705d9ed2ce Fixed #1652: added CSqliteSchema::renamteTable() 2012-11-04 14:56:19 +06:00
Alexander Makarov
41b0371476 Merge branch 'fix-cdbcriteria' of git://github.com/Ryadnov/yii into Ryadnov-fix-cdbcriteria 2012-10-29 22:25:58 +04:00
Ryadnov
4f887fbd52 refactoring CDbCriteria addInCondition/addNotInCondition 2012-10-27 12:05:27 +04:00
Ryadnov
e0c239ac1a forgotten operator in CDBCriteria addInCondition/addNotInCondition functions 2012-10-26 01:24:13 +04:00
Ryadnov
c79d247432 CDbCriteria: addBetweenCondition function now internal use addCondition 2012-10-26 01:15:54 +04:00
Alexander Makarov
d6f92eaf51 Merge branch '1407-data-provider' of git://github.com/resurtm/yii into resurtm-1407-data-provider 
Conflicts:
	CHANGELOG
 2012-10-10 21:11:36 +04:00
Alexander Kochetov
42a19b8c3b Code style fix 2012-10-04 18:33:06 +04:00
Alexander Kochetov
486723805e else if => elseif 2012-10-03 10:20:14 +04:00
resurtm
fc666775fe createCountCommand(): wrong matches were used. 2012-09-16 14:21:19 +06:00
resurtm
551c42b945 Fixes #1407: CDbCommandBuilder::createCountCommand() used to bind parameters for unused ORDER clause and unused SELECT part. 2012-09-16 12:51:46 +06:00
Alexander Makarov
d865a3bab8 Fixes #1057 Removed SVN ids 2012-09-09 22:23:45 +04:00
Alexander Makarov
3f74e175a2 Bug #837: Fixed method CDbCriteria::__wakeup(), allowing to keep custom names for params and update all string parts for automatic params 2012-09-09 00:22:55 +04:00
Alexander Makarov
0dc06878ce Enh #949: Added COciSchema::resetSequence 2012-09-08 16:15:48 +04:00
resurtm
02547a69fb Removed extra tabs in COciCommandBuilder::applyLimit(). 2012-09-04 21:11:01 +06:00
Carsten Brandt
00dc4add94 fixes issue #1330 
default value null for string column in SQLite
 2012-09-04 03:12:18 +02:00
resurtm
5d29a4aaf8 Merge branch 'master' of git://github.com/yiisoft/yii into 112-sqlsrv-transactions 2012-08-29 23:55:04 +06:00
resurtm
62d0119cce Bug #112: MSSQL: database abstraction layer now uses native transaction support of the SQLSRV driver. 2012-08-29 23:52:27 +06:00
resurtm
289444a96d MSSQL unit testing SQL file reformatted and decorated. MSSQL testing class improved. Added unit tests for column comments retrieving. 2012-08-29 23:02:03 +06:00
resurtm
668b5f3622 Merge branch 'master' of git://github.com/yiisoft/yii into 1289-mssql-db-column-comments 2012-08-29 21:38:47 +06:00
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
f19ebd30c6 Working draft of MSSQL column comments support. 2012-08-26 13:41:52 +06: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)
c9c7c796b9 grammar fix 2012-08-10 12:28:49 +02:00
Paul Klimov
51689bc1f6 Merge branch 'master' of git://github.com/yiisoft/yii into 837-CDbCriteria-serialize-named-params 2012-08-10 13:19:19 +03:00
Paul Klimov
4aa463241c Method "CDbCriteria::__wakeup()" has been updated, allowing to keep custom names for params and update all string parts for automatic params. 2012-08-10 13:18:42 +03:00
Leo R. Lundgren
226774ddf8 Fix misspelled return type in PHPdoc for CMssqlCommandBuilder::checkCriteria(). 2012-08-06 14:12:34 +02:00