github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-05 01:51:37 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1211: Sqoop2: Derby repo: Sync maximal length of versions

Browse Source 
(Jarek Jarcec Cecho via Venkat Ranganathan)
This commit is contained in:
Venkat Ranganathan 2013-10-07 12:14:38 -07:00
parent 1ce0923b66
commit caf4d824c1
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoConstants.java
View File

@ -31,12 +31,15 @@ public final class DerbyRepoConstants {
* History: * History:
* 0 - empty/unknown state * 0 - empty/unknown state
* 1 - First two releases (1.99.1, 1.99.2) * 1 - First two releases (1.99.1, 1.99.2)
* 2 - added SQ_SYSTEM, SQ_CONNECTION add column ENABLED, * 2 - Version 1.99.3
* added SQ_SYSTEM, SQ_CONNECTION add column ENABLED,
* SQ_CONNECTION add column CREATION_USER, SQ_CONNECTION add column UPDATE_USER, * SQ_CONNECTION add column CREATION_USER, SQ_CONNECTION add column UPDATE_USER,
* SQ_JOB add column ENABLED, SQ_JOB add column CREATION_USER, * SQ_JOB add column ENABLED, SQ_JOB add column CREATION_USER,
* SQ_JOB add column UPDATE_USER, SQ_SUBMISSION add column CREATION_USER, * SQ_JOB add column UPDATE_USER, SQ_SUBMISSION add column CREATION_USER,
* SQ_SUBMISSION add column UPDATE_USER * SQ_SUBMISSION add column UPDATE_USER
* 3 - SQ_SUBMISSION modified SQS_EXTERNAL_ID varchar(50) * 3 - Version 1.99.4
* SQ_SUBMISSION modified SQS_EXTERNAL_ID varchar(50)
* Increased size of SQ_CONNECTOR.SQC_VERSION to 64
*/ */
public static final int VERSION = 3; public static final int VERSION = 3;

1
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
View File

@ -397,6 +397,7 @@ public void createOrUpdateInternals(Connection conn) {
} }
if(version <= 2) { if(version <= 2) {
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_MODIFY_COLUMN_SQS_EXTERNAL_ID_VARCHAR_50, conn); runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_MODIFY_COLUMN_SQS_EXTERNAL_ID_VARCHAR_50, conn);
runQuery(QUERY_UPGRADE_TABLE_SQ_CONNECTOR_MODIFY_COLUMN_SQC_VERSION_VARCHAR_64, conn);
} }
ResultSet rs = null; ResultSet rs = null;

8
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaQuery.java
View File

@ -43,7 +43,7 @@
* | SQC_ID: BIGINT PK AUTO-GEN | * | SQC_ID: BIGINT PK AUTO-GEN |
* | SQC_NAME: VARCHAR(64) | * | SQC_NAME: VARCHAR(64) |
* | SQC_CLASS: VARCHAR(255) | * | SQC_CLASS: VARCHAR(255) |
* | SQC_VERSION: VARCHAR(25) | * | SQC_VERSION: VARCHAR(64) |
* +----------------------------+ * +----------------------------+
* </pre> * </pre>
* </p> * </p>
@ -218,7 +218,7 @@ public final class DerbySchemaQuery {
+ COLUMN_SQC_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, " + COLUMN_SQC_ID + " BIGINT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY, "
+ COLUMN_SQC_NAME + " VARCHAR(64), " + COLUMN_SQC_NAME + " VARCHAR(64), "
+ COLUMN_SQC_CLASS + " VARCHAR(255), " + COLUMN_SQC_CLASS + " VARCHAR(255), "
+ COLUMN_SQC_VERSION + " VARCHAR(25) " + COLUMN_SQC_VERSION + " VARCHAR(64) "
+ ")"; + ")";
// DDL: Create table SQ_FORM // DDL: Create table SQ_FORM
@ -945,6 +945,10 @@ public final class DerbySchemaQuery {
"DELETE FROM " + TABLE_SQ_COUNTER_SUBMISSION "DELETE FROM " + TABLE_SQ_COUNTER_SUBMISSION
+ " WHERE " + COLUMN_SQRS_SUBMISSION + " = ?"; + " WHERE " + COLUMN_SQRS_SUBMISSION + " = ?";
// 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)";
private DerbySchemaQuery() { private DerbySchemaQuery() {
// Disable explicit object creation // Disable explicit object creation