Database Schema changed

4faf486b · ainilife · 1263123f · 4faf486b · 4faf486b · 4faf486b
4 changed file
--- a/cat-home/src/main/resources/META-INF/dal/jdbc/abtest-codegen.xml
+++ b/cat-home/src/main/resources/META-INF/dal/jdbc/abtest-codegen.xml
@@ -11,6 +11,7 @@
    <member name="description" field="description" value-type="String" length="512" />
    <var name="key-id" value-type="int" key-member="id" />
    <primary-key name="PRIMARY" members="id" />
+    <index name="name_UNIQUE" unique="true" members="name ASC" />
    <readsets>
      <readset name="FULL" all="true" />
    </readsets>
@@ -49,7 +50,7 @@
    <member name="end-date" field="end_date" value-type="Date" />
    <member name="disabled" field="disabled" value-type="int" length="3" nullable="false" />
    <member name="domains" field="domains" value-type="String" length="100" nullable="false" />
-    <member name="strategy-configuration" field="strategy_configuration" value-type="String" length="1024" />
+    <member name="strategy-configuration" field="strategy_configuration" value-type="String" length="65535" />
    <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
    <member name="modified-date" field="modified_date" value-type="Date" nullable="false" />
    <var name="key-id" value-type="int" key-member="id" />
@@ -86,14 +87,15 @@
  </entity>
  <entity name="group-strategy" table="group_strategy" alias="gs">
    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
-    <member name="name" field="name" value-type="String" length="45" nullable="false" />
-    <member name="alias" field="alias" value-type="String" length="45" nullable="false" />
-    <member name="classname" field="classname" value-type="String" length="45" nullable="false" />
-    <member name="configuration" field="configuration" value-type="String" length="512" />
+    <member name="name" field="name" value-type="String" length="100" nullable="false" />
+    <member name="alias" field="alias" value-type="String" length="100" nullable="false" />
+    <member name="classname" field="classname" value-type="String" length="100" nullable="false" />
+    <member name="configuration" field="configuration" value-type="String" length="65535" />
    <member name="status" field="status" value-type="int" length="3" nullable="false" />
-    <member name="description" field="description" value-type="String" length="45" />
+    <member name="description" field="description" value-type="String" length="512" />
    <var name="key-id" value-type="int" key-member="id" />
    <primary-key name="PRIMARY" members="id" />
+    <index name="name_UNIQUE" unique="true" members="name ASC" />
    <readsets>
      <readset name="FULL" all="true" />
    </readsets>

--- a/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml
+++ b/cat-home/src/main/resources/META-INF/dal/jdbc/report-codegen.xml
@@ -4,7 +4,7 @@
    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
    <member name="name" field="name" value-type="String" length="20" nullable="false" />
    <member name="ip" field="ip" value-type="String" length="20" />
-    <member name="domain" field="domain" value-type="String" length="200" nullable="false" />
+    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
    <member name="period" field="period" value-type="Date" nullable="false" />
    <member name="type" field="type" value-type="int" length="3" nullable="false" />
    <member name="detail-content" field="detail_content" value-type="String" length="16777215" nullable="false" />
@@ -50,12 +50,11 @@
    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
    <member name="period" field="period" value-type="Date" nullable="false" />
    <member name="type" field="type" value-type="int" length="3" nullable="false" />
-    <member name="content" field="content" value-type="String" length="2147483647" nullable="false" />
+    <member name="content" field="content" value-type="String" length="16777215" nullable="false" />
    <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
    <var name="key-id" value-type="int" key-member="id" />
    <primary-key name="PRIMARY" members="id" />
    <index name="period" unique="true" members="period ASC, domain ASC, name ASC" />
-    <index name="period_column" members="period ASC" />
    <readsets>
      <readset name="FULL" all="true" />
    </readsets>
@@ -90,7 +89,7 @@
    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
    <member name="name" field="name" value-type="String" length="20" nullable="false" />
    <member name="ip" field="ip" value-type="String" length="20" />
-    <member name="domain" field="domain" value-type="String" length="200" nullable="false" />
+    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
    <member name="period" field="period" value-type="Date" nullable="false" />
    <member name="type" field="type" value-type="int" length="3" nullable="false" />
    <member name="detail-content" field="detail_content" value-type="String" length="16777215" nullable="false" />
@@ -173,10 +172,10 @@
    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
    <member name="name" field="name" value-type="String" length="20" nullable="false" />
    <member name="ip" field="ip" value-type="String" length="20" nullable="false" />
-    <member name="domain" field="domain" value-type="String" length="50" />
+    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
    <member name="period" field="period" value-type="Date" nullable="false" />
    <member name="type" field="type" value-type="int" length="3" nullable="false" />
-    <member name="content" field="content" value-type="String" length="2147483647" />
+    <member name="content" field="content" value-type="String" length="16777215" nullable="false" />
    <member name="creation-date" field="creation_date" value-type="Date" nullable="false" />
    <var name="key-id" value-type="int" key-member="id" />
    <primary-key name="PRIMARY" members="id" />
@@ -215,7 +214,7 @@
    <member name="id" field="id" value-type="int" length="10" nullable="false" key="true" auto-increment="true" />
    <member name="name" field="name" value-type="String" length="20" nullable="false" />
    <member name="ip" field="ip" value-type="String" length="20" nullable="false" />
-    <member name="domain" field="domain" value-type="String" length="50" />
+    <member name="domain" field="domain" value-type="String" length="50" nullable="false" />
    <member name="period" field="period" value-type="Date" nullable="false" />
    <member name="type" field="type" value-type="int" length="3" nullable="false" />
    <member name="content" field="content" value-type="String" length="16777215" nullable="false" />

--- a/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml
+++ b/cat-home/src/main/resources/META-INF/wizard/jdbc/wizard.xml
@@ -3,9 +3,9 @@
   <jdbc package="com.dianping.cat.home.dal" name="cat">
      <datasource>
         <driver>com.mysql.jdbc.Driver</driver>
-         <url>jdbc:mysql://192.168.7.43:3306/cat</url>
-         <user>binlog</user>
-         <password>binlog</password>
+         <url>jdbc:mysql://127.0.0.1:3306/cat</url>
+         <user>root</user>
+         <password></password>
         <properties>useUnicode=true&amp;autoReconnect=true</properties>
      </datasource>
      <group name="report" package="com.dianping.cat.home.dal.report">

--- a/script/Cat.sql
+++ b/script/Cat.sql
@@ -250,37 +250,39 @@ CREATE TABLE `abtest` (
  `name` varchar(45) NOT NULL COMMENT '名字',
  `owner` varchar(45) NOT NULL COMMENT 'case的Owner',
  `group_strategy` int(11) DEFAULT NULL COMMENT '分组策略ID',
-  `domains` varchar(200) DEFAULT NULL COMMENT 'Domains，分号分割',
+  `domains` varchar(200) DEFAULT NULL COMMENT 'Domains，逗号分割',
  `creation_date` datetime DEFAULT NULL COMMENT '创建时间',
  `modified_date` datetime DEFAULT NULL COMMENT '上次修改时间',
  `description` varchar(512) DEFAULT NULL COMMENT '描述',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8;

 CREATE TABLE `abtest_run` (
  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `creator` varchar(45) DEFAULT NULL,
-  `case_id` int(11) NOT NULL,
+  `creator` varchar(45) DEFAULT NULL COMMENT 'Creator',
+  `case_id` int(11) NOT NULL COMMENT 'Case ID',
  `start_date` datetime DEFAULT NULL COMMENT '开始时间',
  `end_date` datetime DEFAULT NULL COMMENT '结束时间',
  `disabled` tinyint(4) NOT NULL COMMENT '是否有效',
-  `domains` varchar(100) NOT NULL COMMENT '属于的domain，用分号分割',
-  `strategy_configuration` varchar(1024) DEFAULT NULL COMMENT '策略配置',
+  `domains` varchar(100) NOT NULL COMMENT '属于的domain，用逗号分割',
+  `strategy_configuration` text COMMENT '策略配置',
  `creation_date` datetime NOT NULL COMMENT '创建时间',
  `modified_date` datetime NOT NULL COMMENT '上次修改时间',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8;

 CREATE TABLE `group_strategy` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(45) NOT NULL COMMENT 'GroupStrategy的名字',
-  `alias` varchar(45) NOT NULL COMMENT 'GroupStrategy的英文名',
-  `classname` varchar(45) NOT NULL COMMENT 'GroupStrategy的class名字',
-  `configuration` varchar(512) DEFAULT NULL COMMENT '配置的schema',
-  `status` tinyint(4) NOT NULL COMMENT '是否开/关',
-  `description` varchar(45) DEFAULT NULL COMMENT '描述',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+  `name` varchar(100) NOT NULL COMMENT 'GroupStrategy的名字',
+  `alias` varchar(100) NOT NULL COMMENT 'GroupStrategy的英文名',
+  `classname` varchar(100) NOT NULL COMMENT 'GroupStrategy的class名字',
+  `configuration` text COMMENT '配置的schema',
+  `status` tinyint(4) NOT NULL COMMENT '是否开/关，1是开，0是关',
+  `description` varchar(512) DEFAULT NULL COMMENT '描述',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_UNIQUE` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;