From 2528f3adb51cc7698c9543f2a8d91330428e5351 Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 24 Jul 2017 01:23:28 +0800 Subject: [PATCH] improved sql parser. add new feature JdbcUtils.getCreateTableScript, for issue #1342 --- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 6 +++--- .../alibaba/druid/mysql/MySql_getCreateTableScriptTest.java | 2 +- .../druid/oracle/Oracle_getCreateTableScriptTest.java | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 080e751bf3..f42030ef33 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -767,11 +767,11 @@ public final class JdbcUtils implements JdbcConstants { } } - public static String getCreateTableScript(String dbType, Connection conn) throws SQLException { - return getCreateTableScript(dbType, conn, true, true); + public static String getCreateTableScript(Connection conn, String dbType) throws SQLException { + return getCreateTableScript(conn, dbType, true, true); } - public static String getCreateTableScript(String dbType, Connection conn, boolean sorted, boolean simplify) throws SQLException { + public static String getCreateTableScript(Connection conn, String dbType, boolean sorted, boolean simplify) throws SQLException { if (JdbcConstants.MYSQL.equals(dbType)) { return MySqlUtils.getCreateTableScript(conn, sorted, simplify); } diff --git a/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java b/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java index 6c736ce3f2..b3255ad050 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java @@ -20,7 +20,7 @@ public class MySql_getCreateTableScriptTest extends DbTestCase { public void test_oracle() throws Exception { Connection conn = getConnection(); - String createTableScript = JdbcUtils.getCreateTableScript(JdbcConstants.MYSQL, conn); + String createTableScript = JdbcUtils.getCreateTableScript(conn, JdbcConstants.MYSQL); System.out.println(createTableScript); diff --git a/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java b/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java index f044368ed1..9a075795e1 100644 --- a/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java +++ b/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java @@ -21,7 +21,8 @@ public class Oracle_getCreateTableScriptTest extends DbTestCase { Connection conn = getConnection(); // 从Oracle通过DBMS_METADATA.GET_DDL获取CreateTable语句列表 - String createTableScript = JdbcUtils.getCreateTableScript(JdbcConstants.ORACLE, conn); + String createTableScript = JdbcUtils.getCreateTableScript(conn, JdbcConstants.ORACLE); + System.out.println(createTableScript); conn.close(); }