Browse Source

Merge branch 'zeeke-patch-1'

tags/2.0.0-rc
Alexander Makarov 10 years ago
parent
commit
84f6329540
  1. 1
      framework/CHANGELOG.md
  2. 2
      framework/db/sqlite/QueryBuilder.php

1
framework/CHANGELOG.md

@ -54,6 +54,7 @@ Yii Framework 2 Change Log
- Enh #3472: Added configurable option to encode spaces in dropDownLists and listBoxes (kartik-v)
- Enh #3518: `yii\helpers\Html::encode()` now replaces invalid code sequences with "?" (DaSourcerer)
- Enh #3521: Added `yii\filters\HttpCache::sessionCacheLimiter` (qiangxue)
- Enh #3574: Add integrity check support for SQLite (zeeke)
- Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
- Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue)
- Enh: Added `yii\web\UrlManager::addRules()` to simplify adding new URL rules (qiangxue)

2
framework/db/sqlite/QueryBuilder.php

@ -139,7 +139,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
*/
public function checkIntegrity($check = true, $schema = '', $table = '')
{
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
return 'PRAGMA foreign_keys='.(int)$check;
}
/**

Loading…
Cancel
Save