Repository: sqoop Updated Branches: refs/heads/sqoop2 e19b87702 -> 82d9f0201
SQOOP-2654: Sqoop2: Fix the problem in integration test with MySql repository (Colin Ma via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/82d9f020 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/82d9f020 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/82d9f020 Branch: refs/heads/sqoop2 Commit: 82d9f0201cb6758062b73c5303dbd74d6d676651 Parents: e19b877 Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Nov 9 08:06:46 2015 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Nov 9 08:06:46 2015 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/sqoop/common/test/db/MySQLProvider.java | 2 +- .../sqoop/common/test/repository/MysqlRepositoryProvider.java | 2 +- .../common/CommonRepositoryInsertUpdateDeleteSelectQuery.java | 3 ++- .../org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/82d9f020/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java index 268e475..393904f 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java @@ -34,7 +34,7 @@ public class MySQLProvider extends DatabaseProvider { private static final String CONNECTION = System.getProperties().getProperty( "sqoop.provider.mysql.jdbc", - "jdbc:mysql://localhost:3306/test?createDatabaseIfNotExist=true&sessionVariables=sql_mode='ANSI_QUOTES'" + "jdbc:mysql://localhost:3306/test?createDatabaseIfNotExist=true&sessionVariables=sql_mode='ANSI_QUOTES'" ); private static final String USERNAME = System.getProperties().getProperty( http://git-wip-us.apache.org/repos/asf/sqoop/blob/82d9f020/common-test/src/main/java/org/apache/sqoop/common/test/repository/MysqlRepositoryProvider.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/repository/MysqlRepositoryProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/repository/MysqlRepositoryProvider.java index 229b339..3afdf93 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/repository/MysqlRepositoryProvider.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/repository/MysqlRepositoryProvider.java @@ -27,7 +27,7 @@ public class MysqlRepositoryProvider extends RepositoryProviderBase { private static final String CONNECTION = System.getProperties().getProperty( "sqoop.repository.mysql.jdbc.url", - "jdbc:mysql://localhost/test" + "jdbc:mysql://localhost:3306/test?createDatabaseIfNotExist=true&sessionVariables=sql_mode='ANSI_QUOTES'" ); private static final String USERNAME = System.getProperties().getProperty( http://git-wip-us.apache.org/repos/asf/sqoop/blob/82d9f020/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryInsertUpdateDeleteSelectQuery.java ---------------------------------------------------------------------- diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryInsertUpdateDeleteSelectQuery.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryInsertUpdateDeleteSelectQuery.java index 3a4e80a..d1c3feb 100644 --- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryInsertUpdateDeleteSelectQuery.java +++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryInsertUpdateDeleteSelectQuery.java @@ -566,7 +566,8 @@ public class CommonRepositoryInsertUpdateDeleteSelectQuery { + " INNER JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + " = ?" - + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " DESC"; + + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + "DESC ," + + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + " DESC"; // DML: Select context type private static final String STMT_SELECT_CONTEXT_TYPE = http://git-wip-us.apache.org/repos/asf/sqoop/blob/82d9f020/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java ---------------------------------------------------------------------- diff --git a/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java b/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java index fd3a3f2..2c74c32 100644 --- a/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java +++ b/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java @@ -88,8 +88,7 @@ public class MySqlRepositoryHandler extends CommonRepositoryHandler { // Select and return the version try { DatabaseMetaData md = conn.getMetaData(); - metadataResultSet = md.getTables(null, - CommonRepositorySchemaConstants.SCHEMA_SQOOP, + metadataResultSet = md.getTables(CommonRepositorySchemaConstants.SCHEMA_SQOOP, null, CommonRepositorySchemaConstants.TABLE_SQ_SYSTEM_NAME, null); if (metadataResultSet.next()) {
