fix #1906 MySQL の厳格モードに対応

baserproject · Mar 5, 2023 · 87cafab · 87cafab
1 parent 9f051a5
commit 87cafab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/docker/docker-compose.yml.default b/docker/docker-compose.yml.default
@@ -17,7 +17,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: "root"
       MYSQL_DATABASE: "basercms"
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --innodb-use-native-aio=0 --sql-mode=NO_ENGINE_SUBSTITUTION --default_authentication_plugin=mysql_native_password
+    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --innodb-use-native-aio=0 --default_authentication_plugin=mysql_native_password
 
   bc5-php:
     container_name: bc5-php

diff --git a/plugins/baser-core/src/Service/BcDatabaseService.php b/plugins/baser-core/src/Service/BcDatabaseService.php
@@ -682,7 +682,11 @@ public function loadCsvToArray($path, $encoding = 'auto')
             }
             $values = [];
             foreach($record as $key => $value) {
-                $values[$head[$key]] = $value;
+                if(!$value) {
+                    $values[$head[$key]] = null;
+                } else {
+                    $values[$head[$key]] = $value;
+                }
             }
             $records[] = $values;
         }
@@ -1219,7 +1223,8 @@ public function deleteTables($dbConfigKeyName = 'default', $dbConfig = null)
             case 'mysql':
                 $sources = $db->getSchemaCollection()->listTables();
                 foreach($sources as $source) {
-                    if (!preg_match("/^" . $prefix . "([^_].+)$/", $source)) continue;
+                    if (!preg_match('/_phinxlog$/', $source) &&
+                        !preg_match("/^" . $prefix . "([^_].+)$/", $source)) continue;
                     try {
                         $db->execute('DROP TABLE ' . $source);
                     } catch (BcException $e) {