p42579631
/
datagear
forked from p85126437/datagear
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

测试环境升级至MySQL8.0

This commit is contained in:
datagear 2021-04-28 14:33:41 +08:00
parent a7a4a1159f
commit 00d48ed6aa
6 changed files with 105 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -128,11 +128,18 @@ SQL工作台
## 编译
（执行单元测试编译，需要预先配置单元测试环境）
### 准备单元测试环境
1. 安装 MySQL-8.0 数据库，并将`root`用户的密码设置为：`root`（或者修改`test/config/jdbc.properties`配置）
2. 新建测试数据库，名称取为：`dg_test`
3. 使用`test/sql/test-sql-script-mysql.sql`脚本初始化`dg_test`库
### 执行编译命令
mvn clean package
或者，也可不准备单元测试环境，直接执行如下编译命令：
（不执行单元测试编译，无需预先配置单元测试环境）
mvn clean package -DskipTests
编译完成后，将在`datagear-web/target/datagear-[version]-packages/`内生成程序包。

2
Roadmap.txt
View File

@ -1,12 +1,12 @@
下一版本：
测试环境升级至MySQL8.0；
自定义数据集结果数据格式；
升级SpringBoot；
添加更多内置图表插件；
修复内置Oracle驱动缺少orai18n.jar的BUG；
修复分页组件英语语言不对的BUG；
系统添加缓存支持；
ok 测试环境升级至MySQL8.0；
待定：
整理看板列表页面按钮，隐藏不常用的按钮；

19
datagear-persistence/src/test/java/org/datagear/persistence/support/ConversionSqlParamValueMapperTest.java
View File

@ -11,6 +11,9 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import java.sql.ResultSet;
import java.sql.Statement;
import org.datagear.persistence.LiteralSqlParamValue;
import org.datagear.persistence.PersistenceTestSupport;
import org.datagear.persistence.SqlParamValueMapperException;
@ -33,7 +36,7 @@ public class ConversionSqlParamValueMapperTest extends PersistenceTestSupport
}
@Test
public void mapTest()
public void mapTest() throws Throwable
{
{
ConversionSqlParamValueMapper mapper = createMapper();
@ -94,9 +97,19 @@ public class ConversionSqlParamValueMapperTest extends PersistenceTestSupport
}
{
String sqlContent = "SELECT COUNT(*) FROM T_ACCOUNT";
SqlParamValue paramValueName = mapper.map(connection, MOCK_TABLE, MOCK_COLUMN_NAME,
"NAME-${select 1 from T_ACCOUNT}-NAME");
assertEquals("NAME-1-NAME", paramValueName.getValue());
"NAME-${" + sqlContent + "}-NAME");
int sqlResult = -1;
try (Statement st = connection.createStatement(); ResultSet rs = st.executeQuery(sqlContent))
{
rs.next();
sqlResult = rs.getInt(1);
}
assertEquals("NAME-" + sqlResult + "-NAME", paramValueName.getValue());
}
{

1
pom.xml
View File

@ -60,7 +60,6 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.24</version>
<scope>test</scope>
</dependency>
</dependencies>

4
test/config/jdbc.properties
View File

@ -1,3 +1,3 @@
jdbc.url=jdbc:mysql://127.0.0.1:3306/dg_test?useUnicode=true&characterEncoding=UTF-8
jdbc.url=jdbc:mysql://127.0.0.1:3306/dg_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
jdbc.user=root
jdbc.password=
jdbc.password=root

105
test/sql/test-sql-script-mysql.sql
View File

@ -31,7 +31,7 @@ CREATE TABLE DATAGEAR_ROLE_USER
CREATE TABLE T_ACCOUNT
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(20) NOT NULL COMMENT '帐号名',
HEAD_IMG BLOB COMMENT '头像图片',
INTRODUCTION TEXT COMMENT '自我介绍',
@ -40,7 +40,7 @@ CREATE TABLE T_ACCOUNT
CREATE TABLE T_ADDRESS
(
ACCOUNT_ID INT(10) COMMENT '所属帐号',
ACCOUNT_ID INT COMMENT '所属帐号',
CITY VARCHAR(50) COMMENT '城市',
STREET VARCHAR(100) COMMENT '街道',
RESIDENTIAL VARCHAR(100) COMMENT '住宅区',
@ -51,16 +51,16 @@ ALTER TABLE T_ADDRESS ADD CONSTRAINT UK_ACCOUNT_ID UNIQUE (ACCOUNT_ID);
CREATE TABLE T_ADDRESS_TYPE
(
ID INT(10),
ID INT,
TYPE_NAME VARCHAR(50) NOT NULL,
PRIMARY KEY (ID)
);
CREATE TABLE T_ADDRESS_MORE
(
ACCOUNT_ID INT(10) NOT NULL COMMENT '所属地址',
ACCOUNT_ID INT NOT NULL COMMENT '所属地址',
ADDRESS VARCHAR(200) COMMENT '地址',
ADDRESS_TYPE INT(10),
ADDRESS_TYPE INT,
ADDRESS_PHOTO BLOB COMMENT '地址照片',
ADDRESS_DESC TEXT COMMENT '地址描述'
) COMMENT='更多住址';
@ -69,19 +69,19 @@ ALTER TABLE T_ADDRESS_MORE ADD FOREIGN KEY (ADDRESS_TYPE) REFERENCES T_ADDRESS_T
CREATE TABLE T_PRODUCT
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(20) NOT NULL COMMENT '商品名称',
PRICE FLOAT(10,2) NOT NULL COMMENT '价格',
PRICE DECIMAL(10,2) NOT NULL COMMENT '价格',
PRIMARY KEY (ID)
) COMMENT='商品';
CREATE TABLE T_ORDER
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(20) NOT NULL COMMENT '订单名称',
ACCOUNT_ID INT(10) COMMENT '所属帐号',
ACCOUNT_ID INT COMMENT '所属帐号',
DESCRIPTION VARCHAR(20) DEFAULT 'note' COMMENT '描述',
STAR_LEVEL INT(4) DEFAULT 1 COMMENT '星级',
STAR_LEVEL INT DEFAULT 1 COMMENT '星级',
CREATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP() COMMENT '创建日期',
EDIT_TIME DATETIME COMMENT '编辑日期',
PRIMARY KEY (ID)
@ -90,22 +90,22 @@ ALTER TABLE T_ORDER ADD FOREIGN KEY (ACCOUNT_ID) REFERENCES T_ACCOUNT (ID);
CREATE TABLE T_ORDER_PRODUCTS
(
ORDER_ID INT(10) NOT NULL COMMENT '订单',
PRODUCT_ID INT(10) NOT NULL COMMENT '商品'
ORDER_ID INT NOT NULL COMMENT '订单',
PRODUCT_ID INT NOT NULL COMMENT '商品'
) COMMENT='订单-商品';
ALTER TABLE T_ORDER_PRODUCTS ADD FOREIGN KEY (ORDER_ID) REFERENCES T_ORDER (ID) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE T_ORDER_PRODUCTS ADD FOREIGN KEY (PRODUCT_ID) REFERENCES T_PRODUCT (ID) ON DELETE CASCADE ON UPDATE CASCADE;
CREATE TABLE T_PRODUCT_PRICE_HISTORY
(
PRODUCT_ID INT(10) NOT NULL COMMENT '商品',
PRICE FLOAT(10,2) NOT NULL COMMENT '价格'
PRODUCT_ID INT NOT NULL COMMENT '商品',
PRICE DECIMAL(10,2) NOT NULL COMMENT '价格'
);
ALTER TABLE T_PRODUCT_PRICE_HISTORY ADD FOREIGN KEY (PRODUCT_ID) REFERENCES T_PRODUCT (ID) ON DELETE CASCADE ON UPDATE CASCADE;
CREATE TABLE T_AUTO_GENERATED_KEYS
(
ID INT(10) NOT NULL AUTO_INCREMENT,
ID INT NOT NULL AUTO_INCREMENT,
NAME VARCHAR(20),
CREATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP(),
PRIMARY KEY (ID)
@ -113,7 +113,7 @@ CREATE TABLE T_AUTO_GENERATED_KEYS
CREATE TABLE `T_PECULIAR_ACCOUNT_[a]b$c`
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(20) NOT NULL COMMENT '帐号名',
HEAD_IMG BLOB COMMENT '头像图片',
INTRODUCTION TEXT COMMENT '自我介绍',
@ -122,7 +122,7 @@ CREATE TABLE `T_PECULIAR_ACCOUNT_[a]b$c`
CREATE TABLE `T_PECULIAR_ADDRESS_[ab]c$d_1`
(
ACCOUNT_ID INT(10) COMMENT '所属帐号',
ACCOUNT_ID INT COMMENT '所属帐号',
CITY VARCHAR(50) COMMENT '城市',
STREET VARCHAR(100) COMMENT '街道',
RESIDENTIAL VARCHAR(100) COMMENT '住宅区',
@ -133,7 +133,7 @@ ALTER TABLE `T_PECULIAR_ADDRESS_[ab]c$d_1` ADD CONSTRAINT UK_ACCOUNT_ID UNIQUE (
CREATE TABLE `T_PECULIAR_ADDRESS_MORE_a$b[cde]f_1`
(
ACCOUNT_ID INT(10) NOT NULL COMMENT '所属地址',
ACCOUNT_ID INT NOT NULL COMMENT '所属地址',
ADDRESS VARCHAR(200) COMMENT '地址',
ADDRESS_PHOTO BLOB COMMENT '地址照片',
ADDRESS_DESC TEXT COMMENT '地址描述',
@ -143,7 +143,7 @@ ALTER TABLE `T_PECULIAR_ADDRESS_MORE_a$b[cde]f_1` ADD FOREIGN KEY (ACCOUNT_ID) R
CREATE TABLE T_DATE
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
`DATE` DATE,
`DATETIME` DATETIME,
`TIME` TIME,
@ -154,7 +154,7 @@ CREATE TABLE T_DATE
CREATE TABLE T_DATA_IMPORT
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(200),
COL_DATE DATE,
COL_DATETIME DATETIME,
@ -167,7 +167,7 @@ CREATE TABLE T_DATA_IMPORT
CREATE TABLE T_DATA_EXPORT
(
ID INT(10) NOT NULL,
ID INT NOT NULL,
NAME VARCHAR(200),
COL_DATE DATE,
COL_DATETIME DATETIME,
@ -181,32 +181,45 @@ CREATE TABLE T_DATA_EXPORT
CREATE TABLE T_ANALYSIS
(
NAME VARCHAR(50) NOT NULL,
VALUE FLOAT(10,2) NOT NULL
VALUE DECIMAL(10,2) NOT NULL
);
CREATE TABLE T_ANALYSIS_1
(
COL_NAME VARCHAR(50) NOT NULL,
COL_DATE DATE NOT NULL,
COL_VALUE FLOAT(10,2) NOT NULL
COL_VALUE DECIMAL(10,2) NOT NULL
);
CREATE TABLE T_ANALYSIS_2
(
COL_NAME VARCHAR(50) NOT NULL,
COL_X FLOAT(10,2) NOT NULL,
COL_Y FLOAT(10,2) NOT NULL
COL_X DECIMAL(10,2) NOT NULL,
COL_Y DECIMAL(10,2) NOT NULL
);
CREATE TABLE T_ANALYSIS_MAP
(
COL_NAME VARCHAR(50) NOT NULL,
COL_VALUE FLOAT(10,2) NOT NULL,
COL_LONGITUDE FLOAT(12,6),
COL_LATITUDE FLOAT(12,6),
COL_VALUE DECIMAL(10,2) NOT NULL,
COL_LONGITUDE DECIMAL(12,6),
COL_LATITUDE DECIMAL(12,6),
PRIMARY KEY (COL_NAME)
);
CREATE TABLE T_ANALYSIS_MAP_1
(
COL_NAME VARCHAR(50),
COL_VALUE DECIMAL(10),
COL_PARENT VARCHAR(50)
);
CREATE TABLE T_TIME_SERIES
(
COL_TIME VARCHAR(50),
COL_VALUE DECIMAL(10,2)
);
/*
truncate table t_auto_generated_keys;
truncate table t_data_export;
@ -223,4 +236,40 @@ truncate table t_address_more;
truncate table t_address;
truncate table t_address_type;
truncate table t_account;
truncate table t_analysis;
truncate table t_analysis_1;
truncate table t_analysis_2;
truncate table t_analysis_map;
truncate table t_analysis_map_1;
truncate table t_time_series;
truncate table datagear_role_user;
truncate table datagear_user;
truncate table datagear_role;
*/
/*
drop table t_auto_generated_keys;
drop table t_data_export;
drop table t_data_import;
drop table t_date;
drop table t_order_products;
drop table t_order;
drop table t_product_price_history;
drop table t_product;
drop table `t_peculiar_address_more_a$b[cde]f_1`;
drop table `t_peculiar_address_[ab]c$d_1`;
drop table `t_peculiar_account_[a]b$c`;
drop table t_address_more;
drop table t_address;
drop table t_address_type;
drop table t_account;
drop table t_analysis;
drop table t_analysis_1;
drop table t_analysis_2;
drop table t_analysis_map;
drop table t_analysis_map_1;
drop table t_time_series;
drop table datagear_role_user;
drop table datagear_user;
drop table datagear_role;
*/