You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by gw...@apache.org on 2015/01/27 05:25:44 UTC
[1/3] sqoop git commit: SQOOP-2041: Sqoop2: Escape identifier names
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 5ade862b1 -> 2b4db8023
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java
index af76a17..ce7b6cb 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaInsertUpdateDeleteSelectQuery.java
@@ -17,6 +17,9 @@
*/
package org.apache.sqoop.repository.derby;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
+import org.apache.sqoop.repository.common.CommonRepositoryInsertUpdateDeleteSelectQuery;
+
import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*;
import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*;
@@ -25,33 +28,33 @@ import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*;
* Derby Repository Insert/ Update/ Delete / Select queries
*
*/
-public final class DerbySchemaInsertUpdateDeleteSelectQuery {
+public final class DerbySchemaInsertUpdateDeleteSelectQuery extends CommonRepositoryInsertUpdateDeleteSelectQuery {
/******** SYSTEM TABLE**************/
// DML: Get system key
public static final String STMT_SELECT_SYSTEM =
"SELECT "
- + COLUMN_SQM_VALUE
- + " FROM " + TABLE_SQ_SYSTEM
- + " WHERE " + COLUMN_SQM_KEY + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ?";
//DML: Get deprecated or the new repo version system key
public static final String STMT_SELECT_DEPRECATED_OR_NEW_SYSTEM_VERSION =
"SELECT "
- + COLUMN_SQM_VALUE + " FROM " + TABLE_SQ_SYSTEM
- + " WHERE ( " + COLUMN_SQM_KEY + " = ? )"
- + " OR (" + COLUMN_SQM_KEY + " = ? )";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME)
+ + " WHERE ( " + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ? )"
+ + " OR (" + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ? )";
// DML: Remove system key
public static final String STMT_DELETE_SYSTEM =
- "DELETE FROM " + TABLE_SQ_SYSTEM
- + " WHERE " + COLUMN_SQM_KEY + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ?";
// DML: Insert new system key
public static final String STMT_INSERT_SYSTEM =
- "INSERT INTO " + TABLE_SQ_SYSTEM + "("
- + COLUMN_SQM_KEY + ", "
- + COLUMN_SQM_VALUE + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME) + "("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE) + ") "
+ "VALUES(?, ?)";
/*********CONFIGURABLE TABLE ***************/
@@ -59,41 +62,41 @@ public final class DerbySchemaInsertUpdateDeleteSelectQuery {
@Deprecated // used only for upgrade logic
public static final String STMT_SELECT_CONNECTOR_ALL =
"SELECT "
- + COLUMN_SQC_ID + ", "
- + COLUMN_SQC_NAME + ", "
- + COLUMN_SQC_CLASS + ", "
- + COLUMN_SQC_VERSION
- + " FROM " + TABLE_SQ_CONNECTOR;
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME);
@Deprecated // used only in the upgrade path
public static final String STMT_INSERT_INTO_CONNECTOR_WITHOUT_SUPPORTED_DIRECTIONS =
- "INSERT INTO " + TABLE_SQ_CONNECTOR+ " ("
- + COLUMN_SQC_NAME + ", "
- + COLUMN_SQC_CLASS + ", "
- + COLUMN_SQC_VERSION
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME)+ " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION)
+ ") VALUES (?, ?, ?)";
//DML: Insert new connection
@Deprecated // used only in upgrade path
public static final String STMT_INSERT_CONNECTION =
- "INSERT INTO " + TABLE_SQ_CONNECTION + " ("
- + COLUMN_SQN_NAME + ", "
- + COLUMN_SQN_CONNECTOR + ","
- + COLUMN_SQN_ENABLED + ", "
- + COLUMN_SQN_CREATION_USER + ", "
- + COLUMN_SQN_CREATION_DATE + ", "
- + COLUMN_SQN_UPDATE_USER + ", " + COLUMN_SQN_UPDATE_DATE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CONNECTOR) + ","
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_USER) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_DATE)
+ ") VALUES (?, ?, ?, ?, ?, ?, ?)";
/******* CONFIG and CONNECTOR DIRECTIONS ****/
- public static final String STMT_INSERT_DIRECTION = "INSERT INTO " + TABLE_SQ_DIRECTION + " "
- + "(" + COLUMN_SQD_NAME + ") VALUES (?)";
+ public static final String STMT_INSERT_DIRECTION = "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + " "
+ + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME) + ") VALUES (?)";
public static final String STMT_FETCH_CONFIG_DIRECTIONS =
"SELECT "
- + COLUMN_SQ_CFG_ID + ", "
- + COLUMN_SQ_CFG_DIRECTION
- + " FROM " + TABLE_SQ_CONFIG;
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIRECTION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME);
private DerbySchemaInsertUpdateDeleteSelectQuery() {
// Disable explicit object creation
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java
index d5cabd0..fa6710b 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaUpgradeQuery.java
@@ -17,6 +17,8 @@
*/
package org.apache.sqoop.repository.derby;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
+
import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*;
import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*;
@@ -39,192 +41,192 @@ public final class DerbySchemaUpgradeQuery {
// DDL: Increased size of SQ_CONNECTOR.SQC_VERSION to 64
public static final String QUERY_UPGRADE_TABLE_SQ_CONNECTOR_MODIFY_COLUMN_SQC_VERSION_VARCHAR_64 =
- "ALTER TABLE " + TABLE_SQ_CONNECTOR + " ALTER COLUMN "
- + COLUMN_SQC_VERSION + " SET DATA TYPE VARCHAR(64)";
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " ALTER COLUMN "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION) + " SET DATA TYPE VARCHAR(64)";
// DDL: Add creation_user column to table SQ_SUBMISSION
public static final String QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_CREATION_USER =
- "ALTER TABLE " + TABLE_SQ_SUBMISSION + " ADD "
- + COLUMN_SQS_CREATION_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
// DDL: Add update_user column to table SQ_SUBMISSION
public static final String QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_UPDATE_USER =
- "ALTER TABLE " + TABLE_SQ_SUBMISSION + " ADD "
- + COLUMN_SQS_UPDATE_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
//DDL: Add update_user column to table SQ_SUBMISSION
public static final String QUERY_UPGRADE_TABLE_SQ_SUBMISSION_MODIFY_COLUMN_SQS_EXTERNAL_ID_VARCHAR_50 =
- "ALTER TABLE " + TABLE_SQ_SUBMISSION + " ALTER COLUMN "
- + COLUMN_SQS_EXTERNAL_ID + " SET DATA TYPE VARCHAR(50)";
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " ALTER COLUMN "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + " SET DATA TYPE VARCHAR(50)";
public static final String QUERY_UPGRADE_TABLE_SQ_CONNECTION_ADD_COLUMN_ENABLED =
- "ALTER TABLE " + TABLE_SQ_CONNECTION + " ADD "
- + COLUMN_SQN_ENABLED + " BOOLEAN "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ENABLED) + " BOOLEAN "
+ "DEFAULT TRUE";
// DDL: Add creation_user column to table SQ_CONNECTION
public static final String QUERY_UPGRADE_TABLE_SQ_CONNECTION_ADD_COLUMN_CREATION_USER =
- "ALTER TABLE " + TABLE_SQ_CONNECTION + " ADD "
- + COLUMN_SQN_CREATION_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
// DDL: Add update_user column to table SQ_CONNECTION
public static final String QUERY_UPGRADE_TABLE_SQ_CONNECTION_ADD_COLUMN_UPDATE_USER =
- "ALTER TABLE " + TABLE_SQ_CONNECTION + " ADD "
- + COLUMN_SQN_UPDATE_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
// DDL: Add enabled column to table SQ_JOB
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_COLUMN_ENABLED =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD "
- + COLUMN_SQB_ENABLED + " BOOLEAN "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ENABLED) + " BOOLEAN "
+ "DEFAULT TRUE";
// DDL: Add creation_user column to table SQ_JOB
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_COLUMN_CREATION_USER =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD "
- + COLUMN_SQB_CREATION_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
// DDL: Add update_user column to table SQ_JOB
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_COLUMN_UPDATE_USER =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD "
- + COLUMN_SQB_UPDATE_USER + " VARCHAR(32) "
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_USER) + " VARCHAR(32) "
+ "DEFAULT NULL";
// Version 4 Upgrade
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_RENAME_COLUMN_SQB_CONNECTION_TO_SQB_FROM_CONNECTION =
- "RENAME COLUMN " + TABLE_SQ_JOB + "." + COLUMN_SQB_CONNECTION
- + " TO " + COLUMN_SQB_FROM_CONNECTION;
+ "RENAME COLUMN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CONNECTION)
+ + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_CONNECTION);
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_COLUMN_SQB_TO_CONNECTION =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD COLUMN " + COLUMN_SQB_TO_CONNECTION
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD COLUMN " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_CONNECTION)
+ " BIGINT";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_REMOVE_CONSTRAINT_SQB_SQN =
- "ALTER TABLE " + TABLE_SQ_JOB + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN;
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN;
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_CONSTRAINT_SQB_SQN_FROM =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQN_FROM
- + " FOREIGN KEY (" + COLUMN_SQB_FROM_CONNECTION + ") REFERENCES "
- + TABLE_SQ_CONNECTION + " (" + COLUMN_SQN_ID + ")";
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQN_FROM
+ + " FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_CONNECTION) + ") REFERENCES "
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + ")";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_CONSTRAINT_SQB_SQN_TO =
- "ALTER TABLE " + TABLE_SQ_JOB + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQN_TO
- + " FOREIGN KEY (" + COLUMN_SQB_TO_CONNECTION + ") REFERENCES "
- + TABLE_SQ_CONNECTION + " (" + COLUMN_SQN_ID + ")";
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQN_TO
+ + " FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_CONNECTION) + ") REFERENCES "
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + ")";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_RENAME_COLUMN_SQF_OPERATION_TO_SQF_DIRECTION =
- "RENAME COLUMN " + TABLE_SQ_FORM + "." + COLUMN_SQF_OPERATION
- + " TO " + COLUMN_SQF_DIRECTION;
+ "RENAME COLUMN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_OPERATION)
+ + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION);
//DML: Insert into form
public static final String STMT_INSERT_INTO_FORM =
- "INSERT INTO " + TABLE_SQ_FORM+ " ("
- + COLUMN_SQF_CONNECTOR + ", "
- + COLUMN_SQF_NAME + ", "
- + COLUMN_SQF_TYPE + ", "
- + COLUMN_SQF_INDEX
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME)+ " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_INDEX)
+ ") VALUES ( ?, ?, ?, ?)";
// DML: Insert into inpu with form name
public static final String STMT_INSERT_INTO_INPUT_WITH_FORM =
- "INSERT INTO " + TABLE_SQ_INPUT + " ("
- + COLUMN_SQI_NAME + ", "
- + COLUMN_SQI_FORM + ", "
- + COLUMN_SQI_INDEX + ", "
- + COLUMN_SQI_TYPE + ", "
- + COLUMN_SQI_STRMASK + ", "
- + COLUMN_SQI_STRLENGTH + ", "
- + COLUMN_SQI_ENUMVALS
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS)
+ ") VALUES (?, ?, ?, ?, ?, ?, ?)";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_SQF_OPERATION_TO_SQF_DIRECTION =
- "UPDATE " + TABLE_SQ_FORM + " SET " + COLUMN_SQF_DIRECTION
- + "=? WHERE " + COLUMN_SQF_DIRECTION + "=?"
- + " AND " + COLUMN_SQF_CONNECTOR + " IS NOT NULL";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION)
+ + "=? WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "=?"
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + " IS NOT NULL";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_CONNECTOR =
- "UPDATE " + TABLE_SQ_FORM + " SET " + COLUMN_SQF_CONNECTOR + "= ?"
- + " WHERE " + COLUMN_SQF_CONNECTOR + " IS NULL AND "
- + COLUMN_SQF_NAME + " IN (?, ?)";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + " IS NULL AND "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + " IN (?, ?)";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_CONNECTOR_HDFS_FORM_NAME =
- "UPDATE " + TABLE_SQ_FORM + " SET " + COLUMN_SQF_NAME + "= ?"
- + " WHERE " + COLUMN_SQF_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_CONNECTOR_HDFS_FORM_DIRECTION =
- "UPDATE " + TABLE_SQ_FORM + " SET " + COLUMN_SQF_DIRECTION + "= ?"
- + " WHERE " + COLUMN_SQF_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_UPDATE_SQB_TO_CONNECTION_COPY_SQB_FROM_CONNECTION =
- "UPDATE " + TABLE_SQ_JOB + " SET "
- + COLUMN_SQB_TO_CONNECTION + "=" + COLUMN_SQB_FROM_CONNECTION
- + " WHERE " + COLUMN_SQB_TYPE + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_CONNECTION) + "=" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_CONNECTION)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TYPE) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_UPDATE_SQB_FROM_CONNECTION =
- "UPDATE " + TABLE_SQ_JOB + " SET " + COLUMN_SQB_FROM_CONNECTION + "=?"
- + " WHERE " + COLUMN_SQB_TYPE + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_CONNECTION) + "=?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TYPE) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_UPDATE_SQB_TO_CONNECTION =
- "UPDATE " + TABLE_SQ_JOB + " SET " + COLUMN_SQB_TO_CONNECTION + "=?"
- + " WHERE " + COLUMN_SQB_TYPE + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_CONNECTION) + "=?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TYPE) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_SQF_NAME =
- "UPDATE " + TABLE_SQ_FORM + " SET "
- + COLUMN_SQF_NAME + "= ?"
- + " WHERE " + COLUMN_SQF_NAME + "= ?"
- + " AND " + COLUMN_SQF_DIRECTION + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?";
// remove "input" from the prefix of the name for hdfs configs
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_TABLE_FROM_JOB_INPUT_NAMES =
- "UPDATE " + TABLE_SQ_INPUT + " SET "
- + COLUMN_SQI_NAME + "=("
- + "? || SUBSTR(" + COLUMN_SQI_NAME + ", 6) )"
- + " WHERE " + COLUMN_SQI_FORM + " IN ("
- + " SELECT " + COLUMN_SQF_ID + " FROM " + TABLE_SQ_FORM + " WHERE " + COLUMN_SQF_NAME + "= ?"
- + " AND " + COLUMN_SQF_DIRECTION + "= ?)";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "=("
+ + "? || SUBSTR(" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", 6) )"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + " IN ("
+ + " SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?)";
// remove output from the prefix of the name for hdfs configs
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_TABLE_TO_JOB_INPUT_NAMES =
- "UPDATE " + TABLE_SQ_INPUT + " SET "
- + COLUMN_SQI_NAME + "=("
- + "? || SUBSTR(" + COLUMN_SQI_NAME + ", 7) )"
- + " WHERE " + COLUMN_SQI_FORM + " IN ("
- + " SELECT " + COLUMN_SQF_ID + " FROM " + TABLE_SQ_FORM + " WHERE " + COLUMN_SQF_NAME + "= ?"
- + " AND " + COLUMN_SQF_DIRECTION + "= ?)";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "=("
+ + "? || SUBSTR(" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", 7) )"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + " IN ("
+ + " SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?)";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_DIRECTION_TO_NULL =
- "UPDATE " + TABLE_SQ_FORM + " SET "
- + COLUMN_SQF_DIRECTION + "= NULL"
- + " WHERE " + COLUMN_SQF_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= NULL"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?";
/** Intended for force driver creation and its related upgrades*/
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIG_NAME_FOR_DRIVER =
- "UPDATE " + TABLE_SQ_CONFIG + " SET "
- + COLUMN_SQ_CFG_NAME + "= ?"
- + " WHERE " + COLUMN_SQ_CFG_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIG_CONFIGURABLE_ID_FOR_DRIVER =
- "UPDATE " + TABLE_SQ_CONFIG + " SET "
- + COLUMN_SQ_CFG_CONFIGURABLE + "= ?"
- + " WHERE " + COLUMN_SQ_CFG_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIG_REMOVE_SECURITY_CONFIG_FOR_DRIVER =
- "DELETE FROM " + TABLE_SQ_CONFIG
- + " WHERE " + COLUMN_SQ_CFG_NAME + "= ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_INPUT_REMOVE_SECURITY_CONFIG_INPUT_FOR_DRIVER =
- "DELETE FROM " + TABLE_SQ_INPUT
- + " WHERE " + COLUMN_SQI_NAME + "= ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_INPUT_UPDATE_CONFIG_INPUT_FOR_DRIVER =
- "UPDATE " + TABLE_SQ_INPUT + " SET "
- + COLUMN_SQI_NAME + "= ?"
- + " WHERE " + COLUMN_SQI_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "= ?";
/**
* Intended to change SQ_JOB_INPUT.SQBI_INPUT from EXPORT
@@ -233,280 +235,280 @@ public final class DerbySchemaUpgradeQuery {
@Deprecated // only used for upgrade
public static final String QUERY_SELECT_THROTTLING_FORM_INPUT_IDS =
- "SELECT SQI." + COLUMN_SQI_ID + " FROM " + TABLE_SQ_INPUT + " SQI"
- + " INNER JOIN " + TABLE_SQ_FORM + " SQF ON SQI." + COLUMN_SQI_FORM + "=SQF." + COLUMN_SQF_ID
- + " WHERE SQF." + COLUMN_SQF_NAME + "='throttling' AND SQF." + COLUMN_SQF_DIRECTION + "=?";
+ "SELECT SQI." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SQI"
+ + " INNER JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SQF ON SQI." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + "=SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID)
+ + " WHERE SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "='throttling' AND SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "=?";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_INPUT_UPDATE_THROTTLING_FORM_INPUTS =
- "UPDATE " + TABLE_SQ_JOB_INPUT + " SQBI SET"
- + " SQBI." + COLUMN_SQBI_INPUT + "=(" + QUERY_SELECT_THROTTLING_FORM_INPUT_IDS
- + " AND SQI." + COLUMN_SQI_NAME + "=("
- + "SELECT SQI2." + COLUMN_SQI_NAME + " FROM " + TABLE_SQ_INPUT + " SQI2"
- + " WHERE SQI2." + COLUMN_SQI_ID + "=SQBI." + COLUMN_SQBI_INPUT + " FETCH FIRST 1 ROWS ONLY"
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME) + " SQBI SET"
+ + " SQBI." + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + "=(" + QUERY_SELECT_THROTTLING_FORM_INPUT_IDS
+ + " AND SQI." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + "=("
+ + "SELECT SQI2." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SQI2"
+ + " WHERE SQI2." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + "=SQBI." + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + " FETCH FIRST 1 ROWS ONLY"
+ "))"
- + "WHERE SQBI." + COLUMN_SQBI_INPUT + " IN (" + QUERY_SELECT_THROTTLING_FORM_INPUT_IDS + ")";
+ + "WHERE SQBI." + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + " IN (" + QUERY_SELECT_THROTTLING_FORM_INPUT_IDS + ")";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_REMOVE_EXTRA_FORM_INPUTS =
- "DELETE FROM " + TABLE_SQ_INPUT + " SQI"
- + " WHERE SQI." + COLUMN_SQI_FORM + " IN ("
- + "SELECT SQF." + COLUMN_SQF_ID + " FROM " + TABLE_SQ_FORM + " SQF "
- + " WHERE SQF." + COLUMN_SQF_NAME + "= ?"
- + " AND SQF." + COLUMN_SQF_DIRECTION + "= ?)";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " SQI"
+ + " WHERE SQI." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + " IN ("
+ + "SELECT SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SQF "
+ + " WHERE SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " AND SQF." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?)";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_REMOVE_EXTRA_DRIVER_FORM =
- "DELETE FROM " + TABLE_SQ_FORM
- + " WHERE " + COLUMN_SQF_NAME + "= ?"
- + " AND " + COLUMN_SQF_DIRECTION + "= ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?"
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_FORM_UPDATE_DRIVER_INDEX =
- "UPDATE " + TABLE_SQ_FORM + " SET "
- + COLUMN_SQF_INDEX + "= ?"
- + " WHERE " + COLUMN_SQF_NAME + "= ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_INDEX) + "= ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + "= ?";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_REMOVE_COLUMN_SQB_TYPE =
- "ALTER TABLE " + TABLE_SQ_JOB + " DROP COLUMN " + COLUMN_SQB_TYPE;
+ "ALTER TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " DROP COLUMN " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TYPE);
// rename upgrades as part of the refactoring SQOOP-1498
// table rename for CONNECTION-> LINK
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTION_CONSTRAINT_1 = "ALTER TABLE "
- + TABLE_SQ_CONNECTION_INPUT + " DROP CONSTRAINT " + CONSTRAINT_SQNI_SQI;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_INPUT_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQNI_SQI;
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTION_CONSTRAINT_2 = "ALTER TABLE "
- + TABLE_SQ_CONNECTION_INPUT + " DROP CONSTRAINT " + CONSTRAINT_SQNI_SQN;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_INPUT_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQNI_SQN;
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTION_CONSTRAINT_3 = "ALTER TABLE "
- + TABLE_SQ_JOB + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN_FROM;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN_FROM;
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTION_CONSTRAINT_4 = "ALTER TABLE "
- + TABLE_SQ_JOB + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN_TO;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQB_SQN_TO;
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_TO_SQ_LINK = "RENAME TABLE "
- + TABLE_SQ_CONNECTION + " TO SQ_LINK";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " TO SQ_LINK";
// column only renames for SQ_CONNECTION
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_ID + " TO " + COLUMN_SQ_LNK_ID;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_2 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_NAME + " TO " + COLUMN_SQ_LNK_NAME;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_NAME) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_3 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_CONNECTOR + " TO " + COLUMN_SQ_LNK_CONNECTOR;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CONNECTOR) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONNECTOR);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_4 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_CREATION_USER + " TO " + COLUMN_SQ_LNK_CREATION_USER;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_USER) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_5 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_CREATION_DATE + " TO " + COLUMN_SQ_LNK_CREATION_DATE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_DATE) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_6 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_UPDATE_USER + " TO " + COLUMN_SQ_LNK_UPDATE_USER;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_USER) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_7 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_UPDATE_DATE + " TO " + COLUMN_SQ_LNK_UPDATE_DATE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_DATE) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_COLUMN_8 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQN_ENABLED + " TO " + COLUMN_SQ_LNK_ENABLED;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ENABLED) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED);
// rename the constraint CONSTRAINT_SQF_SQC to CONSTRAINT_SQ_CFG_SQC
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTION_CONNECTOR_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK + " DROP CONSTRAINT " + CONSTRAINT_SQN_SQC;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQN_SQC;
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_LINK_CONNECTOR_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK + " ADD CONSTRAINT " + CONSTRAINT_SQ_LNK_SQC + " " + "FOREIGN KEY ("
- + COLUMN_SQ_LNK_CONNECTOR + ") " + "REFERENCES " + TABLE_SQ_CONNECTOR + " (" + COLUMN_SQC_ID
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQ_LNK_SQC + " " + "FOREIGN KEY ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONNECTOR) + ") " + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID)
+ ")";
// table rename for CONNECTION_INPUT -> LINK_INPUT
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_INPUT_TO_SQ_LINK_INPUT = "RENAME TABLE "
- + TABLE_SQ_CONNECTION_INPUT + " TO SQ_LINK_INPUT";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_INPUT_NAME) + " TO SQ_LINK_INPUT";
// column renames for SQ_CONNECTION_INPUT
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_INPUT_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_LINK_INPUT + "." + COLUMN_SQNI_CONNECTION + " TO " + COLUMN_SQ_LNKI_LINK;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_CONNECTION) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_INPUT_COLUMN_2 = "RENAME COLUMN "
- + TABLE_SQ_LINK_INPUT + "." + COLUMN_SQNI_INPUT + " TO " + COLUMN_SQ_LNKI_INPUT;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_INPUT) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_INPUT);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTION_INPUT_COLUMN_3 = "RENAME COLUMN "
- + TABLE_SQ_LINK_INPUT + "." + COLUMN_SQNI_VALUE + " TO " + COLUMN_SQ_LNKI_VALUE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_VALUE) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_VALUE);
// add the dropped LINK table constraint to the LINK_INPUT
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_LINK_INPUT_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK_INPUT + " ADD CONSTRAINT " + CONSTRAINT_SQ_LNKI_SQ_LNK + " "
- + "FOREIGN KEY (" + COLUMN_SQ_LNKI_LINK + ") " + "REFERENCES " + TABLE_SQ_LINK + " ("
- + COLUMN_SQ_LNK_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQ_LNKI_SQ_LNK + " "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + ") " + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")";
// table rename for FORM-> CONFIG
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_FORM_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_INPUT + " DROP CONSTRAINT " + CONSTRAINT_SQI_SQF;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQI_SQF;
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_TO_SQ_CONFIG = "RENAME TABLE "
- + TABLE_SQ_FORM + " TO SQ_CONFIG";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " TO SQ_CONFIG";
// column and constraint renames for SQ_FORM
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_ID + " TO " + COLUMN_SQ_CFG_ID;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_2 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_CONNECTOR + " TO " + COLUMN_SQ_CFG_CONNECTOR;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONNECTOR);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_3 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_DIRECTION + " TO " + COLUMN_SQ_CFG_DIRECTION;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_DIRECTION) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIRECTION);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_4 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_NAME + " TO " + COLUMN_SQ_CFG_NAME;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_5 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_TYPE + " TO " + COLUMN_SQ_CFG_TYPE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_TYPE) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_FORM_COLUMN_6 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQF_INDEX + " TO " + COLUMN_SQ_CFG_INDEX;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQF_INDEX) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_INDEX);
// rename the constraint CONSTRAINT_SQF_SQC to CONSTRAINT_SQ_CFG_SQC
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_FORM_CONNECTOR_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONFIG + " DROP CONSTRAINT " + CONSTRAINT_SQF_SQC;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQF_SQC;
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_CONFIG_CONNECTOR_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONFIG
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_CFG_SQC
+ " "
+ "FOREIGN KEY ("
- + COLUMN_SQ_CFG_CONNECTOR
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONNECTOR)
+ ") "
+ "REFERENCES "
- + TABLE_SQ_CONNECTOR
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME)
+ " ("
- + COLUMN_SQC_ID
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID)
+ ")";
// column rename and constraint add for SQ_INPUT
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_INPUT_FORM_COLUMN = "RENAME COLUMN "
- + TABLE_SQ_INPUT + "." + COLUMN_SQI_FORM + " TO " + COLUMN_SQI_CONFIG;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG);
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_INPUT_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_INPUT + " ADD CONSTRAINT " + CONSTRAINT_SQI_SQ_CFG + " " + "FOREIGN KEY ("
- + COLUMN_SQI_CONFIG + ") " + "REFERENCES " + TABLE_SQ_CONFIG + " (" + COLUMN_SQ_CFG_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQI_SQ_CFG + " " + "FOREIGN KEY ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ") " + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + ")";
// column rename and constraint add for SQ_JOB ( from and to link)
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_JOB_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_JOB + "." + COLUMN_SQB_FROM_CONNECTION + " TO " + COLUMN_SQB_FROM_LINK;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_CONNECTION) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_JOB_COLUMN_2 = "RENAME COLUMN "
- + TABLE_SQ_JOB + "." + COLUMN_SQB_TO_CONNECTION + " TO " + COLUMN_SQB_TO_LINK;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_CONNECTION) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK);
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_JOB_CONSTRAINT_FROM = "ALTER TABLE "
- + TABLE_SQ_JOB + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQ_LNK_FROM + " FOREIGN KEY ("
- + COLUMN_SQB_FROM_LINK + ") REFERENCES " + TABLE_SQ_LINK + " (" + COLUMN_SQ_LNK_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQ_LNK_FROM + " FOREIGN KEY ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + ") REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")";
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_JOB_CONSTRAINT_TO = "ALTER TABLE "
- + TABLE_SQ_JOB + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQ_LNK_TO + " FOREIGN KEY ("
- + COLUMN_SQB_TO_LINK + ") REFERENCES " + TABLE_SQ_LINK + " (" + COLUMN_SQ_LNK_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQB_SQ_LNK_TO + " FOREIGN KEY ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK) + ") REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")";
public static final String QUERY_UPGRADE_TABLE_SQ_JOB_ADD_UNIQUE_CONSTRAINT_NAME = "ALTER TABLE "
- + TABLE_SQ_JOB + " ADD CONSTRAINT " + CONSTRAINT_SQB_NAME_UNIQUE + " UNIQUE ("
- + COLUMN_SQB_NAME + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQB_NAME_UNIQUE + " UNIQUE ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + ")";
public static final String QUERY_UPGRADE_TABLE_SQ_LINK_ADD_UNIQUE_CONSTRAINT_NAME = "ALTER TABLE "
- + TABLE_SQ_LINK
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_LNK_NAME_UNIQUE
+ " UNIQUE ("
- + COLUMN_SQ_LNK_NAME + ")";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ")";
// SQOOP-1557 upgrade queries for table rename for CONNECTOR-> CONFIGURABLE
// drop the SQ_CONFIG FK for connector table
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONFIG_CONNECTOR_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONFIG + " DROP CONSTRAINT " + CONSTRAINT_SQ_CFG_SQC;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQ_CFG_SQC;
// drop the SQ_LINK FK for connector table
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_LINK_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK + " DROP CONSTRAINT " + CONSTRAINT_SQ_LNK_SQC;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQ_LNK_SQC;
// drop the SQ_CONNECTOR_DIRECTION FK for connector table
public static final String QUERY_UPGRADE_DROP_TABLE_SQ_CONNECTOR_DIRECTION_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONNECTOR_DIRECTIONS + " DROP CONSTRAINT " + CONSTRAINT_SQCD_SQC;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME) + " DROP CONSTRAINT " + CONSTRAINT_SQCD_SQC;
// rename
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONNECTOR_TO_SQ_CONFIGURABLE = "RENAME TABLE "
- + TABLE_SQ_CONNECTOR + " TO SQ_CONFIGURABLE";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " TO SQ_CONFIGURABLE";
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_CONFIG_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_CONFIG + "." + COLUMN_SQ_CFG_CONNECTOR + " TO " + COLUMN_SQ_CFG_CONFIGURABLE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONNECTOR) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE);
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_LINK_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_LINK + "." + COLUMN_SQ_LNK_CONNECTOR + " TO " + COLUMN_SQ_LNK_CONFIGURABLE;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONNECTOR) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE);
// add a type column to the configurable
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIGURABLE_ADD_COLUMN_SQC_TYPE = "ALTER TABLE "
- + TABLE_SQ_CONFIGURABLE + " ADD COLUMN " + COLUMN_SQC_TYPE + " VARCHAR(32)";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + " ADD COLUMN " + CommonRepoUtils.escapeColumnName(COLUMN_SQC_TYPE) + " VARCHAR(32)";
// add the constraints back for SQ_CONFIG
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_CONFIG_CONFIGURABLE_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONFIG
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_CFG_SQC
+ " "
+ "FOREIGN KEY ("
- + COLUMN_SQ_CFG_CONFIGURABLE
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE)
+ ") "
+ "REFERENCES "
- + TABLE_SQ_CONFIGURABLE
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ " ("
- + COLUMN_SQC_ID + ")";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")";
// add the constraints back for SQ_LINK
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_LINK_CONFIGURABLE_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_LNK_SQC
+ " "
+ "FOREIGN KEY ("
- + COLUMN_SQ_LNK_CONFIGURABLE
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE)
+ ") "
+ "REFERENCES "
- + TABLE_SQ_CONFIGURABLE
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ " ("
- + COLUMN_SQC_ID + ")";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")";
// add the constraints back for SQ_CONNECTOR_DIRECTION
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_CONNECTOR_DIRECTION_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_CONNECTOR_DIRECTIONS
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQCD_SQC
+ " "
+ "FOREIGN KEY ("
- + COLUMN_SQCD_CONNECTOR
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR)
+ ") "
+ "REFERENCES "
- + TABLE_SQ_CONFIGURABLE
- + " (" + COLUMN_SQC_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")";
// add the constraints back for SQ_CONNECTOR_DIRECTION
public static final String QUERY_UPGRADE_ADD_TABLE_SQ_CONNECTOR_DIRECTION_CONFIGURABLE_CONSTRAINT = "ALTER TABLE "
- + TABLE_SQ_LINK + " ADD CONSTRAINT " + CONSTRAINT_SQCD_SQC + " "
- + "FOREIGN KEY (" + COLUMN_SQCD_CONNECTOR + ") "
- + "REFERENCES " + TABLE_SQ_CONFIGURABLE + " (" + COLUMN_SQC_ID + ")";
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " ADD CONSTRAINT " + CONSTRAINT_SQCD_SQC + " "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")";
// upgrade for config and connector-directions
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIG_DROP_COLUMN_SQ_CFG_DIRECTION_VARCHAR = "ALTER TABLE "
- + TABLE_SQ_CONFIG + " DROP COLUMN " + COLUMN_SQ_CFG_DIRECTION;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " DROP COLUMN " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIRECTION);
// add unique constraint on the configurable table for name
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIGURABLE_ADD_UNIQUE_CONSTRAINT_NAME = "ALTER TABLE "
- + TABLE_SQ_CONFIGURABLE
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_CONFIGURABLE_UNIQUE
- + " UNIQUE (" + COLUMN_SQC_NAME + ")";
+ + " UNIQUE (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ")";
// add unique constraint on the config table for name and type and configurableId
public static final String QUERY_UPGRADE_TABLE_SQ_CONFIG_ADD_UNIQUE_CONSTRAINT_NAME_TYPE_AND_CONFIGURABLE_ID = "ALTER TABLE "
- + TABLE_SQ_CONFIG
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_CONFIG_UNIQUE
+ " UNIQUE ("
- + COLUMN_SQ_CFG_NAME + ", " + COLUMN_SQ_CFG_TYPE + ", " + COLUMN_SQ_CFG_CONFIGURABLE + ")";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + ")";
// add unique constraint on the input table for name and type and configId
public static final String QUERY_UPGRADE_TABLE_SQ_INPUT_ADD_UNIQUE_CONSTRAINT_NAME_TYPE_AND_CONFIG_ID = "ALTER TABLE "
- + TABLE_SQ_INPUT
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ " ADD CONSTRAINT "
+ CONSTRAINT_SQ_INPUT_UNIQUE
+ " UNIQUE ("
- + COLUMN_SQI_NAME + ", " + COLUMN_SQI_TYPE + ", " + COLUMN_SQI_CONFIG + ")";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ")";
// rename exception to error_summary
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_JOB_SUBMISSION_COLUMN_1 = "RENAME COLUMN "
- + TABLE_SQ_SUBMISSION + "." + COLUMN_SQS_EXCEPTION + " TO " + COLUMN_SQS_ERROR_SUMMARY;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXCEPTION) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY);
//rename exception_trace to error_details
public static final String QUERY_UPGRADE_RENAME_TABLE_SQ_JOB_SUBMISSION_COLUMN_2 = "RENAME COLUMN "
- + TABLE_SQ_SUBMISSION + "." + COLUMN_SQS_EXCEPTION_TRACE + " TO " + COLUMN_SQS_ERROR_DETAILS;
+ + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + "." + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXCEPTION_TRACE) + " TO " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS);
private DerbySchemaUpgradeQuery() {
// Disable explicit object creation
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaCreateQuery.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaCreateQuery.java b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaCreateQuery.java
index 39abb2d..be612ce 100644
--- a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaCreateQuery.java
+++ b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaCreateQuery.java
@@ -17,6 +17,8 @@
*/
package org.apache.sqoop.repository.postgresql;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
+
import static org.apache.sqoop.repository.postgresql.PostgresqlSchemaConstants.*;
/**
@@ -232,142 +234,142 @@ import static org.apache.sqoop.repository.postgresql.PostgresqlSchemaConstants.*
public class PostgresqlSchemaCreateQuery {
public static final String QUERY_CREATE_SCHEMA_SQOOP =
- "CREATE SCHEMA " + SCHEMA_SQOOP;
+ "CREATE SCHEMA " + CommonRepoUtils.escapeSchemaName(SCHEMA_SQOOP);
public static final String QUERY_CREATE_TABLE_SQ_SYSTEM =
- "CREATE TABLE " + TABLE_SQ_SYSTEM + " ("
- + COLUMN_SQM_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQM_KEY + " VARCHAR(64), "
- + COLUMN_SQM_VALUE + " VARCHAR(64) "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE) + " VARCHAR(64) "
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_DIRECTION =
- "CREATE TABLE " + TABLE_SQ_DIRECTION + " ("
- + COLUMN_SQD_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQD_NAME + " VARCHAR(64)"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME) + " VARCHAR(64)"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_CONFIGURABLE =
- "CREATE TABLE " + TABLE_SQ_CONFIGURABLE + " ("
- + COLUMN_SQC_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQC_NAME + " VARCHAR(64) UNIQUE, "
- + COLUMN_SQC_TYPE + " VARCHAR(32), "
- + COLUMN_SQC_CLASS + " VARCHAR(255), "
- + COLUMN_SQC_VERSION + " VARCHAR(64) "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + " VARCHAR(64) UNIQUE, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_TYPE) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + " VARCHAR(255), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION) + " VARCHAR(64) "
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_CONNECTOR_DIRECTIONS =
- "CREATE TABLE " + TABLE_SQ_CONNECTOR_DIRECTIONS + " ("
- + COLUMN_SQCD_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQCD_CONNECTOR + " BIGINT REFERENCES " + TABLE_SQ_CONFIGURABLE + "(" + COLUMN_SQC_ID + ")" + ", "
- + COLUMN_SQCD_DIRECTION + " BIGINT REFERENCES " + TABLE_SQ_DIRECTION + "(" + COLUMN_SQD_ID + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_DIRECTION) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + ")"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_CONFIG =
- "CREATE TABLE " + TABLE_SQ_CONFIG + " ("
- + COLUMN_SQ_CFG_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQ_CFG_CONFIGURABLE + " BIGINT REFERENCES " + TABLE_SQ_CONFIGURABLE + "(" + COLUMN_SQC_ID + ")" + ", "
- + COLUMN_SQ_CFG_NAME + " VARCHAR(64), "
- + COLUMN_SQ_CFG_TYPE + " VARCHAR(32), "
- + COLUMN_SQ_CFG_INDEX + " SMALLINT, "
- + "UNIQUE (" + COLUMN_SQ_CFG_NAME + ", " + COLUMN_SQ_CFG_TYPE + ", " + COLUMN_SQ_CFG_CONFIGURABLE + ") "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_INDEX) + " SMALLINT, "
+ + "UNIQUE (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + ") "
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_CONFIG_DIRECTIONS =
- "CREATE TABLE " + TABLE_SQ_CONFIG_DIRECTIONS + " ("
- + COLUMN_SQ_CFG_DIR_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQ_CFG_DIR_CONFIG + " BIGINT REFERENCES " + TABLE_SQ_CONFIG + "(" + COLUMN_SQ_CFG_ID + ")" + ", "
- + COLUMN_SQ_CFG_DIR_DIRECTION + " BIGINT REFERENCES " + TABLE_SQ_DIRECTION + "(" + COLUMN_SQD_ID + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_DIRECTIONS_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_DIRECTION) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + ")"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_INPUT =
- "CREATE TABLE " + TABLE_SQ_INPUT + " ("
- + COLUMN_SQI_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQI_NAME + " VARCHAR(64), "
- + COLUMN_SQI_CONFIG + " BIGINT REFERENCES " + TABLE_SQ_CONFIG + "(" + COLUMN_SQ_CFG_ID + ")" + ", "
- + COLUMN_SQI_INDEX + " SMALLINT, "
- + COLUMN_SQI_TYPE + " VARCHAR(32), "
- + COLUMN_SQI_STRMASK + " BOOLEAN, "
- + COLUMN_SQI_STRLENGTH + " SMALLINT, "
- + COLUMN_SQI_ENUMVALS + " VARCHAR(100), "
- + " UNIQUE (" + COLUMN_SQI_NAME + ", " + COLUMN_SQI_TYPE + ", " + COLUMN_SQI_CONFIG + ") "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + " SMALLINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + " BOOLEAN, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + " SMALLINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS) + " VARCHAR(100), "
+ + " UNIQUE (" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ") "
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_LINK =
- "CREATE TABLE " + TABLE_SQ_LINK + " ("
- + COLUMN_SQ_LNK_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQ_LNK_CONFIGURABLE + " BIGINT REFERENCES " + TABLE_SQ_CONFIGURABLE + "(" + COLUMN_SQC_ID + ")" + ", "
- + COLUMN_SQ_LNK_NAME + " VARCHAR(32) UNIQUE, "
- + COLUMN_SQ_LNK_CREATION_DATE + " TIMESTAMP, "
- + COLUMN_SQ_LNK_CREATION_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQ_LNK_UPDATE_DATE + " TIMESTAMP, "
- + COLUMN_SQ_LNK_UPDATE_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQ_LNK_ENABLED + " BOOLEAN DEFAULT TRUE"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + " VARCHAR(32) UNIQUE, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + " BOOLEAN DEFAULT TRUE"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_JOB =
- "CREATE TABLE " + TABLE_SQ_JOB + " ("
- + COLUMN_SQB_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQB_FROM_LINK + " BIGINT REFERENCES " + TABLE_SQ_LINK + "(" + COLUMN_SQ_LNK_ID + ")" + ", "
- + COLUMN_SQB_TO_LINK + " BIGINT REFERENCES " + TABLE_SQ_LINK + "(" + COLUMN_SQ_LNK_ID + ")" + ", "
- + COLUMN_SQB_NAME + " VARCHAR(64) UNIQUE, "
- + COLUMN_SQB_CREATION_DATE + " TIMESTAMP, "
- + COLUMN_SQB_CREATION_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQB_UPDATE_DATE + " TIMESTAMP, "
- + COLUMN_SQB_UPDATE_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQB_ENABLED + " BOOLEAN DEFAULT TRUE"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + " VARCHAR(64) UNIQUE, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ENABLED) + " BOOLEAN DEFAULT TRUE"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_LINK_INPUT =
- "CREATE TABLE " + TABLE_SQ_LINK_INPUT + " ("
- + COLUMN_SQ_LNKI_LINK + " BIGINT REFERENCES " + TABLE_SQ_LINK + "(" + COLUMN_SQ_LNK_ID + ")" + ", "
- + COLUMN_SQ_LNKI_INPUT + " BIGINT REFERENCES " + TABLE_SQ_INPUT + "(" + COLUMN_SQI_ID + ")" + ", "
- + COLUMN_SQ_LNKI_VALUE + " VARCHAR, "
- + "PRIMARY KEY (" + COLUMN_SQ_LNKI_LINK + ", " + COLUMN_SQ_LNKI_INPUT + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_INPUT) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_VALUE) + " VARCHAR, "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_INPUT) + ")"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_JOB_INPUT =
- "CREATE TABLE " + TABLE_SQ_JOB_INPUT + " ("
- + COLUMN_SQBI_JOB + " BIGINT REFERENCES " + TABLE_SQ_JOB + "(" + COLUMN_SQB_ID + ")" + ", "
- + COLUMN_SQBI_INPUT + " BIGINT REFERENCES " + TABLE_SQ_INPUT + "(" + COLUMN_SQI_ID + ")" + ", "
- + COLUMN_SQBI_VALUE + " VARCHAR(1000), "
- + "PRIMARY KEY (" + COLUMN_SQBI_JOB + ", " + COLUMN_SQBI_INPUT + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_VALUE) + " VARCHAR(1000), "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + ")"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_SUBMISSION =
- "CREATE TABLE " + TABLE_SQ_SUBMISSION + " ("
- + COLUMN_SQS_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQS_JOB + " BIGINT REFERENCES " + TABLE_SQ_JOB + "(" + COLUMN_SQB_ID + ") ON DELETE CASCADE, "
- + COLUMN_SQS_STATUS + " VARCHAR(20), "
- + COLUMN_SQS_CREATION_DATE + " TIMESTAMP, "
- + COLUMN_SQS_CREATION_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQS_UPDATE_DATE + " TIMESTAMP, "
- + COLUMN_SQS_UPDATE_USER + " VARCHAR(32) DEFAULT NULL, "
- + COLUMN_SQS_EXTERNAL_ID + " VARCHAR(50), "
- + COLUMN_SQS_EXTERNAL_LINK + " VARCHAR(150), "
- + COLUMN_SQS_ERROR_SUMMARY + " VARCHAR(150), "
- + COLUMN_SQS_ERROR_DETAILS + " VARCHAR(750)"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + ") ON DELETE CASCADE, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + " VARCHAR(20), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " TIMESTAMP, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + " VARCHAR(32) DEFAULT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + " VARCHAR(50), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + " VARCHAR(150), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + " VARCHAR(150), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS) + " VARCHAR(750)"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_COUNTER_GROUP =
- "CREATE TABLE " + TABLE_SQ_COUNTER_GROUP + " ("
- + COLUMN_SQG_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQG_NAME + " VARCHAR(75) UNIQUE"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + " VARCHAR(75) UNIQUE"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_COUNTER =
- "CREATE TABLE " + TABLE_SQ_COUNTER + " ("
- + COLUMN_SQR_ID + " BIGSERIAL PRIMARY KEY NOT NULL, "
- + COLUMN_SQR_NAME + " VARCHAR(75) UNIQUE"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + " BIGSERIAL PRIMARY KEY NOT NULL, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + " VARCHAR(75) UNIQUE"
+ ")";
public static final String QUERY_CREATE_TABLE_SQ_COUNTER_SUBMISSION =
- "CREATE TABLE " + TABLE_SQ_COUNTER_SUBMISSION + " ("
- + COLUMN_SQRS_GROUP + " BIGINT REFERENCES " + TABLE_SQ_COUNTER_GROUP + "(" + COLUMN_SQG_ID + ")" + ", "
- + COLUMN_SQRS_COUNTER + " BIGINT REFERENCES " + TABLE_SQ_COUNTER + "(" + COLUMN_SQR_ID + ")" + ", "
- + COLUMN_SQRS_SUBMISSION + " BIGINT REFERENCES " + TABLE_SQ_SUBMISSION + "(" + COLUMN_SQS_ID + ") ON DELETE CASCADE" + ", "
- + COLUMN_SQRS_VALUE + " BIGINT, "
- + "PRIMARY KEY (" + COLUMN_SQRS_GROUP + ", " + COLUMN_SQRS_COUNTER + ", " + COLUMN_SQRS_SUBMISSION + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_SUBMISSION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + ")" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + " BIGINT REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + ") ON DELETE CASCADE" + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_VALUE) + " BIGINT, "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + ")"
+ ")";
private PostgresqlSchemaCreateQuery() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaQuery.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaQuery.java b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaQuery.java
index a6319ac..3e83149 100644
--- a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaQuery.java
+++ b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlSchemaQuery.java
@@ -17,6 +17,8 @@
*/
package org.apache.sqoop.repository.postgresql;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
+
import static org.apache.sqoop.repository.postgresql.PostgresqlSchemaConstants.*;
/**
@@ -26,23 +28,23 @@ public class PostgresqlSchemaQuery {
public static final String STMT_SELECT_SYSTEM =
"SELECT "
- + COLUMN_SQM_VALUE
- + " FROM " + TABLE_SQ_SYSTEM
- + " WHERE " + COLUMN_SQM_KEY + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ?";
public static final String STMT_DELETE_SYSTEM =
- "DELETE FROM " + TABLE_SQ_SYSTEM
- + " WHERE " + COLUMN_SQM_KEY + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " = ?";
public static final String STMT_INSERT_SYSTEM =
- "INSERT INTO " + TABLE_SQ_SYSTEM + "("
- + COLUMN_SQM_KEY + ", "
- + COLUMN_SQM_VALUE + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME) + "("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE) + ") "
+ "VALUES(?, ?)";
public static final String STMT_INSERT_DIRECTION =
- "INSERT INTO " + TABLE_SQ_DIRECTION
- + " (" + COLUMN_SQD_NAME+ ") VALUES (?)";
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME)
+ + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME)+ ") VALUES (?)";
private PostgresqlSchemaQuery() {
// Disable explicit object creation
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestCase.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestCase.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestCase.java
index ae546f3..98ba7a3 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestCase.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestCase.java
@@ -53,7 +53,7 @@ abstract public class PostgresqlTestCase {
@AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
- provider.dropSchema("sqoop");
+ provider.dropSchema("SQOOP");
provider.stop();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestUtils.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestUtils.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestUtils.java
index f393521..19fd6e7 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestUtils.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/PostgresqlTestUtils.java
@@ -18,6 +18,7 @@
package org.apache.sqoop.repository.postgresql;
import org.apache.sqoop.common.test.db.DatabaseProvider;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -62,8 +63,13 @@ public class PostgresqlTestUtils {
}
public void assertUniqueConstraints(String schema, String table, String... columns) throws Exception {
- Set<String> columnSet = new TreeSet<String>(Arrays.asList(columns));
+ Set<String> columnSet = new TreeSet<String>();
Map<String, Set<String>> indexColumnMap = new HashMap<String, Set<String>>();
+
+ for (String column : columns) {
+ columnSet.add(CommonRepoUtils.escapeColumnName(column));
+ }
+
DatabaseMetaData md = provider.getConnection().getMetaData();
ResultSet rs = md.getIndexInfo(null, schema, table, true, false);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/TestStructure.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/TestStructure.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/TestStructure.java
index 6075de4..941bb69 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/TestStructure.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/repository/postgresql/TestStructure.java
@@ -26,52 +26,52 @@ public class TestStructure extends PostgresqlTestCase {
@Test
public void testTables() throws Exception {
- utils.assertTableExists("sqoop", "sq_system");
- utils.assertTableExists("sqoop", "sq_direction");
- utils.assertTableExists("sqoop", "sq_configurable");
- utils.assertTableExists("sqoop", "sq_connector_directions");
- utils.assertTableExists("sqoop", "sq_config");
- utils.assertTableExists("sqoop", "sq_connector_directions");
- utils.assertTableExists("sqoop", "sq_input");
- utils.assertTableExists("sqoop", "sq_link");
- utils.assertTableExists("sqoop", "sq_job");
- utils.assertTableExists("sqoop", "sq_link_input");
- utils.assertTableExists("sqoop", "sq_job_input");
- utils.assertTableExists("sqoop", "sq_submission");
- utils.assertTableExists("sqoop", "sq_counter_group");
- utils.assertTableExists("sqoop", "sq_counter");
- utils.assertTableExists("sqoop", "sq_counter_submission");
+ utils.assertTableExists("SQOOP", "SQ_SYSTEM");
+ utils.assertTableExists("SQOOP", "SQ_DIRECTION");
+ utils.assertTableExists("SQOOP", "SQ_CONFIGURABLE");
+ utils.assertTableExists("SQOOP", "SQ_CONNECTOR_DIRECTIONS");
+ utils.assertTableExists("SQOOP", "SQ_CONFIG");
+ utils.assertTableExists("SQOOP", "SQ_CONNECTOR_DIRECTIONS");
+ utils.assertTableExists("SQOOP", "SQ_INPUT");
+ utils.assertTableExists("SQOOP", "SQ_LINK");
+ utils.assertTableExists("SQOOP", "SQ_JOB");
+ utils.assertTableExists("SQOOP", "SQ_LINK_INPUT");
+ utils.assertTableExists("SQOOP", "SQ_JOB_INPUT");
+ utils.assertTableExists("SQOOP", "SQ_SUBMISSION");
+ utils.assertTableExists("SQOOP", "SQ_COUNTER_GROUP");
+ utils.assertTableExists("SQOOP", "SQ_COUNTER");
+ utils.assertTableExists("SQOOP", "SQ_COUNTER_SUBMISSION");
}
@Test
public void testForeignKeys() throws Exception {
- utils.assertForeignKey("sqoop", "sq_configurable", "sqc_id", "sq_connector_directions", "sqcd_connector");
- utils.assertForeignKey("sqoop", "sq_direction", "sqd_id", "sq_connector_directions", "sqcd_direction");
- utils.assertForeignKey("sqoop", "sq_configurable", "sqc_id", "sq_config", "sq_cfg_configurable");
- utils.assertForeignKey("sqoop", "sq_config", "sq_cfg_id", "sq_config_directions", "sq_cfg_dir_config");
- utils.assertForeignKey("sqoop", "sq_direction", "sqd_id", "sq_config_directions", "sq_cfg_dir_direction");
- utils.assertForeignKey("sqoop", "sq_config", "sq_cfg_id", "sq_input", "sqi_config");
- utils.assertForeignKey("sqoop", "sq_configurable", "sqc_id", "sq_link", "sq_lnk_configurable");
- utils.assertForeignKey("sqoop", "sq_link", "sq_lnk_id", "sq_job", "sqb_from_link");
- utils.assertForeignKey("sqoop", "sq_link", "sq_lnk_id", "sq_job", "sqb_to_link");
- utils.assertForeignKey("sqoop", "sq_link", "sq_lnk_id", "sq_link_input", "sq_lnki_link");
- utils.assertForeignKey("sqoop", "sq_input", "sqi_id", "sq_link_input", "sq_lnki_input");
- utils.assertForeignKey("sqoop", "sq_job", "sqb_id", "sq_job_input", "sqbi_job");
- utils.assertForeignKey("sqoop", "sq_input", "sqi_id", "sq_job_input", "sqbi_input");
- utils.assertForeignKey("sqoop", "sq_job", "sqb_id", "sq_submission", "sqs_job");
- utils.assertForeignKey("sqoop", "sq_counter", "sqr_id", "sq_counter_submission", "sqrs_counter");
- utils.assertForeignKey("sqoop", "sq_counter_group", "sqg_id", "sq_counter_submission", "sqrs_group");
- utils.assertForeignKey("sqoop", "sq_submission", "sqs_id", "sq_counter_submission", "sqrs_submission");
+ utils.assertForeignKey("SQOOP", "SQ_CONFIGURABLE", "SQC_ID", "SQ_CONNECTOR_DIRECTIONS", "SQCD_CONNECTOR");
+ utils.assertForeignKey("SQOOP", "SQ_DIRECTION", "SQD_ID", "SQ_CONNECTOR_DIRECTIONS", "SQCD_DIRECTION");
+ utils.assertForeignKey("SQOOP", "SQ_CONFIGURABLE", "SQC_ID", "SQ_CONFIG", "SQ_CFG_CONFIGURABLE");
+ utils.assertForeignKey("SQOOP", "SQ_CONFIG", "SQ_CFG_ID", "SQ_CONFIG_DIRECTIONS", "SQ_CFG_DIR_CONFIG");
+ utils.assertForeignKey("SQOOP", "SQ_DIRECTION", "SQD_ID", "SQ_CONFIG_DIRECTIONS", "SQ_CFG_DIR_DIRECTION");
+ utils.assertForeignKey("SQOOP", "SQ_CONFIG", "SQ_CFG_ID", "SQ_INPUT", "SQI_CONFIG");
+ utils.assertForeignKey("SQOOP", "SQ_CONFIGURABLE", "SQC_ID", "SQ_LINK", "SQ_LNK_CONFIGURABLE");
+ utils.assertForeignKey("SQOOP", "SQ_LINK", "SQ_LNK_ID", "SQ_JOB", "SQB_FROM_LINK");
+ utils.assertForeignKey("SQOOP", "SQ_LINK", "SQ_LNK_ID", "SQ_JOB", "SQB_TO_LINK");
+ utils.assertForeignKey("SQOOP", "SQ_LINK", "SQ_LNK_ID", "SQ_LINK_INPUT", "SQ_LNKI_LINK");
+ utils.assertForeignKey("SQOOP", "SQ_INPUT", "SQI_ID", "SQ_LINK_INPUT", "SQ_LNKI_INPUT");
+ utils.assertForeignKey("SQOOP", "SQ_JOB", "SQB_ID", "SQ_JOB_INPUT", "SQBI_JOB");
+ utils.assertForeignKey("SQOOP", "SQ_INPUT", "SQI_ID", "SQ_JOB_INPUT", "SQBI_INPUT");
+ utils.assertForeignKey("SQOOP", "SQ_JOB", "SQB_ID", "SQ_SUBMISSION", "SQS_JOB");
+ utils.assertForeignKey("SQOOP", "SQ_COUNTER", "SQR_ID", "SQ_COUNTER_SUBMISSION", "SQRS_COUNTER");
+ utils.assertForeignKey("SQOOP", "SQ_COUNTER_GROUP", "SQG_ID", "SQ_COUNTER_SUBMISSION", "SQRS_GROUP");
+ utils.assertForeignKey("SQOOP", "SQ_SUBMISSION", "SQS_ID", "SQ_COUNTER_SUBMISSION", "SQRS_SUBMISSION");
}
@Test
public void testUniqueConstraints() throws Exception {
- utils.assertUniqueConstraints("sqoop", "sq_configurable", "sqc_name");
- utils.assertUniqueConstraints("sqoop", "sq_link", "sq_lnk_name");
- utils.assertUniqueConstraints("sqoop", "sq_job", "sqb_name");
- utils.assertUniqueConstraints("sqoop", "sq_config", "sq_cfg_name", "sq_cfg_configurable", "sq_cfg_type");
- utils.assertUniqueConstraints("sqoop", "sq_input", "sqi_name", "sqi_type", "sqi_config");
- utils.assertUniqueConstraints("sqoop", "sq_counter", "sqr_name");
- utils.assertUniqueConstraints("sqoop", "sq_counter_group", "sqg_name");
+ utils.assertUniqueConstraints("SQOOP", "SQ_CONFIGURABLE", "SQC_NAME");
+ utils.assertUniqueConstraints("SQOOP", "SQ_LINK", "SQ_LNK_NAME");
+ utils.assertUniqueConstraints("SQOOP", "SQ_JOB", "SQB_NAME");
+ utils.assertUniqueConstraints("SQOOP", "SQ_CONFIG", "SQ_CFG_NAME", "SQ_CFG_CONFIGURABLE", "SQ_CFG_TYPE");
+ utils.assertUniqueConstraints("SQOOP", "SQ_INPUT", "SQI_NAME", "SQI_TYPE", "SQI_CONFIG");
+ utils.assertUniqueConstraints("SQOOP", "SQ_COUNTER", "SQR_NAME");
+ utils.assertUniqueConstraints("SQOOP", "SQ_COUNTER_GROUP", "SQG_NAME");
}
}
[2/3] sqoop git commit: SQOOP-2041: Sqoop2: Escape identifier names
Posted by gw...@apache.org.
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/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 69c55df..8626b31 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
@@ -20,540 +20,794 @@ package org.apache.sqoop.repository.common;
import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*;
public class CommonRepositoryInsertUpdateDeleteSelectQuery {
- /*******DIRECTION TABLE **************/
+ /**
+ * ****DIRECTION TABLE *************
+ */
public static final String STMT_SELECT_SQD_ID_BY_SQD_NAME =
- "SELECT " + COLUMN_SQD_ID + " FROM " + TABLE_SQ_DIRECTION
- + " WHERE " + COLUMN_SQD_NAME + "=?";
+ "SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME) + "=?";
public static final String STMT_SELECT_SQD_NAME_BY_SQD_ID =
- "SELECT " + COLUMN_SQD_NAME + " FROM " + TABLE_SQ_DIRECTION
- + " WHERE " + COLUMN_SQD_ID + "=?";
+ "SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + "=?";
- /*********CONFIGURABLE TABLE ***************/
+ /**
+ * ******CONFIGURABLE TABLE **************
+ */
//DML: Get configurable by given name
public static final String STMT_SELECT_FROM_CONFIGURABLE =
"SELECT "
- + COLUMN_SQC_ID + ", "
- + COLUMN_SQC_NAME + ", "
- + COLUMN_SQC_CLASS + ", "
- + COLUMN_SQC_VERSION
- + " FROM " + TABLE_SQ_CONFIGURABLE
- + " WHERE " + COLUMN_SQC_NAME + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + " = ?";
//DML: Get all configurables for a given type
public static final String STMT_SELECT_CONFIGURABLE_ALL_FOR_TYPE =
"SELECT "
- + COLUMN_SQC_ID + ", "
- + COLUMN_SQC_NAME + ", "
- + COLUMN_SQC_CLASS + ", "
- + COLUMN_SQC_VERSION
- + " FROM " + TABLE_SQ_CONFIGURABLE
- + " WHERE " + COLUMN_SQC_TYPE + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQC_TYPE) + " = ?";
//DML: Insert into configurable
public static final String STMT_INSERT_INTO_CONFIGURABLE =
- "INSERT INTO " + TABLE_SQ_CONFIGURABLE + " ("
- + COLUMN_SQC_NAME + ", "
- + COLUMN_SQC_CLASS + ", "
- + COLUMN_SQC_VERSION + ", "
- + COLUMN_SQC_TYPE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_TYPE)
+ ") VALUES (?, ?, ?, ?)";
//Delete all configs for a given configurable
public static final String STMT_DELETE_CONFIGS_FOR_CONFIGURABLE =
- "DELETE FROM " + TABLE_SQ_CONFIG
- + " WHERE " + COLUMN_SQ_CFG_CONFIGURABLE + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + " = ?";
//Delete all inputs for a given configurable
public static final String STMT_DELETE_INPUTS_FOR_CONFIGURABLE =
- "DELETE FROM " + TABLE_SQ_INPUT
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ " WHERE "
- + COLUMN_SQI_CONFIG
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG)
+ " IN (SELECT "
- + COLUMN_SQ_CFG_ID
- + " FROM " + TABLE_SQ_CONFIG
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ " WHERE "
- + COLUMN_SQ_CFG_CONFIGURABLE + " = ?)";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + " = ?)";
//Update the configurable
public static final String STMT_UPDATE_CONFIGURABLE =
- "UPDATE " + TABLE_SQ_CONFIGURABLE
- + " SET " + COLUMN_SQC_NAME + " = ?, "
- + COLUMN_SQC_CLASS + " = ?, "
- + COLUMN_SQC_VERSION + " = ?, "
- + COLUMN_SQC_TYPE + " = ? "
- + " WHERE " + COLUMN_SQC_ID + " = ?";
-
- /**********CONFIG TABLE **************/
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIGURABLE_NAME)
+ + " SET " + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_TYPE) + " = ? "
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + " = ?";
+
+ /**
+ * *******CONFIG TABLE *************
+ */
//DML: Get all configs for a given configurable
public static final String STMT_SELECT_CONFIG_FOR_CONFIGURABLE =
"SELECT "
- + COLUMN_SQ_CFG_ID + ", "
- + COLUMN_SQ_CFG_CONFIGURABLE + ", "
- + COLUMN_SQ_CFG_NAME + ", "
- + COLUMN_SQ_CFG_TYPE + ", "
- + COLUMN_SQ_CFG_INDEX
- + " FROM " + TABLE_SQ_CONFIG
- + " WHERE " + COLUMN_SQ_CFG_CONFIGURABLE + " = ? "
- + " ORDER BY " + COLUMN_SQ_CFG_INDEX;
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_INDEX)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + " = ? "
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_INDEX);
//DML: Insert into config
public static final String STMT_INSERT_INTO_CONFIG =
- "INSERT INTO " + TABLE_SQ_CONFIG + " ("
- + COLUMN_SQ_CFG_CONFIGURABLE + ", "
- + COLUMN_SQ_CFG_NAME + ", "
- + COLUMN_SQ_CFG_TYPE + ", "
- + COLUMN_SQ_CFG_INDEX
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_INDEX)
+ ") VALUES ( ?, ?, ?, ?)";
- /********** INPUT TABLE **************/
+ /**
+ * ******* INPUT TABLE *************
+ */
// DML: Get inputs for a given config
public static final String STMT_SELECT_INPUT =
"SELECT "
- + COLUMN_SQI_ID + ", "
- + COLUMN_SQI_NAME + ", "
- + COLUMN_SQI_CONFIG + ", "
- + COLUMN_SQI_INDEX + ", "
- + COLUMN_SQI_TYPE + ", "
- + COLUMN_SQI_STRMASK + ", "
- + COLUMN_SQI_STRLENGTH + ", "
- + COLUMN_SQI_ENUMVALS + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS) + ", "
+ "cast(null as varchar(100))"
- + " FROM " + TABLE_SQ_INPUT
- + " WHERE " + COLUMN_SQI_CONFIG + " = ?"
- + " ORDER BY " + COLUMN_SQI_INDEX;
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + " = ?"
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX);
// DML: Insert into config input
public static final String STMT_INSERT_INTO_INPUT =
- "INSERT INTO " + TABLE_SQ_INPUT + " ("
- + COLUMN_SQI_NAME + ", "
- + COLUMN_SQI_CONFIG + ", "
- + COLUMN_SQI_INDEX + ", "
- + COLUMN_SQI_TYPE + ", "
- + COLUMN_SQI_STRMASK + ", "
- + COLUMN_SQI_STRLENGTH + ", "
- + COLUMN_SQI_ENUMVALS
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS)
+ ") VALUES (?, ?, ?, ?, ?, ?, ?)";
- /**********LINK INPUT TABLE **************/
+ /**
+ * *******LINK INPUT TABLE *************
+ */
//DML: Get inputs and values for a given link
public static final String STMT_FETCH_LINK_INPUT =
"SELECT "
- + COLUMN_SQI_ID + ", "
- + COLUMN_SQI_NAME + ", "
- + COLUMN_SQI_CONFIG + ", "
- + COLUMN_SQI_INDEX + ", "
- + COLUMN_SQI_TYPE + ", "
- + COLUMN_SQI_STRMASK + ", "
- + COLUMN_SQI_STRLENGTH + ","
- + COLUMN_SQI_ENUMVALS + ", "
- + COLUMN_SQ_LNKI_VALUE
- + " FROM " + TABLE_SQ_INPUT
- + " LEFT OUTER JOIN " + TABLE_SQ_LINK_INPUT
- + " ON " + COLUMN_SQ_LNKI_INPUT + " = " + COLUMN_SQI_ID
- + " AND " + COLUMN_SQ_LNKI_LINK + " = ?"
- + " WHERE " + COLUMN_SQI_CONFIG + " = ?"
- + " AND (" + COLUMN_SQ_LNKI_LINK + " = ?" + " OR " + COLUMN_SQ_LNKI_LINK + " IS NULL)"
- + " ORDER BY " + COLUMN_SQI_INDEX;
-
- /**********JOB INPUT TABLE **************/
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + ","
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_VALUE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ + " LEFT OUTER JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME)
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_INPUT) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID)
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + " = ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + " = ?"
+ + " AND (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + " = ?" + " OR " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + " IS NULL)"
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX);
+
+ /**
+ * *******JOB INPUT TABLE *************
+ */
//DML: Fetch inputs and values for a given job
public static final String STMT_FETCH_JOB_INPUT =
"SELECT "
- + COLUMN_SQI_ID + ", "
- + COLUMN_SQI_NAME + ", "
- + COLUMN_SQI_CONFIG + ", "
- + COLUMN_SQI_INDEX + ", "
- + COLUMN_SQI_TYPE + ", "
- + COLUMN_SQI_STRMASK + ", "
- + COLUMN_SQI_STRLENGTH + ", "
- + COLUMN_SQI_ENUMVALS + ", "
- + COLUMN_SQBI_VALUE
- + " FROM " + TABLE_SQ_INPUT
- + " LEFT OUTER JOIN " + TABLE_SQ_JOB_INPUT
- + " ON " + COLUMN_SQBI_INPUT + " = " + COLUMN_SQI_ID
- + " AND " + COLUMN_SQBI_JOB + " = ?"
- + " WHERE " + COLUMN_SQI_CONFIG + " = ?"
- + " AND (" + COLUMN_SQBI_JOB + " = ? OR " + COLUMN_SQBI_JOB + " IS NULL)"
- + " ORDER BY " + COLUMN_SQI_INDEX;
-
- /**********LINK TABLE **************/
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_VALUE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME)
+ + " LEFT OUTER JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME)
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID)
+ + " AND " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " = ?"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_CONFIG) + " = ?"
+ + " AND (" + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " = ? OR " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " IS NULL)"
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX);
+
+ /**
+ * *******LINK TABLE *************
+ */
// DML: Insert new link
public static final String STMT_INSERT_LINK =
- "INSERT INTO " + TABLE_SQ_LINK + " ("
- + COLUMN_SQ_LNK_NAME + ", "
- + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + COLUMN_SQ_LNK_ENABLED + ", "
- + COLUMN_SQ_LNK_CREATION_USER + ", "
- + COLUMN_SQ_LNK_CREATION_DATE + ", "
- + COLUMN_SQ_LNK_UPDATE_USER + ", "
- + COLUMN_SQ_LNK_UPDATE_DATE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE)
+ ") VALUES (?, ?, ?, ?, ?, ?, ?)";
// DML: Insert new link inputs
public static final String STMT_INSERT_LINK_INPUT =
- "INSERT INTO " + TABLE_SQ_LINK_INPUT + " ("
- + COLUMN_SQ_LNKI_LINK + ", "
- + COLUMN_SQ_LNKI_INPUT + ", "
- + COLUMN_SQ_LNKI_VALUE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_INPUT) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_VALUE)
+ ") VALUES (?, ?, ?)";
// DML: Update link
public static final String STMT_UPDATE_LINK =
- "UPDATE " + TABLE_SQ_LINK + " SET "
- + COLUMN_SQ_LNK_NAME + " = ?, "
- + COLUMN_SQ_LNK_UPDATE_USER + " = ?, "
- + COLUMN_SQ_LNK_UPDATE_DATE + " = ? "
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE) + " = ? "
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ?";
// DML: Enable or disable link
public static final String STMT_ENABLE_LINK =
- "UPDATE " + TABLE_SQ_LINK + " SET "
- + COLUMN_SQ_LNK_ENABLED + " = ? "
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + " = ? "
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ?";
// DML: Delete rows from link input table
public static final String STMT_DELETE_LINK_INPUT =
- "DELETE FROM " + TABLE_SQ_LINK_INPUT
- + " WHERE " + COLUMN_SQ_LNKI_LINK + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_INPUT_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNKI_LINK) + " = ?";
// DML: Delete row from link table
public static final String STMT_DELETE_LINK =
- "DELETE FROM " + TABLE_SQ_LINK
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ?";
// DML: Select one specific link
public static final String STMT_SELECT_LINK_SINGLE =
"SELECT "
- + COLUMN_SQ_LNK_ID + ", "
- + COLUMN_SQ_LNK_NAME + ", "
- + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + COLUMN_SQ_LNK_ENABLED + ", "
- + COLUMN_SQ_LNK_CREATION_USER + ", "
- + COLUMN_SQ_LNK_CREATION_DATE + ", "
- + COLUMN_SQ_LNK_UPDATE_USER + ", "
- + COLUMN_SQ_LNK_UPDATE_DATE
- + " FROM " + TABLE_SQ_LINK
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ?";
// DML: Select one specific link by name
public static final String STMT_SELECT_LINK_SINGLE_BY_NAME =
"SELECT "
- + COLUMN_SQ_LNK_ID + ", "
- + COLUMN_SQ_LNK_NAME + ", "
- + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + COLUMN_SQ_LNK_ENABLED + ", "
- + COLUMN_SQ_LNK_CREATION_USER + ", "
- + COLUMN_SQ_LNK_CREATION_DATE + ", "
- + COLUMN_SQ_LNK_UPDATE_USER + ", "
- + COLUMN_SQ_LNK_UPDATE_DATE
- + " FROM " + TABLE_SQ_LINK
- + " WHERE " + COLUMN_SQ_LNK_NAME + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + " = ?";
// DML: Select all links
public static final String STMT_SELECT_LINK_ALL =
"SELECT "
- + COLUMN_SQ_LNK_ID + ", "
- + COLUMN_SQ_LNK_NAME + ", "
- + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + COLUMN_SQ_LNK_ENABLED + ", "
- + COLUMN_SQ_LNK_CREATION_USER + ", "
- + COLUMN_SQ_LNK_CREATION_DATE + ", "
- + COLUMN_SQ_LNK_UPDATE_USER + ", "
- + COLUMN_SQ_LNK_UPDATE_DATE
- + " FROM " + TABLE_SQ_LINK;
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME);
// DML: Select all links for a specific connector.
public static final String STMT_SELECT_LINK_FOR_CONNECTOR_CONFIGURABLE =
"SELECT "
- + COLUMN_SQ_LNK_ID + ", "
- + COLUMN_SQ_LNK_NAME + ", "
- + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + COLUMN_SQ_LNK_ENABLED + ", "
- + COLUMN_SQ_LNK_CREATION_USER + ", "
- + COLUMN_SQ_LNK_CREATION_DATE + ", "
- + COLUMN_SQ_LNK_UPDATE_USER + ", "
- + COLUMN_SQ_LNK_UPDATE_DATE
- + " FROM " + TABLE_SQ_LINK
- + " WHERE " + COLUMN_SQ_LNK_CONFIGURABLE + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_UPDATE_DATE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + " = ?";
// DML: Check if given link exists
public static final String STMT_SELECT_LINK_CHECK_BY_ID =
- "SELECT count(*) FROM " + TABLE_SQ_LINK
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ?";
+ "SELECT count(*) FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ?";
- /**********JOB TABLE **************/
+ /**
+ * *******JOB TABLE *************
+ */
// DML: Insert new job
public static final String STMT_INSERT_JOB =
- "INSERT INTO " + TABLE_SQ_JOB + " ("
- + COLUMN_SQB_NAME + ", "
- + COLUMN_SQB_FROM_LINK + ", "
- + COLUMN_SQB_TO_LINK + ", "
- + COLUMN_SQB_ENABLED + ", "
- + COLUMN_SQB_CREATION_USER + ", "
- + COLUMN_SQB_CREATION_DATE + ", "
- + COLUMN_SQB_UPDATE_USER + ", "
- + COLUMN_SQB_UPDATE_DATE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ENABLED) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_DATE)
+ ") VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
// DML: Insert new job inputs
public static final String STMT_INSERT_JOB_INPUT =
- "INSERT INTO " + TABLE_SQ_JOB_INPUT + " ("
- + COLUMN_SQBI_JOB + ", "
- + COLUMN_SQBI_INPUT + ", "
- + COLUMN_SQBI_VALUE
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_VALUE)
+ ") VALUES (?, ?, ?)";
public static final String STMT_UPDATE_JOB =
- "UPDATE " + TABLE_SQ_JOB + " SET "
- + COLUMN_SQB_NAME + " = ?, "
- + COLUMN_SQB_UPDATE_USER + " = ?, "
- + COLUMN_SQB_UPDATE_DATE + " = ? "
- + " WHERE " + COLUMN_SQB_ID + " = ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_USER) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_DATE) + " = ? "
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " = ?";
// DML: Enable or disable job
public static final String STMT_ENABLE_JOB =
- "UPDATE " + TABLE_SQ_JOB + " SET "
- + COLUMN_SQB_ENABLED + " = ? "
- + " WHERE " + COLUMN_SQB_ID + " = ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ENABLED) + " = ? "
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " = ?";
// DML: Delete rows from job input table
public static final String STMT_DELETE_JOB_INPUT =
- "DELETE FROM " + TABLE_SQ_JOB_INPUT
- + " WHERE " + COLUMN_SQBI_JOB + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " = ?";
// DML: Delete row from job table
public static final String STMT_DELETE_JOB =
- "DELETE FROM " + TABLE_SQ_JOB
- + " WHERE " + COLUMN_SQB_ID + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " = ?";
// DML: Check if given job exists
public static final String STMT_SELECT_JOB_CHECK_BY_ID =
- "SELECT count(*) FROM " + TABLE_SQ_JOB
- + " WHERE " + COLUMN_SQB_ID + " = ?";
+ "SELECT count(*) FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " = ?";
// DML: Check if there are jobs for given link
public static final String STMT_SELECT_JOBS_FOR_LINK_CHECK =
"SELECT"
+ " count(*)"
- + " FROM " + TABLE_SQ_JOB
- + " JOIN " + TABLE_SQ_LINK
- + " ON " + COLUMN_SQB_FROM_LINK + " = " + COLUMN_SQ_LNK_ID
- + " WHERE " + COLUMN_SQ_LNK_ID + " = ? ";
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME)
+ + " JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME)
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID) + " = ? ";
//DML: Select all jobs
public static final String STMT_SELECT_JOB_ALL =
"SELECT "
- + "FROM_CONNECTOR." + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + "TO_CONNECTOR." + COLUMN_SQ_LNK_CONFIGURABLE + ", "
- + "JOB." + COLUMN_SQB_ID + ", "
- + "JOB." + COLUMN_SQB_NAME + ", "
- + "JOB." + COLUMN_SQB_FROM_LINK + ", "
- + "JOB." + COLUMN_SQB_TO_LINK + ", "
- + "JOB." + COLUMN_SQB_ENABLED + ", "
- + "JOB." + COLUMN_SQB_CREATION_USER + ", "
- + "JOB." + COLUMN_SQB_CREATION_DATE + ", "
- + "JOB." + COLUMN_SQB_UPDATE_USER + ", "
- + "JOB." + COLUMN_SQB_UPDATE_DATE
- + " FROM " + TABLE_SQ_JOB + " JOB"
- + " LEFT JOIN " + TABLE_SQ_LINK + " FROM_CONNECTOR"
- + " ON " + COLUMN_SQB_FROM_LINK + " = FROM_CONNECTOR." + COLUMN_SQ_LNK_ID
- + " LEFT JOIN " + TABLE_SQ_LINK + " TO_CONNECTOR"
- + " ON " + COLUMN_SQB_TO_LINK + " = TO_CONNECTOR." + COLUMN_SQ_LNK_ID;
+ + "FROM_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + "TO_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ENABLED) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_USER) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_DATE) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_USER) + ", "
+ + "JOB." + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_DATE)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " JOB"
+ + " LEFT JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " FROM_CONNECTOR"
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_FROM_LINK) + " = FROM_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID)
+ + " LEFT JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_LINK_NAME) + " TO_CONNECTOR"
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TO_LINK) + " = TO_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_ID);
// DML: Select one specific job
public static final String STMT_SELECT_JOB_SINGLE_BY_ID =
STMT_SELECT_JOB_ALL +
- " WHERE " + COLUMN_SQB_ID + " = ?";
+ " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " = ?";
// DML: Select one specific job
public static final String STMT_SELECT_JOB_SINGLE_BY_NAME =
STMT_SELECT_JOB_ALL +
- " WHERE " + COLUMN_SQB_NAME + " = ?";
+ " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + " = ?";
// DML: Select all jobs for a Connector
public static final String STMT_SELECT_ALL_JOBS_FOR_CONNECTOR_CONFIGURABLE =
STMT_SELECT_JOB_ALL +
- " WHERE FROM_CONNECTOR." + COLUMN_SQ_LNK_CONFIGURABLE + " = ?" +
- " OR TO_CONNECTOR." + COLUMN_SQ_LNK_CONFIGURABLE + " = ?";
+ " WHERE FROM_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + " = ?" +
+ " OR TO_CONNECTOR." + CommonRepoUtils.escapeColumnName(COLUMN_SQ_LNK_CONFIGURABLE) + " = ?";
- /**********SUBMISSION TABLE **************/
+ /**
+ * *******SUBMISSION TABLE *************
+ */
// DML: Insert new submission
public static final String STMT_INSERT_SUBMISSION =
- "INSERT INTO " + TABLE_SQ_SUBMISSION + "("
- + COLUMN_SQS_JOB + ", "
- + COLUMN_SQS_STATUS + ", "
- + COLUMN_SQS_CREATION_USER + ", "
- + COLUMN_SQS_CREATION_DATE + ", "
- + COLUMN_SQS_UPDATE_USER + ", "
- + COLUMN_SQS_UPDATE_DATE + ", "
- + COLUMN_SQS_EXTERNAL_ID + ", "
- + COLUMN_SQS_EXTERNAL_LINK + ", "
- + COLUMN_SQS_ERROR_SUMMARY + ", "
- + COLUMN_SQS_ERROR_DETAILS + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + "("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS) + ") "
+ " VALUES(?, ?, ?, ?, ?, ?, ?, substr(?, 1, 150) , substr(?, 1, 150), substr(?, 1, 750))";
// DML: Update existing submission
public static final String STMT_UPDATE_SUBMISSION =
- "UPDATE " + TABLE_SQ_SUBMISSION + " SET "
- + COLUMN_SQS_STATUS + " = ?, "
- + COLUMN_SQS_UPDATE_USER + " = ?, "
- + COLUMN_SQS_UPDATE_DATE + " = ?, "
- + COLUMN_SQS_ERROR_SUMMARY+ " = substr(?, 1, 150), "
- + COLUMN_SQS_ERROR_DETAILS + " = substr(?, 1, 750)"
- + " WHERE " + COLUMN_SQS_ID + " = ?";
+ "UPDATE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " SET "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " = ?, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + " = substr(?, 1, 150), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS) + " = substr(?, 1, 750)"
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + " = ?";
// DML: Check if given submission exists
public static final String STMT_SELECT_SUBMISSION_CHECK =
"SELECT"
+ " count(*)"
- + " FROM " + TABLE_SQ_SUBMISSION
- + " WHERE " + COLUMN_SQS_ID + " = ?";
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + " = ?";
// DML: Purge old entries
public static final String STMT_PURGE_SUBMISSIONS =
- "DELETE FROM " + TABLE_SQ_SUBMISSION
- + " WHERE " + COLUMN_SQS_UPDATE_DATE + " < ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " < ?";
// DML: Get unfinished
public static final String STMT_SELECT_SUBMISSION_UNFINISHED =
"SELECT "
- + COLUMN_SQS_ID + ", "
- + COLUMN_SQS_JOB + ", "
- + COLUMN_SQS_STATUS + ", "
- + COLUMN_SQS_CREATION_USER + ", "
- + COLUMN_SQS_CREATION_DATE + ", "
- + COLUMN_SQS_UPDATE_USER + ", "
- + COLUMN_SQS_UPDATE_DATE + ", "
- + COLUMN_SQS_EXTERNAL_ID + ", "
- + COLUMN_SQS_EXTERNAL_LINK + ", "
- + COLUMN_SQS_ERROR_SUMMARY + ", "
- + COLUMN_SQS_ERROR_DETAILS
- + " FROM " + TABLE_SQ_SUBMISSION
- + " WHERE " + COLUMN_SQS_STATUS + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + " = ?";
// DML : Get all submissions
public static final String STMT_SELECT_SUBMISSIONS =
"SELECT "
- + COLUMN_SQS_ID + ", "
- + COLUMN_SQS_JOB + ", "
- + COLUMN_SQS_STATUS + ", "
- + COLUMN_SQS_CREATION_USER + ", "
- + COLUMN_SQS_CREATION_DATE + ", "
- + COLUMN_SQS_UPDATE_USER + ", "
- + COLUMN_SQS_UPDATE_DATE + ", "
- + COLUMN_SQS_EXTERNAL_ID + ", "
- + COLUMN_SQS_EXTERNAL_LINK + ", "
- + COLUMN_SQS_ERROR_SUMMARY + ", "
- + COLUMN_SQS_ERROR_DETAILS
- + " FROM " + TABLE_SQ_SUBMISSION
- + " ORDER BY " + COLUMN_SQS_UPDATE_DATE + " DESC";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME)
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " DESC";
// DML: Get submissions for a job
public static final String STMT_SELECT_SUBMISSIONS_FOR_JOB =
"SELECT "
- + COLUMN_SQS_ID + ", "
- + COLUMN_SQS_JOB + ", "
- + COLUMN_SQS_STATUS + ", "
- + COLUMN_SQS_CREATION_USER + ", "
- + COLUMN_SQS_CREATION_DATE + ", "
- + COLUMN_SQS_UPDATE_USER + ", "
- + COLUMN_SQS_UPDATE_DATE + ", "
- + COLUMN_SQS_EXTERNAL_ID + ", "
- + COLUMN_SQS_EXTERNAL_LINK + ", "
- + COLUMN_SQS_ERROR_SUMMARY + ", "
- + COLUMN_SQS_ERROR_DETAILS
- + " FROM " + TABLE_SQ_SUBMISSION
- + " WHERE " + COLUMN_SQS_JOB + " = ?"
- + " ORDER BY " + COLUMN_SQS_UPDATE_DATE + " DESC";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_USER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_SUMMARY) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ERROR_DETAILS)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + " = ?"
+ + " ORDER BY " + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " DESC";
// DML: Select counter group
public static final String STMT_SELECT_COUNTER_GROUP =
"SELECT "
- + COLUMN_SQG_ID + ", "
- + COLUMN_SQG_NAME + " "
- + "FROM " + TABLE_SQ_COUNTER_GROUP + " "
- + "WHERE " + COLUMN_SQG_NAME + " = substr(?, 1, 75)";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + " "
+ + "FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + " "
+ + "WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + " = substr(?, 1, 75)";
// DML: Insert new counter group
public static final String STMT_INSERT_COUNTER_GROUP =
- "INSERT INTO " + TABLE_SQ_COUNTER_GROUP + " ("
- + COLUMN_SQG_NAME + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + ") "
+ "VALUES (substr(?, 1, 75))";
// DML: Select counter
public static final String STMT_SELECT_COUNTER =
"SELECT "
- + COLUMN_SQR_ID + ", "
- + COLUMN_SQR_NAME + " "
- + "FROM " + TABLE_SQ_COUNTER + " "
- + "WHERE " + COLUMN_SQR_NAME + " = substr(?, 1, 75)";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + " "
+ + "FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + " "
+ + "WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + " = substr(?, 1, 75)";
// DML: Insert new counter
public static final String STMT_INSERT_COUNTER =
- "INSERT INTO " + TABLE_SQ_COUNTER + " ("
- + COLUMN_SQR_NAME + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + ") "
+ "VALUES (substr(?, 1, 75))";
// DML: Insert new counter submission
public static final String STMT_INSERT_COUNTER_SUBMISSION =
- "INSERT INTO " + TABLE_SQ_COUNTER_SUBMISSION + " ("
- + COLUMN_SQRS_GROUP + ", "
- + COLUMN_SQRS_COUNTER + ", "
- + COLUMN_SQRS_SUBMISSION + ", "
- + COLUMN_SQRS_VALUE + ") "
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_SUBMISSION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_VALUE) + ") "
+ "VALUES (?, ?, ?, ?)";
// DML: Select counter submission
public static final String STMT_SELECT_COUNTER_SUBMISSION =
"SELECT "
- + COLUMN_SQG_NAME + ", "
- + COLUMN_SQR_NAME + ", "
- + COLUMN_SQRS_VALUE + " "
- + "FROM " + TABLE_SQ_COUNTER_SUBMISSION + " "
- + "LEFT JOIN " + TABLE_SQ_COUNTER_GROUP
- + " ON " + COLUMN_SQRS_GROUP + " = " + COLUMN_SQG_ID + " "
- + "LEFT JOIN " + TABLE_SQ_COUNTER
- + " ON " + COLUMN_SQRS_COUNTER + " = " + COLUMN_SQR_ID + " "
- + "WHERE " + COLUMN_SQRS_SUBMISSION + " = ? ";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + ", "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_VALUE) + " "
+ + "FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_SUBMISSION_NAME) + " "
+ + "LEFT JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME)
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + " "
+ + "LEFT JOIN " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME)
+ + " ON " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + " = " + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + " "
+ + "WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + " = ? ";
// DML: Delete rows from counter submission table
public static final String STMT_DELETE_COUNTER_SUBMISSION =
- "DELETE FROM " + TABLE_SQ_COUNTER_SUBMISSION
- + " WHERE " + COLUMN_SQRS_SUBMISSION + " = ?";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_SUBMISSION_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + " = ?";
- /******* CONFIG and CONNECTOR DIRECTIONS ****/
+ /**
+ * **** CONFIG and CONNECTOR DIRECTIONS ***
+ */
public static final String STMT_INSERT_SQ_CONNECTOR_DIRECTIONS =
- "INSERT INTO " + TABLE_SQ_CONNECTOR_DIRECTIONS + " "
- + "(" + COLUMN_SQCD_CONNECTOR + ", " + COLUMN_SQCD_DIRECTION + ")"
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME) + " "
+ + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_DIRECTION) + ")"
+ " VALUES (?, ?)";
public static final String STMT_INSERT_SQ_CONFIG_DIRECTIONS =
- "INSERT INTO " + TABLE_SQ_CONFIG_DIRECTIONS + " "
- + "(" + COLUMN_SQ_CFG_DIR_CONFIG + ", " + COLUMN_SQ_CFG_DIR_DIRECTION + ")"
+ "INSERT INTO " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_DIRECTIONS_NAME) + " "
+ + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_DIRECTION) + ")"
+ " VALUES (?, ?)";
public static final String STMT_SELECT_SQ_CONNECTOR_DIRECTIONS_ALL =
- "SELECT " + COLUMN_SQCD_CONNECTOR + ", " + COLUMN_SQCD_DIRECTION
- + " FROM " + TABLE_SQ_CONNECTOR_DIRECTIONS;
+ "SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_DIRECTION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME);
public static final String STMT_SELECT_SQ_CONNECTOR_DIRECTIONS =
STMT_SELECT_SQ_CONNECTOR_DIRECTIONS_ALL + " WHERE "
- + COLUMN_SQCD_CONNECTOR + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + " = ?";
public static final String STMT_SELECT_SQ_CONFIG_DIRECTIONS_ALL =
- "SELECT " + COLUMN_SQ_CFG_DIR_CONFIG + ", " + COLUMN_SQ_CFG_DIR_DIRECTION
- + " FROM " + TABLE_SQ_CONFIG_DIRECTIONS;
+ "SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_DIRECTION)
+ + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_DIRECTIONS_NAME);
public static final String STMT_SELECT_SQ_CONFIG_DIRECTIONS =
STMT_SELECT_SQ_CONFIG_DIRECTIONS_ALL + " WHERE "
- + COLUMN_SQ_CFG_DIR_CONFIG + " = ?";
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + " = ?";
// Delete the config directions for a connector
public static final String STMT_DELETE_DIRECTIONS_FOR_CONFIGURABLE =
- "DELETE FROM " + TABLE_SQ_CONFIG_DIRECTIONS
- + " WHERE " + COLUMN_SQ_CFG_DIR_CONFIG
- + " IN (SELECT " + COLUMN_SQ_CFG_ID + " FROM " + TABLE_SQ_CONFIG
- + " WHERE " + COLUMN_SQ_CFG_CONFIGURABLE + " = ?)";
+ "DELETE FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_DIRECTIONS_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG)
+ + " IN (SELECT " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + " FROM " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME)
+ + " WHERE " + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_CONFIGURABLE) + " = ?)";
+
+ public String getStmtSelectSqdIdBySqdName() {
+ return STMT_SELECT_SQD_ID_BY_SQD_NAME;
+ }
+
+ public String getStmtSelectSqConfigDirections() {
+ return STMT_SELECT_SQ_CONFIG_DIRECTIONS;
+ }
+
+ public String getStmtDeleteInputsForConfigurable() {
+ return STMT_DELETE_INPUTS_FOR_CONFIGURABLE;
+ }
+
+ public String getStmtUpdateConfigurable() {
+ return STMT_UPDATE_CONFIGURABLE;
+ }
+
+ public String getStmtSelectConfigForConfigurable() {
+ return STMT_SELECT_CONFIG_FOR_CONFIGURABLE;
+ }
+
+ public String getStmtInsertIntoConfig() {
+ return STMT_INSERT_INTO_CONFIG;
+ }
+
+ public String getStmtSelectInput() {
+ return STMT_SELECT_INPUT;
+ }
+
+ public String getStmtInsertIntoInput() {
+ return STMT_INSERT_INTO_INPUT;
+ }
+
+ public String getStmtFetchLinkInput() {
+ return STMT_FETCH_LINK_INPUT;
+ }
+
+ public String getStmtFetchJobInput() {
+ return STMT_FETCH_JOB_INPUT;
+ }
+
+ public String getStmtInsertLink() {
+ return STMT_INSERT_LINK;
+ }
+
+ public String getStmtInsertLinkInput() {
+ return STMT_INSERT_LINK_INPUT;
+ }
+
+ public String getStmtUpdateLink() {
+ return STMT_UPDATE_LINK;
+ }
+
+ public String getStmtEnableLink() {
+ return STMT_ENABLE_LINK;
+ }
+
+ public String getStmtDeleteLinkInput() {
+ return STMT_DELETE_LINK_INPUT;
+ }
+
+ public String getStmtDeleteLink() {
+ return STMT_DELETE_LINK;
+ }
+
+ public String getStmtSelectLinkSingle() {
+ return STMT_SELECT_LINK_SINGLE;
+ }
+
+ public String getStmtSelectLinkSingleByName() {
+ return STMT_SELECT_LINK_SINGLE_BY_NAME;
+ }
+
+ public String getStmtSelectLinkAll() {
+ return STMT_SELECT_LINK_ALL;
+ }
+
+ public String getStmtSelectLinkForConnectorConfigurable() {
+ return STMT_SELECT_LINK_FOR_CONNECTOR_CONFIGURABLE;
+ }
+
+ public String getStmtSelectLinkCheckById() {
+ return STMT_SELECT_LINK_CHECK_BY_ID;
+ }
+
+ public String getStmtInsertJob() {
+ return STMT_INSERT_JOB;
+ }
+
+ public String getStmtInsertJobInput() {
+ return STMT_INSERT_JOB_INPUT;
+ }
+
+ public String getStmtUpdateJob() {
+ return STMT_UPDATE_JOB;
+ }
+
+ public String getStmtEnableJob() {
+ return STMT_ENABLE_JOB;
+ }
+
+ public String getStmtDeleteJobInput() {
+ return STMT_DELETE_JOB_INPUT;
+ }
+
+ public String getStmtDeleteJob() {
+ return STMT_DELETE_JOB;
+ }
+
+ public String getStmtSelectJobCheckById() {
+ return STMT_SELECT_JOB_CHECK_BY_ID;
+ }
+
+ public String getStmtSelectJobsForLinkCheck() {
+ return STMT_SELECT_JOBS_FOR_LINK_CHECK;
+ }
+
+ public String getStmtSelectJobAll() {
+ return STMT_SELECT_JOB_ALL;
+ }
+
+ public String getStmtSelectJobSingleById() {
+ return STMT_SELECT_JOB_SINGLE_BY_ID;
+ }
+
+ public String getStmtSelectJobSingleByName() {
+ return STMT_SELECT_JOB_SINGLE_BY_NAME;
+ }
+
+ public String getStmtSelectAllJobsForConnectorConfigurable() {
+ return STMT_SELECT_ALL_JOBS_FOR_CONNECTOR_CONFIGURABLE;
+ }
+
+ public String getStmtInsertSubmission() {
+ return STMT_INSERT_SUBMISSION;
+ }
+
+ public String getStmtUpdateSubmission() {
+ return STMT_UPDATE_SUBMISSION;
+ }
+
+ public String getStmtSelectSubmissionCheck() {
+ return STMT_SELECT_SUBMISSION_CHECK;
+ }
+
+ public String getStmtPurgeSubmissions() {
+ return STMT_PURGE_SUBMISSIONS;
+ }
+
+ public String getStmtSelectSubmissionUnfinished() {
+ return STMT_SELECT_SUBMISSION_UNFINISHED;
+ }
+
+ public String getStmtSelectSubmissions() {
+ return STMT_SELECT_SUBMISSIONS;
+ }
+
+ public String getStmtSelectSubmissionsForJob() {
+ return STMT_SELECT_SUBMISSIONS_FOR_JOB;
+ }
+
+ public String getStmtSelectCounterGroup() {
+ return STMT_SELECT_COUNTER_GROUP;
+ }
+
+ public String getStmtInsertCounterGroup() {
+ return STMT_INSERT_COUNTER_GROUP;
+ }
+
+ public String getStmtSelectCounter() {
+ return STMT_SELECT_COUNTER;
+ }
+
+ public String getStmtInsertCounter() {
+ return STMT_INSERT_COUNTER;
+ }
+
+ public String getStmtInsertCounterSubmission() {
+ return STMT_INSERT_COUNTER_SUBMISSION;
+ }
+
+ public String getStmtSelectCounterSubmission() {
+ return STMT_SELECT_COUNTER_SUBMISSION;
+ }
+
+ public String getStmtDeleteCounterSubmission() {
+ return STMT_DELETE_COUNTER_SUBMISSION;
+ }
+
+ public String getStmtInsertSqConnectorDirections() {
+ return STMT_INSERT_SQ_CONNECTOR_DIRECTIONS;
+ }
+
+ public String getStmtInsertSqConfigDirections() {
+ return STMT_INSERT_SQ_CONFIG_DIRECTIONS;
+ }
+
+ public String getStmtSelectSqConnectorDirectionsAll() {
+ return STMT_SELECT_SQ_CONNECTOR_DIRECTIONS_ALL;
+ }
+
+ public String getStmtSelectSqConnectorDirections() {
+ return STMT_SELECT_SQ_CONNECTOR_DIRECTIONS;
+ }
+
+ public String getStmtSelectSqConfigDirectionsAll() {
+ return STMT_SELECT_SQ_CONFIG_DIRECTIONS_ALL;
+ }
+
+ public String getStmtSelectSqdNameBySqdId() {
+ return STMT_SELECT_SQD_NAME_BY_SQD_ID;
+ }
+
+ public String getStmtSelectFromConfigurable() {
+ return STMT_SELECT_FROM_CONFIGURABLE;
+ }
+
+ public String getStmtSelectConfigurableAllForType() {
+ return STMT_SELECT_CONFIGURABLE_ALL_FOR_TYPE;
+ }
+
+ public String getStmtInsertIntoConfigurable() {
+ return STMT_INSERT_INTO_CONFIGURABLE;
+ }
+
+ public String getStmtDeleteConfigsForConfigurable() {
+ return STMT_DELETE_CONFIGS_FOR_CONFIGURABLE;
+ }
+
+ public String getStmtDeleteDirectionsForConfigurable() {
+ return STMT_DELETE_DIRECTIONS_FOR_CONFIGURABLE;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-common/src/test/java/org/apache/sqoop/repository/common/TestCommonRepoUtils.java
----------------------------------------------------------------------
diff --git a/repository/repository-common/src/test/java/org/apache/sqoop/repository/common/TestCommonRepoUtils.java b/repository/repository-common/src/test/java/org/apache/sqoop/repository/common/TestCommonRepoUtils.java
new file mode 100644
index 0000000..e338478
--- /dev/null
+++ b/repository/repository-common/src/test/java/org/apache/sqoop/repository/common/TestCommonRepoUtils.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sqoop.repository.common;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+public class TestCommonRepoUtils {
+
+ @Test
+ public void testQuoting() throws Exception {
+ String schemaName = "SCHEMA";
+ String tableName = "TABLE";
+ String columnName = "COLUMN";
+ assertEquals("\"SCHEMA\"", CommonRepoUtils.escapeSchemaName(schemaName));
+ assertEquals("\"TABLE\"", CommonRepoUtils.escapeTableName(tableName));
+ assertEquals("\"COLUMN\"", CommonRepoUtils.escapeColumnName(columnName));
+ assertEquals("\"SCHEMA\".\"TABLE\"", CommonRepoUtils.getTableName(schemaName, tableName));
+ assertEquals("\"TABLE\"", CommonRepoUtils.getTableName(null, tableName));
+ assertEquals("\"TABLE\".\"COLUMN\"", CommonRepoUtils.getColumnName(tableName, columnName));
+ assertEquals("\"COLUMN\"", CommonRepoUtils.escapeColumnName(columnName));
+ }
+}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-common/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/repository/repository-common/src/test/resources/log4j.properties b/repository/repository-common/src/test/resources/log4j.properties
new file mode 100644
index 0000000..44ffced
--- /dev/null
+++ b/repository/repository-common/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=DEBUG, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
index 6d35143..3bef3c5 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
@@ -290,8 +290,7 @@ public class DerbyRepositoryHandler extends CommonRepositoryHandler {
}
if (repositoryVersion < 5) {
- runQuery(QUERY_UPGRADE_TABLE_SQ_CONFIG_ADD_UNIQUE_CONSTRAINT_NAME_TYPE_AND_CONFIGURABLE_ID,
- conn);
+ runQuery(QUERY_UPGRADE_TABLE_SQ_CONFIG_ADD_UNIQUE_CONSTRAINT_NAME_TYPE_AND_CONFIGURABLE_ID, conn);
runQuery(QUERY_UPGRADE_TABLE_SQ_INPUT_ADD_UNIQUE_CONSTRAINT_NAME_TYPE_AND_CONFIG_ID, conn);
// table column rename
runQuery(QUERY_UPGRADE_RENAME_TABLE_SQ_JOB_SUBMISSION_COLUMN_1, conn);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java
index 4a7afcf..ad80797 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaCreateQuery.java
@@ -18,6 +18,8 @@
package org.apache.sqoop.repository.derby;
+import org.apache.sqoop.repository.common.CommonRepoUtils;
+
import static org.apache.sqoop.repository.common.CommonRepositorySchemaConstants.*;
import static org.apache.sqoop.repository.derby.DerbySchemaConstants.*;
@@ -275,7 +277,7 @@ public final class DerbySchemaCreateQuery {
/**************************** DERBY CREATE SCHEMA queries ********************************/
// DDL: Create schema
public static final String QUERY_CREATE_SCHEMA_SQOOP =
- "CREATE SCHEMA " + SCHEMA_SQOOP;
+ "CREATE SCHEMA " + CommonRepoUtils.escapeSchemaName(SCHEMA_SQOOP);
public static final String QUERY_SYSSCHEMA_SQOOP =
"SELECT SCHEMAID FROM SYS.SYSSCHEMAS WHERE SCHEMANAME = '"
@@ -283,200 +285,200 @@ public final class DerbySchemaCreateQuery {
// DDL: Create table SQ_SYSTEM
public static final String QUERY_CREATE_TABLE_SQ_SYSTEM =
- "CREATE TABLE " + TABLE_SQ_SYSTEM + " ("
- + COLUMN_SQM_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQM_KEY + " VARCHAR(64), "
- + COLUMN_SQM_VALUE + " VARCHAR(64) "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SYSTEM_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_KEY) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQM_VALUE) + " VARCHAR(64) "
+ ")";
// DDL: Create table SQ_DIRECTION
public static final String QUERY_CREATE_TABLE_SQ_DIRECTION =
- "CREATE TABLE " + TABLE_SQ_DIRECTION + " ("
- + COLUMN_SQD_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQD_NAME + " VARCHAR(64)"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQD_NAME) + " VARCHAR(64)"
+ ")";
// DDL: Create table SQ_CONNECTOR
@Deprecated // used only for upgrade
public static final String QUERY_CREATE_TABLE_SQ_CONNECTOR =
- "CREATE TABLE " + TABLE_SQ_CONNECTOR + " ("
- + COLUMN_SQC_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQC_NAME + " VARCHAR(64), "
- + COLUMN_SQC_CLASS + " VARCHAR(255), "
- + COLUMN_SQC_VERSION + " VARCHAR(64) "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_CLASS) + " VARCHAR(255), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQC_VERSION) + " VARCHAR(64) "
+ ")";
// DDL: Create table SQ_CONNECTOR_DIRECTIONS
public static final String QUERY_CREATE_TABLE_SQ_CONNECTOR_DIRECTIONS =
- "CREATE TABLE " + TABLE_SQ_CONNECTOR_DIRECTIONS + " ("
- + COLUMN_SQCD_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQCD_CONNECTOR + " BIGINT, "
- + COLUMN_SQCD_DIRECTION + " BIGINT, "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_DIRECTIONS_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_DIRECTION) + " BIGINT, "
+ "CONSTRAINT " + CONSTRAINT_SQCD_SQC + " "
- + "FOREIGN KEY (" + COLUMN_SQCD_CONNECTOR + ") "
- + "REFERENCES " + TABLE_SQ_CONNECTOR + " (" + COLUMN_SQC_ID + "), "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_CONNECTOR) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQCD_SQD + " "
- + "FOREIGN KEY (" + COLUMN_SQCD_DIRECTION + ") "
- + "REFERENCES " + TABLE_SQ_DIRECTION + " (" + COLUMN_SQD_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQCD_DIRECTION) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + ")"
+ ")";
// DDL: Create table SQ_FORM
public static final String QUERY_CREATE_TABLE_SQ_FORM =
- "CREATE TABLE " + TABLE_SQ_FORM + " ("
- + COLUMN_SQF_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQF_CONNECTOR + " BIGINT, "
- + COLUMN_SQF_OPERATION + " VARCHAR(32), "
- + COLUMN_SQF_NAME + " VARCHAR(64), "
- + COLUMN_SQF_TYPE + " VARCHAR(32), "
- + COLUMN_SQF_INDEX + " SMALLINT, "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_OPERATION) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_TYPE) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQF_INDEX) + " SMALLINT, "
+ "CONSTRAINT " + CONSTRAINT_SQF_SQC + " "
- + "FOREIGN KEY (" + COLUMN_SQF_CONNECTOR + ") "
- + "REFERENCES " + TABLE_SQ_CONNECTOR + " (" + COLUMN_SQC_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQF_CONNECTOR) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")"
+ ")";
// DDL: Create table SQ_CONFIG_DIRECTIONS ( same as SQ_FORM_DIRECTIONS)
// Note: that the form was renamed to config at one point and this code was added after the rename
// DDL: Create table SQ_CONFIG_DIRECTIONS
public static final String QUERY_CREATE_TABLE_SQ_CONFIG_DIRECTIONS =
- "CREATE TABLE " + TABLE_SQ_CONFIG_DIRECTIONS + " ("
- + COLUMN_SQ_CFG_DIR_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQ_CFG_DIR_CONFIG + " BIGINT, "
- + COLUMN_SQ_CFG_DIR_DIRECTION + " BIGINT, "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_DIRECTIONS_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_DIRECTION) + " BIGINT, "
+ "CONSTRAINT " + CONSTRAINT_SQ_CFG_DIR_CONFIG + " "
- + "FOREIGN KEY (" + COLUMN_SQ_CFG_DIR_CONFIG + ") "
- + "REFERENCES " + TABLE_SQ_CONFIG + " (" + COLUMN_SQ_CFG_ID + "), "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_CONFIG) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONFIG_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_ID) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQ_CFG_DIR_DIRECTION + " "
- + "FOREIGN KEY (" + COLUMN_SQ_CFG_DIR_DIRECTION + ") "
- + "REFERENCES " + TABLE_SQ_DIRECTION + " (" + COLUMN_SQD_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQ_CFG_DIR_DIRECTION) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_DIRECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQD_ID) + ")"
+ ")";
// DDL: Create table SQ_INPUT
public static final String QUERY_CREATE_TABLE_SQ_INPUT =
- "CREATE TABLE " + TABLE_SQ_INPUT + " ("
- + COLUMN_SQI_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQI_NAME + " VARCHAR(64), "
- + COLUMN_SQI_FORM + " BIGINT, "
- + COLUMN_SQI_INDEX + " SMALLINT, "
- + COLUMN_SQI_TYPE + " VARCHAR(32), "
- + COLUMN_SQI_STRMASK + " BOOLEAN, "
- + COLUMN_SQI_STRLENGTH + " SMALLINT, "
- + COLUMN_SQI_ENUMVALS + " VARCHAR(100),"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_INDEX) + " SMALLINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_TYPE) + " VARCHAR(32), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRMASK) + " BOOLEAN, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_STRLENGTH) + " SMALLINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ENUMVALS) + " VARCHAR(100),"
+ "CONSTRAINT " + CONSTRAINT_SQI_SQF + " "
- + "FOREIGN KEY (" + COLUMN_SQI_FORM + ") "
- + "REFERENCES " + TABLE_SQ_FORM + " (" + COLUMN_SQF_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_FORM) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_FORM_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQF_ID) + ")"
+ ")";
// DDL: Create table SQ_CONNECTION
public static final String QUERY_CREATE_TABLE_SQ_CONNECTION =
- "CREATE TABLE " + TABLE_SQ_CONNECTION + " ("
- + COLUMN_SQN_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQN_CONNECTOR + " BIGINT, "
- + COLUMN_SQN_NAME + " VARCHAR(32),"
- + COLUMN_SQN_CREATION_DATE + " TIMESTAMP,"
- + COLUMN_SQN_UPDATE_DATE + " TIMESTAMP,"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CONNECTOR) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_NAME) + " VARCHAR(32),"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CREATION_DATE) + " TIMESTAMP,"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQN_UPDATE_DATE) + " TIMESTAMP,"
+ "CONSTRAINT " + CONSTRAINT_SQN_SQC + " "
- + "FOREIGN KEY(" + COLUMN_SQN_CONNECTOR + ") "
- + " REFERENCES " + TABLE_SQ_CONNECTOR + " (" + COLUMN_SQC_ID + ")"
+ + "FOREIGN KEY(" + CommonRepoUtils.escapeColumnName(COLUMN_SQN_CONNECTOR) + ") "
+ + " REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTOR_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQC_ID) + ")"
+ ")";
//DDL: Create table SQ_JOB
public static final String QUERY_CREATE_TABLE_SQ_JOB =
- "CREATE TABLE " + TABLE_SQ_JOB + " ("
- + COLUMN_SQB_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
- + COLUMN_SQB_CONNECTION + " BIGINT, "
- + COLUMN_SQB_NAME + " VARCHAR(64), "
- + COLUMN_SQB_TYPE + " VARCHAR(64),"
- + COLUMN_SQB_CREATION_DATE + " TIMESTAMP,"
- + COLUMN_SQB_UPDATE_DATE + " TIMESTAMP,"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CONNECTION) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_NAME) + " VARCHAR(64), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_TYPE) + " VARCHAR(64),"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CREATION_DATE) + " TIMESTAMP,"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQB_UPDATE_DATE) + " TIMESTAMP,"
+ "CONSTRAINT " + CONSTRAINT_SQB_SQN + " "
- + "FOREIGN KEY(" + COLUMN_SQB_CONNECTION + ") "
- + "REFERENCES " + TABLE_SQ_CONNECTION + " (" + COLUMN_SQN_ID + ")"
+ + "FOREIGN KEY(" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_CONNECTION) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + ")"
+ ")";
// DDL: Create table SQ_CONNECTION_INPUT
public static final String QUERY_CREATE_TABLE_SQ_CONNECTION_INPUT =
- "CREATE TABLE " + TABLE_SQ_CONNECTION_INPUT + " ("
- + COLUMN_SQNI_CONNECTION + " BIGINT, "
- + COLUMN_SQNI_INPUT + " BIGINT, "
- + COLUMN_SQNI_VALUE + " LONG VARCHAR,"
- + "PRIMARY KEY (" + COLUMN_SQNI_CONNECTION + ", " + COLUMN_SQNI_INPUT + "), "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_CONNECTION) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_INPUT) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_VALUE) + " LONG VARCHAR,"
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_CONNECTION) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_INPUT) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQNI_SQN + " "
- + "FOREIGN KEY (" + COLUMN_SQNI_CONNECTION + ") "
- + "REFERENCES " + TABLE_SQ_CONNECTION + " (" + COLUMN_SQN_ID + "),"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_CONNECTION) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_CONNECTION_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQN_ID) + "),"
+ "CONSTRAINT " + CONSTRAINT_SQNI_SQI + " "
- + "FOREIGN KEY (" + COLUMN_SQNI_INPUT + ") "
- + "REFERENCES " + TABLE_SQ_INPUT + " (" + COLUMN_SQI_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQNI_INPUT) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ")"
+ ")";
// DDL: Create table SQ_JOB_INPUT
public static final String QUERY_CREATE_TABLE_SQ_JOB_INPUT =
- "CREATE TABLE " + TABLE_SQ_JOB_INPUT + " ("
- + COLUMN_SQBI_JOB + " BIGINT, "
- + COLUMN_SQBI_INPUT + " BIGINT, "
- + COLUMN_SQBI_VALUE + " LONG VARCHAR,"
- + " PRIMARY KEY (" + COLUMN_SQBI_JOB + ", " + COLUMN_SQBI_INPUT + "), "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_INPUT_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_VALUE) + " LONG VARCHAR,"
+ + " PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + "), "
+ " CONSTRAINT " + CONSTRAINT_SQBI_SQB + " "
- + "FOREIGN KEY (" + COLUMN_SQBI_JOB + ") "
- + "REFERENCES " + TABLE_SQ_JOB + " (" + COLUMN_SQB_ID + "), "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_JOB) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + "), "
+ " CONSTRAINT " + CONSTRAINT_SQBI_SQI + " "
- + "FOREIGN KEY (" + COLUMN_SQBI_INPUT + ") "
- + "REFERENCES " + TABLE_SQ_INPUT + " (" + COLUMN_SQI_ID + ")"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQBI_INPUT) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_INPUT_NAME) + " (" + CommonRepoUtils.escapeColumnName(COLUMN_SQI_ID) + ")"
+ ")";
// DDL: Create table SQ_SUBMISSION
public static final String QUERY_CREATE_TABLE_SQ_SUBMISSION =
- "CREATE TABLE " + TABLE_SQ_SUBMISSION + " ("
- + COLUMN_SQS_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
- + COLUMN_SQS_JOB + " BIGINT, "
- + COLUMN_SQS_STATUS + " VARCHAR(20), "
- + COLUMN_SQS_CREATION_DATE + " TIMESTAMP,"
- + COLUMN_SQS_UPDATE_DATE + " TIMESTAMP,"
- + COLUMN_SQS_EXTERNAL_ID + " VARCHAR(50), "
- + COLUMN_SQS_EXTERNAL_LINK + " VARCHAR(150), "
- + COLUMN_SQS_EXCEPTION + " VARCHAR(150), "
- + COLUMN_SQS_EXCEPTION_TRACE + " VARCHAR(750), "
- + "PRIMARY KEY (" + COLUMN_SQS_ID + "), "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_STATUS) + " VARCHAR(20), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_CREATION_DATE) + " TIMESTAMP,"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_UPDATE_DATE) + " TIMESTAMP,"
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_ID) + " VARCHAR(50), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXTERNAL_LINK) + " VARCHAR(150), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXCEPTION) + " VARCHAR(150), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQS_EXCEPTION_TRACE) + " VARCHAR(750), "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQS_SQB + " "
- + "FOREIGN KEY (" + COLUMN_SQS_JOB + ") "
- + "REFERENCES " + TABLE_SQ_JOB + "(" + COLUMN_SQB_ID + ") ON DELETE CASCADE"
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQS_JOB) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_JOB_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQB_ID) + ") ON DELETE CASCADE"
+ ")";
// DDL: Create table SQ_COUNTER_GROUP
public static final String QUERY_CREATE_TABLE_SQ_COUNTER_GROUP =
- "CREATE TABLE " + TABLE_SQ_COUNTER_GROUP + " ("
- + COLUMN_SQG_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
- + COLUMN_SQG_NAME + " VARCHAR(75), "
- + "PRIMARY KEY (" + COLUMN_SQG_ID + "),"
- + "UNIQUE ( " + COLUMN_SQG_NAME + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + " VARCHAR(75), "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + "),"
+ + "UNIQUE ( " + CommonRepoUtils.escapeColumnName(COLUMN_SQG_NAME) + ")"
+ ")";
// DDL: Create table SQ_COUNTER
public static final String QUERY_CREATE_TABLE_SQ_COUNTER =
- "CREATE TABLE " + TABLE_SQ_COUNTER + " ("
- + COLUMN_SQR_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
- + COLUMN_SQR_NAME + " VARCHAR(75), "
- + "PRIMARY KEY (" + COLUMN_SQR_ID + "), "
- + "UNIQUE ( " + COLUMN_SQR_NAME + ")"
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + " VARCHAR(75), "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + "), "
+ + "UNIQUE ( " + CommonRepoUtils.escapeColumnName(COLUMN_SQR_NAME) + ")"
+ ")";
// DDL: Create table SQ_COUNTER_SUBMISSION
public static final String QUERY_CREATE_TABLE_SQ_COUNTER_SUBMISSION =
- "CREATE TABLE " + TABLE_SQ_COUNTER_SUBMISSION + " ("
- + COLUMN_SQRS_GROUP + " BIGINT, "
- + COLUMN_SQRS_COUNTER + " BIGINT, "
- + COLUMN_SQRS_SUBMISSION + " BIGINT, "
- + COLUMN_SQRS_VALUE + " BIGINT, "
- + "PRIMARY KEY (" + COLUMN_SQRS_GROUP + ", " + COLUMN_SQRS_COUNTER + ", " + COLUMN_SQRS_SUBMISSION + "), "
+ "CREATE TABLE " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_SUBMISSION_NAME) + " ("
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + " BIGINT, "
+ + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_VALUE) + " BIGINT, "
+ + "PRIMARY KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + ", " + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQRS_SQG + " "
- + "FOREIGN KEY (" + COLUMN_SQRS_GROUP + ") "
- + "REFERENCES " + TABLE_SQ_COUNTER_GROUP + "(" + COLUMN_SQG_ID + "), "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_GROUP) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_GROUP_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQG_ID) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQRS_SQR + " "
- + "FOREIGN KEY (" + COLUMN_SQRS_COUNTER + ") "
- + "REFERENCES " + TABLE_SQ_COUNTER + "(" + COLUMN_SQR_ID + "), "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_COUNTER) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_COUNTER_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQR_ID) + "), "
+ "CONSTRAINT " + CONSTRAINT_SQRS_SQS + " "
- + "FOREIGN KEY (" + COLUMN_SQRS_SUBMISSION + ") "
- + "REFERENCES " + TABLE_SQ_SUBMISSION + "(" + COLUMN_SQS_ID + ") ON DELETE CASCADE "
+ + "FOREIGN KEY (" + CommonRepoUtils.escapeColumnName(COLUMN_SQRS_SUBMISSION) + ") "
+ + "REFERENCES " + CommonRepoUtils.getTableName(SCHEMA_SQOOP, TABLE_SQ_SUBMISSION_NAME) + "(" + CommonRepoUtils.escapeColumnName(COLUMN_SQS_ID) + ") ON DELETE CASCADE "
+ ")";
private DerbySchemaCreateQuery() {
[3/3] sqoop git commit: SQOOP-2041: Sqoop2: Escape identifier names
Posted by gw...@apache.org.
SQOOP-2041: Sqoop2: Escape identifier names
(Abraham Elmahrek via Gwen Shapira)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/2b4db802
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/2b4db802
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/2b4db802
Branch: refs/heads/sqoop2
Commit: 2b4db8023ecf49f5c0307be3c37bfc2895abfa7f
Parents: 5ade862
Author: Gwen Shapira <cs...@gmail.com>
Authored: Mon Jan 26 20:23:47 2015 -0800
Committer: Gwen Shapira <cs...@gmail.com>
Committed: Mon Jan 26 20:23:47 2015 -0800
----------------------------------------------------------------------
.../repository/common/CommonRepoUtils.java | 50 +
.../common/CommonRepositoryHandler.java | 172 ++--
...RepositoryInsertUpdateDeleteSelectQuery.java | 916 ++++++++++++-------
.../repository/common/TestCommonRepoUtils.java | 39 +
.../src/test/resources/log4j.properties | 24 +
.../derby/DerbyRepositoryHandler.java | 3 +-
.../derby/DerbySchemaCreateQuery.java | 240 ++---
...erbySchemaInsertUpdateDeleteSelectQuery.java | 69 +-
.../derby/DerbySchemaUpgradeQuery.java | 392 ++++----
.../postgresql/PostgresqlSchemaCreateQuery.java | 186 ++--
.../postgresql/PostgresqlSchemaQuery.java | 22 +-
.../postgresql/PostgresqlTestCase.java | 2 +-
.../postgresql/PostgresqlTestUtils.java | 8 +-
.../repository/postgresql/TestStructure.java | 78 +-
14 files changed, 1295 insertions(+), 906 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepoUtils.java
----------------------------------------------------------------------
diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepoUtils.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepoUtils.java
new file mode 100644
index 0000000..5121962
--- /dev/null
+++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepoUtils.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sqoop.repository.common;
+
+public class CommonRepoUtils {
+ public static final String TABLE_NAME_QUOTE_CHAR = "\"";
+
+ public static final String escapeTableName(String tableName) {
+ return TABLE_NAME_QUOTE_CHAR + tableName + TABLE_NAME_QUOTE_CHAR;
+ }
+
+ public static final String escapeColumnName(String columnName) {
+ return TABLE_NAME_QUOTE_CHAR + columnName + TABLE_NAME_QUOTE_CHAR;
+ }
+
+ public static final String escapeSchemaName(String schemaName) {
+ return TABLE_NAME_QUOTE_CHAR + schemaName + TABLE_NAME_QUOTE_CHAR;
+ }
+
+ public static final String getTableName(String schemaName, String tableName) {
+ if (schemaName != null) {
+ return escapeSchemaName(schemaName) + "." + escapeTableName(tableName);
+ } else {
+ return escapeTableName(tableName);
+ }
+ }
+
+ public static final String getColumnName(String tableName, String columnName) {
+ if (tableName != null) {
+ return escapeTableName(tableName) + "." + escapeColumnName(columnName);
+ } else {
+ return escapeColumnName(columnName);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/2b4db802/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
index 1e13932..5c9247a 100644
--- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
+++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
@@ -70,6 +70,12 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
private static final Logger LOG =
Logger.getLogger(CommonRepositoryHandler.class);
+ protected CommonRepositoryInsertUpdateDeleteSelectQuery crudQueries;
+
+ public CommonRepositoryHandler() {
+ crudQueries = new CommonRepositoryInsertUpdateDeleteSelectQuery();
+ }
+
/**
* Name to be used during logging
*
@@ -88,7 +94,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
MConnector mc = null;
PreparedStatement connectorFetchStmt = null;
try {
- connectorFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_FROM_CONFIGURABLE);
+ connectorFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectFromConfigurable());
connectorFetchStmt.setString(1, shortName);
List<MConnector> connectors = loadConnectors(connectorFetchStmt, conn);
@@ -118,7 +124,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public List<MConnector> findConnectors(Connection conn) {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIGURABLE_ALL_FOR_TYPE);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectConfigurableAllForType());
stmt.setString(1, MConfigurableType.CONNECTOR.name());
return loadConnectors(stmt, conn);
@@ -150,8 +156,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public List<MJob> findJobsForConnector(long connectorId, Connection conn) {
PreparedStatement stmt = null;
try {
- stmt = conn
- .prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_ALL_JOBS_FOR_CONNECTOR_CONFIGURABLE);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectAllJobsForConnectorConfigurable());
stmt.setLong(1, connectorId);
stmt.setLong(2, connectorId);
return loadJobs(stmt, conn);
@@ -179,10 +184,10 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement deleteConfigDirection = null;
PreparedStatement deleteInput = null;
try {
- updateConnectorStatement = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_UPDATE_CONFIGURABLE);
- deleteInput = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_INPUTS_FOR_CONFIGURABLE);
- deleteConfigDirection = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_DIRECTIONS_FOR_CONFIGURABLE);
- deleteConfig = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_CONFIGS_FOR_CONFIGURABLE);
+ updateConnectorStatement = conn.prepareStatement(crudQueries.getStmtUpdateConfigurable());
+ deleteInput = conn.prepareStatement(crudQueries.getStmtDeleteInputsForConfigurable());
+ deleteConfigDirection = conn.prepareStatement(crudQueries.getStmtDeleteDirectionsForConfigurable());
+ deleteConfig = conn.prepareStatement(crudQueries.getStmtDeleteConfigsForConfigurable());
updateConnectorStatement.setString(1, mConnector.getUniqueName());
updateConnectorStatement.setString(2, mConnector.getClassName());
@@ -222,9 +227,9 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement deleteConfig = null;
PreparedStatement deleteInput = null;
try {
- updateDriverStatement = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_UPDATE_CONFIGURABLE);
- deleteInput = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_INPUTS_FOR_CONFIGURABLE);
- deleteConfig = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_CONFIGS_FOR_CONFIGURABLE);
+ updateDriverStatement = conn.prepareStatement(crudQueries.getStmtUpdateConfigurable());
+ deleteInput = conn.prepareStatement(crudQueries.getStmtDeleteInputsForConfigurable());
+ deleteConfig = conn.prepareStatement(crudQueries.getStmtDeleteConfigsForConfigurable());
updateDriverStatement.setString(1, mDriver.getUniqueName());
updateDriverStatement.setString(2, Driver.getClassName());
updateDriverStatement.setString(3, mDriver.getVersion());
@@ -258,10 +263,10 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement baseConfigStmt = null;
PreparedStatement baseInputStmt = null;
try {
- baseConfigStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_CONFIG,
+ baseConfigStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoConfig(),
Statement.RETURN_GENERATED_KEYS);
- baseInputStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_INPUT,
+ baseInputStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoInput(),
Statement.RETURN_GENERATED_KEYS);
// Register a driver config as a job type with no direction
@@ -287,7 +292,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
MDriver mDriver;
try {
- driverFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_FROM_CONFIGURABLE);
+ driverFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectFromConfigurable());
driverFetchStmt.setString(1, shortName);
ResultSet rsDriverSet = driverFetchStmt.executeQuery();
@@ -297,10 +302,10 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
Long driverId = rsDriverSet.getLong(1);
String driverVersion = rsDriverSet.getString(4);
- driverConfigFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
+ driverConfigFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
driverConfigFetchStmt.setLong(1, driverId);
- driverConfigInputFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_INPUT);
+ driverConfigInputFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectInput());
List<MConfig> driverConfigs = new ArrayList<MConfig>();
loadDriverConfigs(driverConfigs, driverConfigFetchStmt, driverConfigInputFetchStmt, 1);
@@ -360,7 +365,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
int result;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_LINK,
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertLink(),
Statement.RETURN_GENERATED_KEYS);
stmt.setString(1, link.getName());
stmt.setLong(2, link.getConnectorId());
@@ -384,7 +389,8 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
long connectionId = rsetConnectionId.getLong(1);
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_LINK_INPUT,
+ createInputValues(
+ crudQueries.getStmtInsertLinkInput(),
connectionId,
link.getConnectorLinkConfig().getConfigs(),
conn);
@@ -407,12 +413,12 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement updateStmt = null;
try {
// Firstly remove old values
- deleteStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_LINK_INPUT);
+ deleteStmt = conn.prepareStatement(crudQueries.getStmtDeleteLinkInput());
deleteStmt.setLong(1, link.getPersistenceId());
deleteStmt.executeUpdate();
// Update LINK_CONFIG table
- updateStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_UPDATE_LINK);
+ updateStmt = conn.prepareStatement(crudQueries.getStmtUpdateLink());
updateStmt.setString(1, link.getName());
updateStmt.setString(2, link.getLastUpdateUser());
updateStmt.setTimestamp(3, new Timestamp(new Date().getTime()));
@@ -421,7 +427,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
updateStmt.executeUpdate();
// And reinsert new values
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_LINK_INPUT,
+ createInputValues(crudQueries.getStmtInsertLinkInput(),
link.getPersistenceId(),
link.getConnectorLinkConfig().getConfigs(),
conn);
@@ -442,7 +448,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_LINK_CHECK_BY_ID);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectLinkCheckById());
stmt.setLong(1, linkId);
rs = stmt.executeQuery();
@@ -468,7 +474,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_JOBS_FOR_LINK_CHECK);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectJobsForLinkCheck());
stmt.setLong(1, linkId);
rs = stmt.executeQuery();
@@ -494,7 +500,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement enableConn = null;
try {
- enableConn = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_ENABLE_LINK);
+ enableConn = conn.prepareStatement(crudQueries.getStmtEnableLink());
enableConn.setBoolean(1, enabled);
enableConn.setLong(2, linkId);
enableConn.executeUpdate();
@@ -515,7 +521,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
try {
deleteLinkInputs(linkId, conn);
- dltConn = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_LINK);
+ dltConn = conn.prepareStatement(crudQueries.getStmtDeleteLink());
dltConn.setLong(1, linkId);
dltConn.executeUpdate();
} catch (SQLException ex) {
@@ -533,7 +539,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public void deleteLinkInputs(long id, Connection conn) {
PreparedStatement dltConnInput = null;
try {
- dltConnInput = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_LINK_INPUT);
+ dltConnInput = conn.prepareStatement(crudQueries.getStmtDeleteLinkInput());
dltConnInput.setLong(1, id);
dltConnInput.executeUpdate();
} catch (SQLException ex) {
@@ -551,7 +557,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public MLink findLink(long linkId, Connection conn) {
PreparedStatement linkFetchStmt = null;
try {
- linkFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_LINK_SINGLE);
+ linkFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectLinkSingle());
linkFetchStmt.setLong(1, linkId);
List<MLink> links = loadLinks(linkFetchStmt, conn);
@@ -579,7 +585,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public MLink findLink(String linkName, Connection conn) {
PreparedStatement linkFetchStmt = null;
try {
- linkFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_LINK_SINGLE_BY_NAME);
+ linkFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectLinkSingleByName());
linkFetchStmt.setString(1, linkName);
List<MLink> links = loadLinks(linkFetchStmt, conn);
@@ -606,7 +612,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public List<MLink> findLinks(Connection conn) {
PreparedStatement linksFetchStmt = null;
try {
- linksFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_LINK_ALL);
+ linksFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectLinkAll());
return loadLinks(linksFetchStmt, conn);
@@ -625,7 +631,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public List<MLink> findLinksForConnector(long connectorId, Connection conn) {
PreparedStatement linkByConnectorFetchStmt = null;
try {
- linkByConnectorFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_LINK_FOR_CONNECTOR_CONFIGURABLE);
+ linkByConnectorFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectLinkForConnectorConfigurable());
linkByConnectorFetchStmt.setLong(1, connectorId);
return loadLinks(linkByConnectorFetchStmt, conn);
} catch (SQLException ex) {
@@ -643,7 +649,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
int result;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB, Statement.RETURN_GENERATED_KEYS);
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertJob(), Statement.RETURN_GENERATED_KEYS);
stmt.setString(1, job.getName());
stmt.setLong(2, job.getLinkId(Direction.FROM));
stmt.setLong(3, job.getLinkId(Direction.TO));
@@ -668,17 +674,17 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
long jobId = rsetJobId.getLong(1);
// from config for the job
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
jobId,
job.getJobConfig(Direction.FROM).getConfigs(),
conn);
// to config for the job
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
jobId,
job.getJobConfig(Direction.TO).getConfigs(),
conn);
// driver config per job
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
jobId,
job.getDriverConfig().getConfigs(),
conn);
@@ -702,12 +708,12 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement updateStmt = null;
try {
// Firstly remove old values
- deleteStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_JOB_INPUT);
+ deleteStmt = conn.prepareStatement(crudQueries.getStmtDeleteJobInput());
deleteStmt.setLong(1, job.getPersistenceId());
deleteStmt.executeUpdate();
// Update job table
- updateStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_UPDATE_JOB);
+ updateStmt = conn.prepareStatement(crudQueries.getStmtUpdateJob());
updateStmt.setString(1, job.getName());
updateStmt.setString(2, job.getLastUpdateUser());
updateStmt.setTimestamp(3, new Timestamp(new Date().getTime()));
@@ -716,15 +722,15 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
updateStmt.executeUpdate();
// And reinsert new values
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
job.getPersistenceId(),
job.getJobConfig(Direction.FROM).getConfigs(),
conn);
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
job.getPersistenceId(),
job.getJobConfig(Direction.TO).getConfigs(),
conn);
- createInputValues(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_JOB_INPUT,
+ createInputValues(crudQueries.getStmtInsertJobInput(),
job.getPersistenceId(),
job.getDriverConfig().getConfigs(),
conn);
@@ -745,7 +751,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_JOB_CHECK_BY_ID);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectJobCheckById());
stmt.setLong(1, jobId);
rs = stmt.executeQuery();
@@ -790,7 +796,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement enableConn = null;
try {
- enableConn = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_ENABLE_JOB);
+ enableConn = conn.prepareStatement(crudQueries.getStmtEnableJob());
enableConn.setBoolean(1, enabled);
enableConn.setLong(2, jobId);
enableConn.executeUpdate();
@@ -809,7 +815,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public void deleteJobInputs(long id, Connection conn) {
PreparedStatement dltInput = null;
try {
- dltInput = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_JOB_INPUT);
+ dltInput = conn.prepareStatement(crudQueries.getStmtDeleteJobInput());
dltInput.setLong(1, id);
dltInput.executeUpdate();
} catch (SQLException ex) {
@@ -828,7 +834,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement dlt = null;
try {
deleteJobInputs(jobId, conn);
- dlt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_JOB);
+ dlt = conn.prepareStatement(crudQueries.getStmtDeleteJob());
dlt.setLong(1, jobId);
dlt.executeUpdate();
} catch (SQLException ex) {
@@ -846,7 +852,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public MJob findJob(long jobId, Connection conn) {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_JOB_SINGLE_BY_ID);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectJobSingleById());
stmt.setLong(1, jobId);
List<MJob> jobs = loadJobs(stmt, conn);
@@ -874,7 +880,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public MJob findJob(String name, Connection conn) {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_JOB_SINGLE_BY_NAME);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectJobSingleByName());
stmt.setString(1, name);
List<MJob> jobs = loadJobs(stmt, conn);
@@ -902,7 +908,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
try {
stmt = conn
- .prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_JOB_ALL);
+ .prepareStatement(crudQueries.getStmtSelectJobAll());
return loadJobs(stmt, conn);
} catch (SQLException ex) {
logException(ex);
@@ -920,7 +926,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
int result;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_SUBMISSION,
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertSubmission(),
Statement.RETURN_GENERATED_KEYS);
stmt.setLong(1, submission.getJobId());
stmt.setString(2, submission.getStatus().name());
@@ -970,7 +976,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SUBMISSION_CHECK);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSubmissionCheck());
stmt.setLong(1, submissionId);
rs = stmt.executeQuery();
@@ -996,7 +1002,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement deleteStmt = null;
try {
// Update properties in main table
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_UPDATE_SUBMISSION);
+ stmt = conn.prepareStatement(crudQueries.getStmtUpdateSubmission());
stmt.setString(1, submission.getStatus().name());
stmt.setString(2, submission.getLastUpdateUser());
stmt.setTimestamp(3, new Timestamp(submission.getLastUpdateDate().getTime()));
@@ -1007,7 +1013,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
stmt.executeUpdate();
// Delete previous counters
- deleteStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_DELETE_COUNTER_SUBMISSION);
+ deleteStmt = conn.prepareStatement(crudQueries.getStmtDeleteCounterSubmission());
deleteStmt.setLong(1, submission.getPersistenceId());
deleteStmt.executeUpdate();
@@ -1031,7 +1037,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
public void purgeSubmissions(Date threshold, Connection conn) {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_PURGE_SUBMISSIONS);
+ stmt = conn.prepareStatement(crudQueries.getStmtPurgeSubmissions());
stmt.setTimestamp(1, new Timestamp(threshold.getTime()));
stmt.executeUpdate();
@@ -1052,7 +1058,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SUBMISSION_UNFINISHED);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSubmissionUnfinished());
for(SubmissionStatus status : SubmissionStatus.unfinished()) {
stmt.setString(1, status.name());
@@ -1085,7 +1091,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SUBMISSIONS);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSubmissions());
rs = stmt.executeQuery();
while(rs.next()) {
@@ -1114,7 +1120,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SUBMISSIONS_FOR_JOB);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSubmissionsForJob());
stmt.setLong(1, jobId);
rs = stmt.executeQuery();
@@ -1143,7 +1149,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SUBMISSIONS_FOR_JOB);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSubmissionsForJob());
stmt.setLong(1, jobId);
stmt.setMaxRows(1);
rs = stmt.executeQuery();
@@ -1167,7 +1173,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_SQ_CONNECTOR_DIRECTIONS);
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertSqConnectorDirections());
stmt.setLong(1, connectorId);
stmt.setLong(2, getDirection(direction, conn));
@@ -1193,7 +1199,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
private long insertAndGetConnectorId(MConnector mc, Connection conn) {
PreparedStatement baseConnectorStmt = null;
try {
- baseConnectorStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_CONFIGURABLE,
+ baseConnectorStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoConfigurable(),
Statement.RETURN_GENERATED_KEYS);
baseConnectorStmt.setString(1, mc.getUniqueName());
baseConnectorStmt.setString(2, mc.getClassName());
@@ -1233,10 +1239,10 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement baseConfigStmt = null;
PreparedStatement baseInputStmt = null;
try{
- baseConfigStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_CONFIG,
+ baseConfigStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoConfig(),
Statement.RETURN_GENERATED_KEYS);
- baseInputStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_INPUT,
+ baseInputStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoInput(),
Statement.RETURN_GENERATED_KEYS);
// Register link type config
@@ -1263,7 +1269,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
private long insertAndGetDriverId(MDriver mDriver, Connection conn) {
PreparedStatement baseDriverStmt = null;
try {
- baseDriverStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_CONFIGURABLE,
+ baseDriverStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoConfigurable(),
Statement.RETURN_GENERATED_KEYS);
baseDriverStmt.setString(1, mDriver.getUniqueName());
baseDriverStmt.setString(2, Driver.getClassName());
@@ -1292,9 +1298,9 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement baseConfigStmt = null;
PreparedStatement baseInputStmt = null;
try {
- baseConfigStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_CONFIG,
+ baseConfigStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoConfig(),
Statement.RETURN_GENERATED_KEYS);
- baseInputStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_INTO_INPUT,
+ baseInputStmt = conn.prepareStatement(crudQueries.getStmtInsertIntoInput(),
Statement.RETURN_GENERATED_KEYS);
// Register a driver config as a job type with no owner/connector and direction
@@ -1321,7 +1327,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_COUNTER_SUBMISSION);
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertCounterSubmission());
for(CounterGroup group : counters) {
long groupId = getCounterGroupId(group, conn);
@@ -1357,7 +1363,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rsInsert = null;
try {
- select = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_COUNTER_GROUP);
+ select = conn.prepareStatement(crudQueries.getStmtSelectCounterGroup());
select.setString(1, group.getName());
rsSelect = select.executeQuery();
@@ -1366,7 +1372,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
return rsSelect.getLong(1);
}
- insert = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_COUNTER_GROUP, Statement.RETURN_GENERATED_KEYS);
+ insert = conn.prepareStatement(crudQueries.getStmtInsertCounterGroup(), Statement.RETURN_GENERATED_KEYS);
insert.setString(1, group.getName());
insert.executeUpdate();
@@ -1398,7 +1404,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rsInsert = null;
try {
- select = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_COUNTER);
+ select = conn.prepareStatement(crudQueries.getStmtSelectCounter());
select.setString(1, counter.getName());
rsSelect = select.executeQuery();
@@ -1407,7 +1413,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
return rsSelect.getLong(1);
}
- insert = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_COUNTER, Statement.RETURN_GENERATED_KEYS);
+ insert = conn.prepareStatement(crudQueries.getStmtInsertCounter(), Statement.RETURN_GENERATED_KEYS);
insert.setString(1, counter.getName());
insert.executeUpdate();
@@ -1458,7 +1464,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
PreparedStatement stmt = null;
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_COUNTER_SUBMISSION);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectCounterSubmission());
stmt.setLong(1, submissionId);
rs = stmt.executeQuery();
@@ -1494,7 +1500,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rs = null;
try {
- directionStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SQD_ID_BY_SQD_NAME);
+ directionStmt = conn.prepareStatement(crudQueries.getStmtSelectSqdIdBySqdName());
directionStmt.setString(1, direction.toString());
rs = directionStmt.executeQuery();
@@ -1515,7 +1521,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rs = null;
try {
- directionStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SQD_NAME_BY_SQD_ID);
+ directionStmt = conn.prepareStatement(crudQueries.getStmtSelectSqdNameBySqdId());
directionStmt.setLong(1, directionId);
rs = directionStmt.executeQuery();
@@ -1538,7 +1544,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
boolean from = false, to = false;
try {
- connectorDirectionsStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SQ_CONNECTOR_DIRECTIONS);
+ connectorDirectionsStmt = conn.prepareStatement(crudQueries.getStmtSelectSqConnectorDirections());
connectorDirectionsStmt.setLong(1, connectorId);
rs = connectorDirectionsStmt.executeQuery();
@@ -1573,8 +1579,8 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
try {
rsConnectors = stmt.executeQuery();
- connectorConfigFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
- connectorConfigInputFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_INPUT);
+ connectorConfigFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
+ connectorConfigInputFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectInput());
while(rsConnectors.next()) {
long connectorId = rsConnectors.getLong(1);
@@ -1626,8 +1632,8 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
rsConnection = stmt.executeQuery();
//
- connectorConfigFetchStatement = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
- connectorConfigInputStatement = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_FETCH_LINK_INPUT);
+ connectorConfigFetchStatement = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
+ connectorConfigInputStatement = conn.prepareStatement(crudQueries.getStmtFetchLinkInput());
while(rsConnection.next()) {
long id = rsConnection.getLong(1);
@@ -1684,10 +1690,10 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
// Note: Job does not hold a explicit reference to the driver since every
// job has the same driver
long driverId = this.findDriver(MDriver.DRIVER_NAME, conn).getPersistenceId();
- fromConfigFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
- toConfigFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
- driverConfigfetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_CONFIG_FOR_CONFIGURABLE);
- jobInputFetchStmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_FETCH_JOB_INPUT);
+ fromConfigFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
+ toConfigFetchStmt = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
+ driverConfigfetchStmt = conn.prepareStatement(crudQueries.getStmtSelectConfigForConfigurable());
+ jobInputFetchStmt = conn.prepareStatement(crudQueries.getStmtFetchJobInput());
while(rsJob.next()) {
long fromConnectorId = rsJob.getLong(1);
@@ -1759,7 +1765,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
throws SQLException {
PreparedStatement stmt = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_INSERT_SQ_CONFIG_DIRECTIONS);
+ stmt = conn.prepareStatement(crudQueries.getStmtInsertSqConfigDirections());
stmt.setLong(1, configId);
stmt.setLong(2, getDirection(direction, conn));
if (stmt.executeUpdate() != 1) {
@@ -2001,7 +2007,7 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
ResultSet rs = null;
try {
- stmt = conn.prepareStatement(CommonRepositoryInsertUpdateDeleteSelectQuery.STMT_SELECT_SQ_CONFIG_DIRECTIONS);
+ stmt = conn.prepareStatement(crudQueries.getStmtSelectSqConfigDirections());
stmt.setLong(1, configId);
rs = stmt.executeQuery();
rs.next();
@@ -2030,8 +2036,8 @@ public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
* @param conn Connection object that is used to find config direction.
* @throws java.sql.SQLException In case of any failure on Derby side
*/
- public void loadConnectorConfigTypes(List<MConfig> linkConfig, List<MConfig> fromConfig,
- List<MConfig> toConfig, PreparedStatement configFetchStmt, PreparedStatement inputFetchStmt,
+ public void loadConnectorConfigTypes(List<MConfig> linkConfig, List<MConfig> fromConfig, List<MConfig> toConfig,
+ PreparedStatement configFetchStmt, PreparedStatement inputFetchStmt,
int configPosition, Connection conn) throws SQLException {
// Get list of structures from database