You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by fb...@apache.org on 2015/03/26 17:26:52 UTC
ambari git commit: AMBARI-10220 [WinTP2] Automatic db structure
populating is broken
Repository: ambari
Updated Branches:
refs/heads/trunk 5746ee6d9 -> 8c5756519
AMBARI-10220 [WinTP2] Automatic db structure populating is broken
Part 1 of 2: Fixed constraint definitions in the SQL Server db creation script.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c575651
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c575651
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c575651
Branch: refs/heads/trunk
Commit: 8c5756519e0fdbb8c9666906017d6efbada2c003
Parents: 5746ee6
Author: Florian Barca <fb...@hortonworks.com>
Authored: Thu Mar 26 09:26:40 2015 -0700
Committer: Florian Barca <fb...@hortonworks.com>
Committed: Thu Mar 26 09:26:40 2015 -0700
----------------------------------------------------------------------
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8c575651/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 330945c..a722d2a 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -162,7 +162,7 @@ ALTER TABLE hostconfigmapping ADD CONSTRAINT FK_hostconfmapping_cluster_id FOREI
ALTER TABLE hostconfigmapping ADD CONSTRAINT FK_hostconfmapping_host_name FOREIGN KEY (host_name) REFERENCES hosts (host_name);
--ALTER TABLE hostconfigmapping ADD CONSTRAINT FK_hostconfmapping_host_id FOREIGN KEY (host_id) REFERENCES hosts (id);
ALTER TABLE configgroup ADD CONSTRAINT FK_configgroup_cluster_id FOREIGN KEY (cluster_id) REFERENCES clusters (cluster_id);
-ALTER TABLE confgroupclusterconfigmapping ADD CONSTRAINT FK_confg FOREIGN KEY (version_tag, config_type, cluster_id) REFERENCES clusterconfig (version_tag, type_name, cluster_id);
+ALTER TABLE confgroupclusterconfigmapping ADD CONSTRAINT FK_confg FOREIGN KEY (cluster_id, config_type, version_tag) REFERENCES clusterconfig (cluster_id, type_name, version_tag);
ALTER TABLE confgroupclusterconfigmapping ADD CONSTRAINT FK_cgccm_gid FOREIGN KEY (config_group_id) REFERENCES configgroup (group_id);
ALTER TABLE configgrouphostmapping ADD CONSTRAINT FK_cghm_cgid FOREIGN KEY (config_group_id) REFERENCES configgroup (group_id);
ALTER TABLE configgrouphostmapping ADD CONSTRAINT FK_cghm_hname FOREIGN KEY (host_name) REFERENCES hosts (host_name);
http://git-wip-us.apache.org/repos/asf/ambari/blob/8c575651/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
index 87029a2..273a477 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-DROP.sql
@@ -99,6 +99,10 @@ IF OBJECT_ID('confgroupclusterconfigmapping', 'U') IS NOT NULL DROP TABLE confgr
GO
IF OBJECT_ID('configgroup', 'U') IS NOT NULL DROP TABLE configgroup
GO
+IF OBJECT_ID('kerberos_principal_host', 'U') IS NOT NULL DROP TABLE kerberos_principal_host
+GO
+IF OBJECT_ID('kerberos_principal', 'U') IS NOT NULL DROP TABLE kerberos_principal
+GO
IF OBJECT_ID('ambari_sequences', 'U') IS NOT NULL DROP TABLE ambari_sequences
GO
IF OBJECT_ID('metainfo', 'U') IS NOT NULL DROP TABLE metainfo