tonyair
/
silverstripe-postgresql
mirror of https://github.com/silverstripe/silverstripe-postgresql
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #35 from tractorcow/pulls/use-parse 

Use parseIndexSpec to cleanup fulltext specification
This commit is contained in:
Sean Harvey 2014-10-15 10:51:44 +13:00
parent fba93bba72 48c07ad1ab
commit bddbdde5de
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
code/PostgreSQLDatabase.php
View File

@ -477,23 +477,12 @@ class PostgreSQLDatabase extends SS_Database {
$fulltexts='';
$triggers='';
if($indexes){
foreach($indexes as $name=>$this_index){
if(is_array($this_index) && $this_index['type']=='fulltext'){
$ts_details=$this->fulltext($this_index, $tableName, $name);
$fulltexts.=$ts_details['fulltexts'] . ', ';
$triggers.=$ts_details['triggers'];
} else if(is_string($this_index)) {
preg_match('/^fulltext\ \((.+)\)$/i', $this_index, $matches);
if(count($matches) == 2) {
$index = array(
'type' => 'fulltext',
'name' => $name,
'value' => $matches[1]
);
$ts_details=$this->fulltext($index, $tableName, $name);
$fulltexts.=$ts_details['fulltexts'] . ', ';
$triggers.=$ts_details['triggers'];
}
foreach($indexes as $name => $indexSpec) {
$indexSpec = $this->parseIndexSpec($name, $indexSpec);
if($indexSpec['type'] === 'fulltext') {
$ts_details = $this->fulltext($indexSpec, $tableName, $name);
$fulltexts .= $ts_details['fulltexts'] . ', ';
$triggers .= $ts_details['triggers'];
}
}
}