Repository: ambari Updated Branches: refs/heads/trunk 3ba23d27c -> 8d4af5707
AMBARI-9265. Incorrect Ambari-DDL-MySQL-CREATE.sql file (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d4af570 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d4af570 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d4af570 Branch: refs/heads/trunk Commit: 8d4af57074607ce1b6d01fc2bf5b59c7e9cceeb8 Parents: 3ba23d2 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Thu Jan 22 18:11:20 2015 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Thu Jan 22 18:11:20 2015 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog200.java | 2 +- ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 ++-- ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 ++-- .../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 6 ++++++ .../src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 2 +- .../apache/ambari/server/upgrade/UpgradeCatalog200Test.java | 1 + 6 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java index 3a043b9..783f7a2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java @@ -260,7 +260,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog { private void createArtifactTable() throws SQLException { ArrayList<DBColumnInfo> columns = new ArrayList<DBColumnInfo>(); columns.add(new DBColumnInfo("artifact_name", String.class, 255, null, false)); - columns.add(new DBColumnInfo("foreign_keys", String.class, null, null, false)); + columns.add(new DBColumnInfo("foreign_keys", String.class, 255, null, false)); columns.add(new DBColumnInfo("artifact_data", char[].class, null, null, false)); dbAccessor.createTable(ARTIFACT_TABLE, columns, "artifact_name", "foreign_keys"); } http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql index 972053c..21ba270 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -519,8 +519,8 @@ CREATE TABLE repo_version ( CREATE TABLE artifact ( artifact_name VARCHAR(255) NOT NULL, - foreign_keys LONGTEXT NOT NULL, - artifact_data VARCHAR(4096) NOT NULL, + foreign_keys VARCHAR(255) NOT NULL, + artifact_data LONGTEXT NOT NULL, PRIMARY KEY(artifact_name, foreign_keys)); -- altering tables by creating unique constraints---------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql index 0117fed..cab6dfa 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -509,8 +509,8 @@ CREATE TABLE repo_version ( CREATE TABLE artifact ( artifact_name VARCHAR2(255) NOT NULL, - foreign_keys CLOB NOT NULL, - artifact_data VARCHAR2(4096) NOT NULL, + foreign_keys VARCHAR2(255) NOT NULL, + artifact_data CLOB NOT NULL, PRIMARY KEY(artifact_name, foreign_keys)); --------altering tables by creating unique constraints---------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql index 7ce9fc0..81f6c50 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -508,6 +508,12 @@ CREATE TABLE repo_version ( PRIMARY KEY(repo_version_id) ); +CREATE TABLE ambari.artifact ( + artifact_name VARCHAR(255) NOT NULL, + artifact_data TEXT NOT NULL, + foreign_keys VARCHAR(255) NOT NULL, + PRIMARY KEY (artifact_name, foreign_keys)); + --------altering tables by creating unique constraints---------- ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_tag UNIQUE (cluster_id, type_name, version_tag); ALTER TABLE clusterconfig ADD CONSTRAINT UQ_config_type_version UNIQUE (cluster_id, type_name, version); http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql index 7c2d7ae..fe1eef7 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql @@ -452,7 +452,7 @@ GRANT ALL PRIVILEGES ON TABLE ambari.hostgroup_configuration TO :username; CREATE TABLE ambari.artifact ( artifact_name VARCHAR(255) NOT NULL, artifact_data TEXT NOT NULL, - foreign_keys VARCHAR(4096) NOT NULL, + foreign_keys VARCHAR(255) NOT NULL, PRIMARY KEY (artifact_name, foreign_keys)); GRANT ALL PRIVILEGES ON TABLE ambari.artifact TO :username; http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4af570/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java index 9cf016e..e7e1358 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java @@ -556,6 +556,7 @@ public class UpgradeCatalog200Test { } else if (column.getName().equals("foreign_keys")) { assertNull(column.getDefaultValue()); assertEquals(String.class, column.getType()); + assertEquals(255, (int) column.getLength()); assertEquals(false, column.isNullable()); } else if (column.getName().equals("artifact_data")) { assertNull(column.getDefaultValue());
