tonyair/silverstripe-sqlite3
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-sqlite3 synced 2024-10-22 17:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Update module to work with new stricter index definitions

Browse Source
This commit is contained in:
Daniel Hensby 2017-10-10 13:09:06 +01:00
parent 8d25343c41
commit 536ada309e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
code/SQLite3SchemaManager.php
View File

@ -4,7 +4,6 @@ namespace SilverStripe\SQLite;
use SilverStripe\Control\Director;
use SilverStripe\Dev\Debug;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\Connect\DBSchemaManager;
use Exception;
@ -210,7 +209,7 @@ class SQLite3SchemaManager extends DBSchemaManager
{
$ok = true;
if (!SapphireTest::using_temp_db() && !self::$checked_and_repaired) {
if (!self::$checked_and_repaired) {
$this->alterationMessage("Checking database integrity", "repaired");
// Check for any tables with failed integrity
@ -370,10 +369,9 @@ class SQLite3SchemaManager extends DBSchemaManager
*/
public function createIndex($tableName, $indexName, $indexSpec)
{
$parsedSpec = $this->parseIndexSpec($indexName, $indexSpec);
$sqliteName = $this->buildSQLiteIndexName($tableName, $indexName);
$columns = $parsedSpec['value'];
$unique = ($parsedSpec['type'] == 'unique') ? 'UNIQUE' : '';
$columns = $this->implodeColumnList($indexSpec['columns']);
$unique = ($indexSpec['type'] == 'unique') ? 'UNIQUE' : '';
$this->query("CREATE $unique INDEX IF NOT EXISTS \"$sqliteName\" ON \"$tableName\" ($columns)");
}
@ -402,18 +400,6 @@ class SQLite3SchemaManager extends DBSchemaManager
return "{$tableName}_{$indexName}";
}
protected function parseIndexSpec($name, $spec)
{
$spec = parent::parseIndexSpec($name, $spec);
// Only allow index / unique index types
if (!in_array($spec['type'], array('index', 'unique'))) {
$spec['type'] = 'index';
}
return $spec;
}
public function indexKey($table, $index, $spec)
{
return $this->buildSQLiteIndexName($table, $index);
@ -437,11 +423,11 @@ class SQLite3SchemaManager extends DBSchemaManager
}
// Safely encode this spec
$indexList[$indexName] = $this->parseIndexSpec($indexName, array(
$indexList[$indexName] = array(
'name' => $indexName,
'value' => $this->implodeColumnList($list),
'type' => $indexType
));
'columns' => $list,
'type' => $indexType,
);
}
return $indexList;

2
composer.json
View File

@ -18,7 +18,7 @@
"silverstripe/vendor-plugin": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
"phpunit/phpunit": "^5.7"
},
"extra": {
"branch-alias": {