Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Remove sql mode check for mysql.

Browse Source
This commit is contained in:
caoyanyi
2023-01-10 12:50:07 +08:00
parent 14fa294219
commit 8f2241f929
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/lib/yaml.class.php
+7 -4
View File
@@ -300,7 +300,7 @@ class yaml
{
$tableSqlDir = "{$_SERVER['PWD']}/data/sql";
if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0700);
if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0777, true);
$dumpCommand = "mysqldump -u%s -p%s -h%s -P%s %s %s > {$tableSqlDir}/{$tableName}.sql";
$runtimeRoot = dirname(dirname(__FILE__)) . '/runtime/';
@@ -314,10 +314,13 @@ class yaml
$dbUser = $this->config->db->user;
$dbPWD = $this->config->db->password;
$command = "$zdPath -c %s -d %s -n %d -t %s -dns mysql://%s:%s@%s:%s/%s#utf8";
$setModeSql = "mysql -u%s -p%s -h%s -P%s %s -e \"SET global sql_mode = '';\"";
$command = "$zdPath -c %s -d %s -n %d -t %s -dns mysql://%s:%s@%s:%s/%s#utf8";
if($isClear === true) $command .= ' --clear';
$execYaml = sprintf($command, $configYaml, $yamlFile, $rows, $tableName, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName);
$execDump = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
$execYaml = sprintf($command, $configYaml, $yamlFile, $rows, $tableName, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName);
$execDump = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
$execSetMode = sprintf($setModeSql, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName);
system($execSetMode);
system($execDump);
system($execYaml);
}
test/model/execution/activate.php
+3 -2
View File
@@ -2,8 +2,6 @@
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
zdTable('user')->gen(5);
su('admin');
$execution = zdTable('project');
$execution->id->range('1-5');
@@ -16,6 +14,9 @@ $execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/
$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
$execution->gen(5);
zdTable('user')->gen(5);
su('admin');
/**
title=测试executionModel->activateTest();