升级easyorm

hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/main/java/org/hswebframework/web/dao/mybatis/builder/EasyOrmSqlBuilder.java

@@ -410,6 +410,11 @@ public class EasyOrmSqlBuilder {
             renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder());
             renderMap.put(SqlRender.TYPE.UPDATE, new UpdateSqlBuilder(Dialect.MYSQL));
         }
+
+        @Override
+        public String getDatabaseName() {
+            return DataSourceHolder.databaseSwitcher().currentDatabase();
+        }
     }
 
     class OracleMeta extends OracleRDBDatabaseMetaData {
@@ -418,6 +423,11 @@ public class EasyOrmSqlBuilder {
             renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder());
             renderMap.put(SqlRender.TYPE.UPDATE, new UpdateSqlBuilder(Dialect.ORACLE));
         }
+
+        @Override
+        public String getDatabaseName() {
+            return DataSourceHolder.databaseSwitcher().currentDatabase();
+        }
     }
 
     class H2Meta extends H2RDBDatabaseMetaData {
@@ -426,6 +436,10 @@ public class EasyOrmSqlBuilder {
             renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder());
             renderMap.put(SqlRender.TYPE.UPDATE, new UpdateSqlBuilder(Dialect.H2));
         }
+        @Override
+        public String getDatabaseName() {
+            return DataSourceHolder.databaseSwitcher().currentDatabase();
+        }
     }
 
     class PGMeta extends PGRDBDatabaseMetaData {
@@ -434,6 +448,10 @@ public class EasyOrmSqlBuilder {
             renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder());
             renderMap.put(SqlRender.TYPE.UPDATE, new UpdateSqlBuilder(Dialect.POSTGRES));
         }
+        @Override
+        public String getDatabaseName() {
+            return DataSourceHolder.databaseSwitcher().currentDatabase();
+        }
     }
 
     class MSSQLMeta extends MSSQLRDBDatabaseMetaData {
@@ -442,5 +460,9 @@ public class EasyOrmSqlBuilder {
             renderMap.put(SqlRender.TYPE.INSERT, new InsertSqlBuilder());
             renderMap.put(SqlRender.TYPE.UPDATE, new UpdateSqlBuilder(Dialect.MSSQL));
         }
+        @Override
+        public String getDatabaseName() {
+            return DataSourceHolder.databaseSwitcher().currentDatabase();
+        }
     }
 }

pom.xml

@@ -95,7 +95,7 @@
         <aspectj.version>1.6.12</aspectj.version>
         <hibernate.validator.version>5.1.1.Final</hibernate.validator.version>
 
-        <hsweb.ezorm.version>3.0.4</hsweb.ezorm.version>
+        <hsweb.ezorm.version>3.0.5-SNAPSHOT</hsweb.ezorm.version>
         <hsweb.utils.version>3.0.2</hsweb.utils.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>