fixs datetime40

getrebuild · Dec 28, 2024 · ab189fc · ab189fc
1 parent 31b58e5
commit ab189fc
Show file tree

Hide file tree

Showing 7 changed files with 191 additions and 159 deletions.
diff --git a/@rbv b/@rbv
diff --git a/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Field2Schema.java
@@ -493,7 +493,7 @@ public boolean castType(Field field, DisplayType toType, boolean force) {
 
             alterTypeSql = String.format("alter table `%s` change column `%s` ",
                     field.getOwnEntity().getPhysicalName(), field.getPhysicalName());
-            alterTypeSql += ddl.toString().trim().replace("  ", " ");
+            alterTypeSql += ddl.toString().trim().replaceAll("\\s+", " ");
 
             Application.getSqlExecutor().executeBatch(new String[]{alterTypeSql}, DDL_TIMEOUT);
             log.info("Cast field type : {}", alterTypeSql);
@@ -519,4 +519,25 @@ public boolean castType(Field field, DisplayType toType, boolean force) {
 
         return true;
     }
+
+    /**
+     * @param field
+     * @return
+     */
+    public boolean fixsDatetime40(Field field) {
+        if (field.getType() != FieldType.TIMESTAMP) return false;
+
+        Dialect dialect = Application.getPersistManagerFactory().getDialect();
+        final Table table = new Table40(field.getOwnEntity(), dialect);
+        StringBuilder ddl = new StringBuilder();
+        table.generateFieldDDL(field, ddl);
+
+        String alterTypeSql = String.format("alter table `%s` change column `%s` ",
+                field.getOwnEntity().getPhysicalName(), field.getPhysicalName());
+        alterTypeSql += ddl.toString().trim().replaceAll("\\s+", " ");
+
+        Application.getSqlExecutor().executeBatch(new String[]{alterTypeSql}, DDL_TIMEOUT);
+        log.info("Fixs datetime field : {}", alterTypeSql);
+        return true;
+    }
 }
diff --git a/src/main/java/com/rebuild/core/metadata/impl/Table40.java b/src/main/java/com/rebuild/core/metadata/impl/Table40.java
@@ -12,6 +12,8 @@
 import cn.devezhao.persist4j.dialect.Dialect;
 import cn.devezhao.persist4j.util.support.Table;
 
+import java.util.List;
+
 /**
  * Fixs timestamp to datetime
  *
@@ -24,6 +26,10 @@ public Table40(Entity entity, Dialect dialect) {
         super(entity, dialect);
     }
 
+    public Table40(Entity entity, Dialect dialect, List<?> indexList) {
+        super(entity, dialect, indexList);
+    }
+
     @Override
     public void generateFieldDDL(Field field, StringBuilder into, boolean allowZeroDate) {
         StringBuilder tmp = new StringBuilder();

diff --git a/src/main/resources/scripts/db-init.sql b/src/main/resources/scripts/db-init.sql
diff --git a/src/main/resources/scripts/db-upgrade.sql b/src/main/resources/scripts/db-upgrade.sql
diff --git a/src/main/resources/web/assets/js/metadata/field-edit.js b/src/main/resources/web/assets/js/metadata/field-edit.js
@@ -862,6 +862,9 @@ class FieldTypeCast extends RbFormHandler {
               <button className="btn btn-link" type="button" onClick={() => this.hide()}>
                 {$L('取消')}
               </button>
+              <button className="btn btn-warning bosskey-show " type="button" onClick={() => this.post('datetime40')}>
+                Repair
+              </button>
             </div>
           </div>
         </div>
@@ -880,8 +883,8 @@ class FieldTypeCast extends RbFormHandler {
     })
   }
 
-  post() {
-    const toType = $(this._$toType).val()
+  post(fixsType) {
+    const toType = fixsType || $(this._$toType).val()
     if (!toType) return RbHighbar.create($L('不可转换'))
 
     const $btn = $(this._$btns).find('.btn').button('loading')

diff --git a/src/test/java/com/rebuild/support/SchemaGenerator.java b/src/test/java/com/rebuild/support/SchemaGenerator.java
@@ -14,6 +14,7 @@
 import cn.devezhao.persist4j.metadata.impl.ConfigurationMetadataFactory;
 import cn.devezhao.persist4j.util.support.Table;
 import com.rebuild.core.metadata.easymeta.EasyMetaFactory;
+import com.rebuild.core.metadata.impl.Table40;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.dom4j.Element;
@@ -68,7 +69,7 @@ static void generate() {
     static void generate(int entityCode) {
         Entity entity = metadataFactory.getEntity(entityCode);
         Element root = ((ConfigurationMetadataFactory) metadataFactory).getConfigDocument().getRootElement();
-        Table table = new Table(
+        Table table = new Table40(
                 entity,
                 dialect,
                 root.selectSingleNode("//entity[@name='" + entity.getName() + "']").selectNodes("index"));