diff --git a/src/main/java/com/zzg/mybatis/generator/model/DbType.java b/src/main/java/com/zzg/mybatis/generator/model/DbType.java index c10adbdb..ef21132a 100644 --- a/src/main/java/com/zzg/mybatis/generator/model/DbType.java +++ b/src/main/java/com/zzg/mybatis/generator/model/DbType.java @@ -7,7 +7,7 @@ public enum DbType { MySQL("com.mysql.jdbc.Driver", "jdbc:mysql://%s:%s/%s?useUnicode=true&useSSL=false&characterEncoding=%s", "mysql-connector-java-5.1.38.jar"), MySQL_8("com.mysql.cj.jdbc.Driver", "jdbc:mysql://%s:%s/%s?serverTimezone=UTC&useUnicode=true&useSSL=false&characterEncoding=%s", "mysql-connector-java-8.0.11.jar"), - Oracle("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%s:%s", "ojdbc14.jar"), + Oracle("oracle.jdbc.OracleDriver", "jdbc:oracle:thin:@//%s:%s/%s", "ojdbc6.jar"), PostgreSQL("org.postgresql.Driver", "jdbc:postgresql://%s:%s/%s", "postgresql-9.4.1209.jar"), SQL_Server("com.microsoft.sqlserver.jdbc.SQLServerDriver", "jdbc:sqlserver://%s:%s;databaseName=%s", "sqljdbc4-4.0.jar"), Sqlite("org.sqlite.JDBC", "jdbc:sqlite:%s", "sqlite-jdbc-3.19.3.jar"); diff --git a/src/main/java/com/zzg/mybatis/generator/util/DbUtil.java b/src/main/java/com/zzg/mybatis/generator/util/DbUtil.java index 15f90c7c..8f92005c 100644 --- a/src/main/java/com/zzg/mybatis/generator/util/DbUtil.java +++ b/src/main/java/com/zzg/mybatis/generator/util/DbUtil.java @@ -83,7 +83,7 @@ public static List getTableColumns(DatabaseConfig dbConfig, Str Connection conn = getConnection(dbConfig); try { DatabaseMetaData md = conn.getMetaData(); - ResultSet rs = md.getColumns(null, null, tableName, null); + ResultSet rs = md.getColumns(dbConfig.getSchema(), null, tableName, null); List columns = new ArrayList<>(); while (rs.next()) { UITableColumnVO columnVO = new UITableColumnVO(); diff --git a/src/main/resources/lib/ojdbc14.jar b/src/main/resources/lib/ojdbc14.jar deleted file mode 100644 index cca9b8bb..00000000 Binary files a/src/main/resources/lib/ojdbc14.jar and /dev/null differ diff --git a/src/main/resources/lib/ojdbc6.jar b/src/main/resources/lib/ojdbc6.jar new file mode 100644 index 00000000..767eba7f Binary files /dev/null and b/src/main/resources/lib/ojdbc6.jar differ