Browse Source

修复不支持oracle的bug

zhouhao 7 years ago
parent
commit
b68b3a9d8e

+ 2 - 2
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/src/main/java/org/hswebframework/web/database/manager/meta/table/parser/support/OralceTableMetaDataParser.java

@@ -4,7 +4,7 @@ import org.hswebframework.ezorm.rdb.executor.SqlExecutor;
 import org.hswebframework.web.database.manager.meta.table.parser.AbstractSqlTableMetaDataParser;
 import org.hswebframework.web.datasource.DatabaseType;
 
-public class OralceTableMetaDataParser extends AbstractSqlTableMetaDataParser {
+public class OracleTableMetaDataParser extends AbstractSqlTableMetaDataParser {
 
     private final static String TABLE_META_SQL = "select distinct(cols.column_name) as \"name\"" +
             ",cols.table_name as \"name\"" +
@@ -23,7 +23,7 @@ public class OralceTableMetaDataParser extends AbstractSqlTableMetaDataParser {
 
     private final static String ALL_TABLE_SQL = "select table_name as \"name\" from user_tab_comments where table_type='TABLE'";
 
-    public OralceTableMetaDataParser(SqlExecutor sqlExecutor) {
+    public OracleTableMetaDataParser(SqlExecutor sqlExecutor) {
         super(sqlExecutor, DatabaseType.oracle);
     }
 

+ 3 - 3
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/src/main/java/org/hswebframework/web/database/manager/TableMetaDataParserAutoConfiguration.java

@@ -1,13 +1,13 @@
 package org.hswebframework.web.database.manager;
 
 import org.hswebframework.ezorm.rdb.executor.SqlExecutor;
-import org.hswebframework.ezorm.rdb.meta.parser.OracleTableMetaParser;
 import org.hswebframework.web.database.manager.meta.ObjectMetadata;
 import org.hswebframework.web.database.manager.meta.table.parser.MetaDataParserRegister;
 import org.hswebframework.web.database.manager.meta.table.parser.MetaDataParserSupplier;
 import org.hswebframework.web.database.manager.meta.table.parser.TableMetaDataParser;
 import org.hswebframework.web.database.manager.meta.table.parser.support.H2TableMetaDataParser;
 import org.hswebframework.web.database.manager.meta.table.parser.support.MysqlTableMetaDataParser;
+import org.hswebframework.web.database.manager.meta.table.parser.support.OracleTableMetaDataParser;
 import org.hswebframework.web.database.manager.meta.table.parser.support.SqlServerTableMetaDataParser;
 import org.hswebframework.web.datasource.DatabaseType;
 import org.springframework.beans.BeansException;
@@ -40,8 +40,8 @@ public class TableMetaDataParserAutoConfiguration {
 
     @Bean
     @ConditionalOnClass(name = "oracle.jdbc.driver.OracleDriver")
-    public OracleTableMetaParser oracleTableMetaParser() {
-        return new OracleTableMetaParser(sqlExecutor);
+    public OracleTableMetaDataParser oracleTableMetaParser() {
+        return new OracleTableMetaDataParser(sqlExecutor);
     }
 
     @Bean