lgy 2 months ago
parent
commit
f7782a405f
1 changed files with 8 additions and 10 deletions
  1. 8 10
      jcjyhr/vendor/topthink/think-orm/src/db/connector/Dm.php

+ 8 - 10
jcjyhr/vendor/topthink/think-orm/src/db/connector/Dm.php

@@ -68,16 +68,14 @@ class Dm extends PDOConnection
 
 
         if (!empty($result)) {
         if (!empty($result)) {
             foreach ($result as $key => $val) {
             foreach ($result as $key => $val) {
-                $val = array_change_key_case($val);
-
-                $info[$val['field']] = [
-                    'name'    => $val['field'],
-                    'type'    => $val['type'],
-                    'notnull' => 'NO' == $val['null'],
-                    'default' => $val['default'],
-                    'primary' => strtolower($val['key']) == 'pri',
-                    'autoinc' => strtolower($val['extra']) == 'auto_increment',
-                    'comment' => $val['comment'],
+                $val                       = array_change_key_case($val);
+                $info[$val['column_name']] = [
+                    'name'    => $val['column_name'],
+                    'type'    => $val['data_type'],
+                    'notnull' => $val['notnull'],
+                    'default' => $val['data_default'],
+                    'primary' => $val['pk'],
+                    'autoinc' => $val['pk'],
                 ];
                 ];
             }
             }
         }
         }