浏览代码

Fix incorrect formation of query string
removed on ALTER COLUMN xx TYPE xxx for postgres.
Fixes #1967

An M - kub2 14 年之前
父节点
当前提交
26495b36d1
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      cake/libs/model/datasources/dbo/dbo_postgres.php

+ 1 - 2
cake/libs/model/datasources/dbo/dbo_postgres.php

@@ -599,8 +599,7 @@ class DboPostgres extends DboSource {
 								$default = isset($col['default']) ? $col['default'] : null;
 								$default = isset($col['default']) ? $col['default'] : null;
 								$nullable = isset($col['null']) ? $col['null'] : null;
 								$nullable = isset($col['null']) ? $col['null'] : null;
 								unset($col['default'], $col['null']);
 								unset($col['default'], $col['null']);
-								$colList[] = 'ALTER COLUMN '. $fieldName .' TYPE ' . str_replace($fieldName, '', $this->buildColumn($col));
-
+								$colList[] = 'ALTER COLUMN '. $fieldName .' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
 								if (isset($nullable)) {
 								if (isset($nullable)) {
 									$nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL';
 									$nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL';
 									$colList[] = 'ALTER COLUMN '. $fieldName .'  ' . $nullable;
 									$colList[] = 'ALTER COLUMN '. $fieldName .'  ' . $nullable;