Merge branch 'master' of github.com:nutzam/nutz

Author: pangwu86

src/org/nutz/dao/util/Daos.java

@@ -801,7 +801,9 @@ private static UpdateIndexSql createIndexs(Dao dao,
         List<String> delIndexs = new ArrayList<String>();
         List<EntityIndex> indexs = en.getIndexes();
         for (EntityIndex index : indexs) {
-            sqls.add(dao.getJdbcExpert().createIndexSql(en, index));
+            if (!indexsHis.contains(index.getName())) {
+                sqls.add(dao.getJdbcExpert().createIndexSql(en, index));
+            }
         }
         if (!Lang.isEmpty(sqls)) {
             uis.setSqlsAdd(sqls.toArray(new Sql[0]));

test/org/nutz/dao/test/meta/TestMysqlIndex.java

@@ -0,0 +1,29 @@
+package org.nutz.dao.test.meta;
+
+import org.nutz.dao.entity.annotation.Index;
+import org.nutz.dao.entity.annotation.Name;
+import org.nutz.dao.entity.annotation.Table;
+import org.nutz.dao.entity.annotation.TableIndexes;
+
+@Table("t_test_mysql_index")
+@TableIndexes(@Index(fields = "test1",name = "index_test1"))
+public class TestMysqlIndex {
+
+    private String test1;
+    @Name
+    private String name;
+    public String getTest1() {
+        return test1;
+    }
+    public void setTest1(String test1) {
+        this.test1 = test1;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    
+}

test/org/nutz/dao/test/normal/SimpleDaoTest.java

@@ -62,6 +62,7 @@
 import org.nutz.dao.test.meta.SimplePOJO;
 import org.nutz.dao.test.meta.Soldier;
 import org.nutz.dao.test.meta.Tank;
+import org.nutz.dao.test.meta.TestMysqlIndex;
 import org.nutz.dao.test.meta.UseBlobClob;
 import org.nutz.dao.test.meta.issue1074.PojoSql;
 import org.nutz.dao.test.meta.issue1163.Issue1163Master;
@@ -1109,4 +1110,14 @@ public void test_pk_version() {
         ve = dao.fetchx(IssuePkVersion.class, "abc_1", 1);
         assertEquals(99, ve.getPrice());
     }
+    
+    @Test
+    public void test_mysql_migration() {
+        if (!dao.meta().isMySql())
+            return;
+        dao.create(TestMysqlIndex.class, true);
+        
+        System.out.println("==================================");
+        Daos.migration(dao, TestMysqlIndex.class, true, false, true);
+    }
 }

test/org/nutz/json/JsonTest.java

@@ -34,6 +34,7 @@
 import org.nutz.json.JsonShape.Type;
 import org.nutz.json.generic.IntKeyMap;
 import org.nutz.json.impl.JsonRenderImpl;
+import org.nutz.json.meta.EnumWithFields;
 import org.nutz.json.meta.Issue1199;
 import org.nutz.json.meta.JA;
 import org.nutz.json.meta.JB;
@@ -1121,4 +1122,9 @@ public void test_map_use_int_key_issue_1332() {
         System.out.println(map);
         assertTrue(map.getAbc().containsKey(1));
     }
+    
+    @Test
+    public void test_t() {
+        System.out.println(Json.toJson(new NutMap("abc", EnumWithFields.STAY_PUSH)));
+    }
 }

test/org/nutz/json/meta/EnumWithFields.java

@@ -0,0 +1,20 @@
+package org.nutz.json.meta;
+
+import org.nutz.json.JsonShape;
+import org.nutz.json.JsonShape.Type;
+
+@JsonShape(Type.OBJECT)
+public enum EnumWithFields {
+    
+    STAY_PUSH("1600","待推单"),
+    PART_PUSHED("1601","部分推单"),
+    PUSHED("1602","推单完成");
+
+    private String code;
+    private String description;
+    
+    EnumWithFields(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+}