内核更新

2016-09-26 13:55:47 +08:00
parent 863f6a1cd0
commit 7608d4d0f7
17 changed files with 213 additions and 79 deletions
--- a/core/library/think/db/connector/Pgsql.php
+++ b/core/library/think/db/connector/Pgsql.php
@@ -59,10 +59,10 @@ class Pgsql extends Connection
                $info[$val['field']] = [
                    'name'    => $val['field'],
                    'type'    => $val['type'],
-                    'notnull' => (bool) ('' === $val['null']), // not null is empty, null is yes
+                    'notnull' => (bool) ('' !== $val['null']),
                    'default' => $val['default'],
-                    'primary' => (strtolower($val['key']) == 'pri'),
-                    'autoinc' => (strtolower($val['extra']) == 'auto_increment'),
+                    'primary' => !empty($val['key']),
+                    'autoinc' => (0 === strpos($val['extra'], 'nextval(')),
                ];
            }
        }