You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/04/17 18:13:14 UTC

ambari git commit: AMBARI-10556: SQLServer-CREATE script is broken (jluniya)

Repository: ambari
Updated Branches:
  refs/heads/trunk affca503f -> 4bb98e46f


AMBARI-10556: SQLServer-CREATE script is broken (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bb98e46
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bb98e46
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bb98e46

Branch: refs/heads/trunk
Commit: 4bb98e46f39b97ad0f86460fada8e2b9f9a3d883
Parents: affca50
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Fri Apr 17 09:13:11 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Fri Apr 17 09:13:11 2015 -0700

----------------------------------------------------------------------
 .../src/main/resources/Ambari-DDL-SQLServer-CREATE.sql        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4bb98e46/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 a69e235..0dc6dc7 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -191,7 +191,7 @@ CREATE TABLE servicecomponentdesiredstate (
   desired_state VARCHAR(255) NOT NULL,
   service_name VARCHAR(255) NOT NULL,
   PRIMARY KEY CLUSTERED (component_name, cluster_id, service_name),
-  FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id));
+  FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id)
   );
 
 CREATE TABLE servicedesiredstate (
@@ -203,7 +203,7 @@ CREATE TABLE servicedesiredstate (
   maintenance_state VARCHAR(32) NOT NULL,
   security_state VARCHAR(32) NOT NULL DEFAULT 'UNSECURED',
   PRIMARY KEY CLUSTERED (cluster_id,service_name),
-  FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id));
+  FOREIGN KEY (desired_stack_id) REFERENCES stack(stack_id)
   );
 
 CREATE TABLE users (
@@ -214,6 +214,7 @@ CREATE TABLE users (
   create_time DATETIME DEFAULT GETDATE(),
   user_password VARCHAR(255),
   active INTEGER NOT NULL DEFAULT 1,
+  active_widget_layouts VARCHAR(1024) DEFAULT NULL,
   PRIMARY KEY CLUSTERED (user_id),
   UNIQUE (
     ldap_user,
@@ -447,7 +448,7 @@ CREATE TABLE blueprint (
   blueprint_name VARCHAR(255) NOT NULL,
   stack_id BIGINT NOT NULL,
   PRIMARY KEY (blueprint_name),
-  FOREIGN KEY (stack_id) REFERENCES stack(stack_id));
+  FOREIGN KEY (stack_id) REFERENCES stack(stack_id)
   );
 
 CREATE TABLE hostgroup (