#64 add feature: fix schema.sql [vip:platform/pallas#879]

vipshop · Jun 12, 2019 · 1aa3109 · 1aa3109
1 parent 1e08881
commit 1aa3109
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/pallas-core/src/main/resources/db/ddl/h2/schema.sql b/pallas-core/src/main/resources/db/ddl/h2/schema.sql
@@ -272,7 +272,7 @@ CREATE TABLE IF NOT EXISTS `mapping` (
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
   `dynamic` tinyint(1) NOT NULL DEFAULT '0' COMMENT '配置dynamic属性是否为true',
   `parent_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'parent_id类型，1为nested,2为object,3为multi-fields',
-  `copy_to` varchar(256) COLLATE utf8_bin DEFAULT NULL COMMENT '复制域数组',
+  `copy_to` varchar(256) DEFAULT NULL COMMENT '复制域数组',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ;
 

diff --git a/pallas-core/src/main/resources/db/ddl/mysql/schema.sql b/pallas-core/src/main/resources/db/ddl/mysql/schema.sql
@@ -271,8 +271,8 @@ CREATE TABLE IF NOT EXISTS `mapping` (
   `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
   `dynamic` tinyint(1) NOT NULL DEFAULT '0' COMMENT '配置dynamic属性是否为true',
-  `parent_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'parent_id类型，1为nested,2为object,3为multi-fields',
-  `copy_to` varchar(256) COLLATE utf8_bin DEFAULT NULL COMMENT '复制域数组',
+  `parent_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'parent_id类型:1为nested;2为object;3为multi-fields',
+  `copy_to` varchar(256) DEFAULT NULL COMMENT '复制域数组',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 

diff --git a/pallas-core/src/main/resources/mapper/h2/MappingMapper.xml b/pallas-core/src/main/resources/mapper/h2/MappingMapper.xml
@@ -77,7 +77,7 @@
     insert into mapping (id, parent_id, version_id, 
       field_name, field_type, multi, 
       search, doc_value, create_time, 
-      update_time, dynamic)
+      update_time, dynamic,parent_type,copy_to)
     values (#{id,jdbcType=BIGINT}, #{parentId,jdbcType=BIGINT}, #{versionId,jdbcType=BIGINT}, 
       #{fieldName,jdbcType=VARCHAR}, #{fieldType,jdbcType=VARCHAR}, #{multi,jdbcType=BIT}, 
       #{search,jdbcType=BIT}, #{docValue,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, 

diff --git a/pallas-it/src/test/java/com/vip/pallas/test/core/open/IndexVersionServiceImplTest.java b/pallas-it/src/test/java/com/vip/pallas/test/core/open/IndexVersionServiceImplTest.java
@@ -136,6 +136,8 @@ public void testVersionCRUD() throws Exception {
         node.put("search", true);
         node.put("docValue", true);
         node.put("dynamic", false);
+        node.put("parent_type", 0);
+        node.put("copy_to", "");
 
         ArrayNode chilren = JsonNodeFactory.instance.arrayNode();
         ObjectNode child = JsonNodeFactory.instance.objectNode();
@@ -148,6 +150,8 @@ public void testVersionCRUD() throws Exception {
         child.put("search", true);
         child.put("docValue", true);
         child.put("dynamic", false);
+        child.put("parent_type", 0);
+        child.put("copy_to", "");
 
         ArrayNode array = JsonNodeFactory.instance.arrayNode();
         array.add(node);