Repository: ambari Updated Branches: refs/heads/branch-2.4 d64f0900f -> e828fcbbe
AMBARI-18676. Fix constraint violations in adminprincipal table when installing database schema (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e828fcbb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e828fcbb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e828fcbb Branch: refs/heads/branch-2.4 Commit: e828fcbbe11b8bb00d5286453572e211fba79855 Parents: d64f090 Author: Robert Levas <[email protected]> Authored: Mon Oct 24 10:43:38 2016 -0400 Committer: Robert Levas <[email protected]> Committed: Mon Oct 24 10:43:38 2016 -0400 ---------------------------------------------------------------------- .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 10 ---------- .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 5 ----- .../src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 10 ---------- .../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 5 ----- .../src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 10 ---------- .../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 5 ----- 6 files changed, 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql index 88d0bd7..c8ceba5 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql @@ -1164,16 +1164,6 @@ INSERT INTO adminprincipaltype (principal_type_id, principal_type_name) INSERT INTO adminprincipal (principal_id, principal_type_id) SELECT 1, 1 FROM SYSIBM.SYSDUMMY1 UNION ALL - SELECT 2, 3 FROM SYSIBM.SYSDUMMY1 - UNION ALL - SELECT 3, 4 FROM SYSIBM.SYSDUMMY1 - UNION ALL - SELECT 4, 5 FROM SYSIBM.SYSDUMMY1 - UNION ALL - SELECT 5, 6 FROM SYSIBM.SYSDUMMY1 - UNION ALL - SELECT 6, 7 FROM SYSIBM.SYSDUMMY1 - UNION ALL SELECT 7, 8 FROM SYSIBM.SYSDUMMY1 UNION ALL SELECT 8, 8 FROM SYSIBM.SYSDUMMY1 http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/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 762b2d8..536e6b5 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -1113,11 +1113,6 @@ INSERT INTO adminprincipaltype (principal_type_id, principal_type_name) VALUES INSERT INTO adminprincipal (principal_id, principal_type_id) VALUES (1, 1), - (2, 3), - (3, 4), - (4, 5), - (5, 6), - (6, 7), (7, 8), (8, 8), (9, 8), http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/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 6071869..dd0cce6 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql @@ -1110,16 +1110,6 @@ insert into adminprincipaltype (principal_type_id, principal_type_name) insert into adminprincipal (principal_id, principal_type_id) select 1, 1 from dual union all - select 2, 3 from dual - union all - select 3, 4 from dual - union all - select 4, 5 from dual - union all - select 5, 6 from dual - union all - select 6, 7 from dual - union all select 7, 8 from dual union all select 8, 8 from dual http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/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 15f00b6..d01de82 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql @@ -1104,11 +1104,6 @@ INSERT INTO adminprincipaltype (principal_type_id, principal_type_name) VALUES INSERT INTO adminprincipal (principal_id, principal_type_id) VALUES (1, 1), - (2, 3), - (3, 4), - (4, 5), - (5, 6), - (6, 7), (7, 8), (8, 8), (9, 8), http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql index 24af3d4..d0a1e77 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql @@ -1107,16 +1107,6 @@ insert into adminprincipaltype (principal_type_id, principal_type_name) insert into adminprincipal (principal_id, principal_type_id) select 1, 1 union all - select 2, 3 - union all - select 3, 4 - union all - select 4, 5 - union all - select 5, 6 - union all - select 6, 7 - union all select 7, 8 union all select 8, 8 http://git-wip-us.apache.org/repos/asf/ambari/blob/e828fcbb/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql index d174c73..f6a1fb6 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql @@ -1131,11 +1131,6 @@ BEGIN TRANSACTION insert into adminprincipal (principal_id, principal_type_id) values (1, 1), - (2, 3), - (3, 4), - (4, 5), - (5, 6), - (6, 7), (7, 8), (8, 8), (9, 8),
