Browse Source

Merge pull request #2090 from lucianobaraglia/2087-pgsql-schema-quoted-indexes

Fix for #2087
tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
dd4e53e69f
  1. 2
      framework/db/pgsql/Schema.php

2
framework/db/pgsql/Schema.php

@ -283,7 +283,7 @@ SQL;
// Index is an expression like "lower(colname::text)" // Index is an expression like "lower(colname::text)"
$indexColumns = preg_replace("/.*\(([^\:]+).*/mi", "$1", $index['indexcolumns']); $indexColumns = preg_replace("/.*\(([^\:]+).*/mi", "$1", $index['indexcolumns']);
} else { } else {
$indexColumns = array_map('trim', explode(',', str_replace(['{', '}'], '', $index['indexcolumns']))); $indexColumns = array_map('trim', explode(',', str_replace(['{', '}', '"', '\\'], '', $index['indexcolumns'])));
} }
$uniqueIndexes[$indexName] = $indexColumns; $uniqueIndexes[$indexName] = $indexColumns;

Loading…
Cancel
Save