You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2015/04/02 04:17:09 UTC
ambari git commit: AMBARI-10301 - Stack Database Table Creation and
Population From Resources (part3) (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk d331e8532 -> 3f452debd
AMBARI-10301 - Stack Database Table Creation and Population From Resources (part3) (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f452deb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f452deb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f452deb
Branch: refs/heads/trunk
Commit: 3f452debd86a53dc4ea197dc9944334b03d2c7a9
Parents: d331e85
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Apr 1 22:09:13 2015 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Apr 1 22:16:49 2015 -0400
----------------------------------------------------------------------
.../src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 10 ++++++----
.../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3f452deb/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 44fde5f..90cc33b 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -898,7 +898,7 @@ INSERT INTO ambari_sequences (sequence_name, sequence_value)
union all
select 'upgrade_group_id_seq', 0
union all
- select 'upgrade_item_id_seq', 0,
+ select 'upgrade_item_id_seq', 0
union all
select 'stack_id_seq', 0;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3f452deb/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 74ea215..5cb187c 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
@@ -908,6 +908,10 @@ CREATE TABLE ambari.upgrade_item (
FOREIGN KEY (upgrade_group_id) REFERENCES ambari.upgrade_group(upgrade_group_id)
);
+GRANT ALL PRIVILEGES ON TABLE ambari.upgrade TO :username;
+GRANT ALL PRIVILEGES ON TABLE ambari.upgrade_group TO :username;
+GRANT ALL PRIVILEGES ON TABLE ambari.upgrade_item TO :username;
+
CREATE TABLE ambari.stack(
stack_id BIGINT NOT NULL,
stack_name VARCHAR(255) NOT NULL,
@@ -916,9 +920,7 @@ CREATE TABLE ambari.stack(
CONSTRAINT unq_stack UNIQUE(stack_name,stack_version)
);
-GRANT ALL PRIVILEGES ON TABLE ambari.upgrade TO :username;
-GRANT ALL PRIVILEGES ON TABLE ambari.upgrade_group TO :username;
-GRANT ALL PRIVILEGES ON TABLE ambari.upgrade_item TO :username;
+GRANT ALL PRIVILEGES ON TABLE ambari.stack TO :username;
---------inserting some data-----------
-- In order for the first ID to be 1, must initialize the ambari_sequences table with a sequence_value of 0.
@@ -986,7 +988,7 @@ INSERT INTO ambari.ambari_sequences (sequence_name, sequence_value)
union all
select 'upgrade_group_id_seq', 0
union all
- select 'upgrade_item_id_seq', 0,
+ select 'upgrade_item_id_seq', 0
union all
select 'stack_id_seq', 0;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3f452deb/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 2a7d3f9..f506761 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -440,7 +440,7 @@ BEGIN TRANSACTION
UNION ALL
SELECT 'host_version_id_seq', 0
UNION ALL
- SELECT 'repo_version_id_seq', 0,
+ SELECT 'repo_version_id_seq', 0
UNION ALL
SELECT 'stack_id_seq', 0;