You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2016/10/24 14:42:11 UTC
ambari git commit: AMBARI-18676. Fix constraint violations in
adminprincipal table when installing database schema (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk ee7f08554 -> 0aed64644
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/0aed6464
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0aed6464
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0aed6464
Branch: refs/heads/trunk
Commit: 0aed646447c66f3f4d650e822a354b3a04440f80
Parents: ee7f085
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Oct 24 10:41:01 2016 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Oct 24 10:41:01 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/0aed6464/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 7ab1dc7..a0a0afd 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -1179,16 +1179,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/0aed6464/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 5556e82..7a02315 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -1127,11 +1127,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/0aed6464/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 fb3ada5..4ba371a 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -1124,16 +1124,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/0aed6464/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 137a243..c5a9119 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -1118,11 +1118,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/0aed6464/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 4922378..2905eda 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
@@ -1121,16 +1121,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/0aed6464/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 f72b0ab..6b19974 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -1145,11 +1145,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),