Merge pull request #1603 from edin/master

Fixed sequence id match for postgresql

Merge pull request #1603 from edin/master
d50fd706 · Qiang Xue · 5fc275e9 · 5e092ac6 · d50fd706
Commit d50fd706 authored Dec 23, 2013 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Schema.php framework/yii/db/pgsql/Schema.php +1 -1

No files found.
--- a/framework/yii/db/pgsql/Schema.php
+++ b/framework/yii/db/pgsql/Schema.php
@@ -299,7 +299,7 @@ SQL;
 			$table->columns[$column->name] = $column;
 			if ($column->isPrimaryKey === true) {
 				$table->primaryKey[] = $column->name;
-				if ($table->sequenceName === null && preg_match("/nextval\\('\"?\\w+\"?'(::regclass)?\\)/", $column->defaultValue) === 1) {
+				if ($table->sequenceName === null && preg_match("/nextval\\('\"?\\w+\"?\.?\"?\\w+\"?'(::regclass)?\\)/", $column->defaultValue) === 1) {
 					$table->sequenceName = preg_replace(['/nextval/', '/::/', '/regclass/', '/\'\)/', '/\(\'/'], '', $column->defaultValue);
 				}
 			}