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

Merge pull request #68 from dhensby/pulls/2/db-indexes

Browse Source 
Getting postgres to work with stricter index api
This commit is contained in:
Damian Mooyman 2017-05-26 09:53:30 +12:00 committed by GitHub
commit 512f10d745
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/PostgreSQLSchemaManager.php
View File

@ -333,7 +333,6 @@ class PostgreSQLSchemaManager extends DBSchemaManager
$triggers = false; $triggers = false;
if ($alteredIndexes) { if ($alteredIndexes) {
foreach ($alteredIndexes as $indexName=>$indexSpec) { foreach ($alteredIndexes as $indexName=>$indexSpec) {
$indexSpec = $this->parseIndexSpec($indexName, $indexSpec);
$indexNamePG = $this->buildPostgresIndexName($table, $indexName); $indexNamePG = $this->buildPostgresIndexName($table, $indexName);
if ($indexSpec['type']=='fulltext') { if ($indexSpec['type']=='fulltext') {
@ -368,7 +367,6 @@ class PostgreSQLSchemaManager extends DBSchemaManager
//Add the new indexes: //Add the new indexes:
if ($newIndexes) { if ($newIndexes) {
foreach ($newIndexes as $indexName => $indexSpec) { foreach ($newIndexes as $indexName => $indexSpec) {
$indexSpec = $this->parseIndexSpec($indexName, $indexSpec);
$indexNamePG = $this->buildPostgresIndexName($table, $indexName); $indexNamePG = $this->buildPostgresIndexName($table, $indexName);
//If we have a fulltext search request, then we need to create a special column //If we have a fulltext search request, then we need to create a special column
//for GiST searches //for GiST searches
@ -730,9 +728,6 @@ class PostgreSQLSchemaManager extends DBSchemaManager
// Determine index name // Determine index name
$tableCol = $this->buildPostgresIndexName($tableName, $indexName); $tableCol = $this->buildPostgresIndexName($tableName, $indexName);
// Consolidate/Cleanup spec into array format
$indexSpec = $this->parseIndexSpec($indexName, $indexSpec);
//Misc options first: //Misc options first:
$fillfactor = $where = ''; $fillfactor = $where = '';
if (isset($indexSpec['fillfactor'])) { if (isset($indexSpec['fillfactor'])) {
@ -753,22 +748,22 @@ class PostgreSQLSchemaManager extends DBSchemaManager
break; break;
case 'unique': case 'unique':
$spec = "create unique index \"$tableCol\" ON \"$tableName\" (" . $indexSpec['value'] . ") $fillfactor $where"; $spec = "create unique index \"$tableCol\" ON \"$tableName\" (" . $this->implodeColumnList($indexSpec['columns']) . ") $fillfactor $where";
break; break;
case 'btree': case 'btree':
$spec = "create index \"$tableCol\" ON \"$tableName\" USING btree (" . $indexSpec['value'] . ") $fillfactor $where"; $spec = "create index \"$tableCol\" ON \"$tableName\" USING btree (" . $this->implodeColumnList($indexSpec['columns']) . ") $fillfactor $where";
break; break;
case 'hash': case 'hash':
//NOTE: this is not a recommended index type //NOTE: this is not a recommended index type
$spec = "create index \"$tableCol\" ON \"$tableName\" USING hash (" . $indexSpec['value'] . ") $fillfactor $where"; $spec = "create index \"$tableCol\" ON \"$tableName\" USING hash (" . $this->implodeColumnList($indexSpec['columns']) . ") $fillfactor $where";
break; break;
case 'index': case 'index':
//'index' is the same as default, just a normal index with the default type decided by the database. //'index' is the same as default, just a normal index with the default type decided by the database.
default: default:
$spec = "create index \"$tableCol\" ON \"$tableName\" (" . $indexSpec['value'] . ") $fillfactor $where"; $spec = "create index \"$tableCol\" ON \"$tableName\" (" . $this->implodeColumnList($indexSpec['columns']) . ") $fillfactor $where";
} }
return trim($spec) . ';'; return trim($spec) . ';';
} }
@ -876,11 +871,11 @@ class PostgreSQLSchemaManager extends DBSchemaManager
$columnString = $this->quoteColumnSpecString($index['indexdef']); $columnString = $this->quoteColumnSpecString($index['indexdef']);
} }
$indexList[$indexName] = $this->parseIndexSpec($index, array( $indexList[$indexName] = array(
'name' => $indexName, // Not the correct name in the PHP, as this will be a mangled postgres-unique code 'name' => $indexName, // Not the correct name in the PHP, as this will be a mangled postgres-unique code
'value' => $columnString, 'columns' => $this->explodeColumnString($columnString),
'type' => $type 'type' => $type ?: 'index',
)); );
} }
return $indexList; return $indexList;
@ -1190,7 +1185,7 @@ class PostgreSQLSchemaManager extends DBSchemaManager
protected function fulltext($this_index, $tableName, $name) protected function fulltext($this_index, $tableName, $name)
{ {
//For full text search, we need to create a column for the index //For full text search, we need to create a column for the index
$columns = $this->quoteColumnSpecString($this_index['value']); $columns = $this->implodeColumnList($this_index['columns']);
$fulltexts = "\"ts_$name\" tsvector"; $fulltexts = "\"ts_$name\" tsvector";
$triggerName = $this->buildPostgresTriggerName($tableName, $name); $triggerName = $this->buildPostgresTriggerName($tableName, $name);