改进pgsql驱动

Author: liu21st

src/db/Builder.php

@@ -508,7 +508,7 @@ protected function parseDateTime(Query $query, $value, string $key, int $bindTyp
             }
 
             if (is_int($value)) {
-                if (preg_match('/(datetime|timestamp)/is', $type)) {
+                if (preg_match('/(datetime|timestamp|string)/is', $type)) {
                     // 日期及时间戳类型
                     $value = date('Y-m-d H:i:s', $value);
                 } elseif (preg_match('/(date)/is', $type)) {

src/db/builder/Pgsql.php

@@ -83,18 +83,20 @@ public function parseKey(Query $query, string|int|Raw $key, bool $strict = false
             // JSON字段支持
             [$field, $name] = explode('->', $key);
             $key = '"' . $field . '"' . '->>\'' . $name . '\'';
-        } elseif (str_contains($key, '.')) {
-            [$table, $key] = explode('.', $key, 2);
+        } else {
+            if (str_contains($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
+                [$table, $key] = explode('.', $key, 2);
 
-            $alias = $query->getOption('alias');
+                $alias = $query->getOption('alias');
 
-            if ('__TABLE__' == $table) {
-                $table = $query->getOption('table');
-                $table = is_array($table) ? array_shift($table) : $table;
-            }
+                if ('__TABLE__' == $table) {
+                    $table = $query->getOption('table');
+                    $table = is_array($table) ? array_shift($table) : $table;
+                }
 
-            if (isset($alias[$table])) {
-                $table = $alias[$table];
+                if (isset($alias[$table])) {
+                    $table = $alias[$table];
+                }
             }
 
             if ('*' != $key && !preg_match('/[,\"\*\(\).\s]/', $key)) {
@@ -103,7 +105,11 @@ public function parseKey(Query $query, string|int|Raw $key, bool $strict = false
         }
 
         if (isset($table)) {
-            $key = $table . '.' . $key;
+            if (str_contains($table, '.')) {
+                $table = str_replace('.', '"."', $table);
+            }
+
+            $key = '"' . $table . '".' . $key;
         }
 
         return $key;