ambari git commit: AMBARI-11817 [WinTP2] Adding a view fails on Windows
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e41cb36a2 -> 4fa3df7f8
AMBARI-11817 [WinTP2] Adding a view fails on Windows
Fixed database column description in ViewInstanceEntity and UpgradeCatalog210
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4fa3df7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4fa3df7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4fa3df7f
Branch: refs/heads/branch-2.1
Commit: 4fa3df7f8ed564b2293f1e66e1f0205664985198
Parents: e41cb36
Author: Florian Barca
Authored: Wed Jun 10 08:41:00 2015 -0700
Committer: Florian Barca
Committed: Wed Jun 10 08:41:00 2015 -0700
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 2 +-
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fa3df7f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 85cf39a..036dcce 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -282,7 +282,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
// determine whether to alter the names of the dynamic entities /
attributes to
// avoid db reserved word conflicts. should be false for existing
instances
// for backward compatibility.
-dbAccessor.addColumn(VIEW_INSTANCE_TABLE, new DBColumnInfo("alter_names",
Integer.class, null, 0, false));
+dbAccessor.addColumn(VIEW_INSTANCE_TABLE, new DBColumnInfo("alter_names",
Integer.class, 0, 0, false));
// cluster configuration
dbAccessor.addColumn(VIEW_PARAMETER_TABLE, new
DBColumnInfo("cluster_config", String.class, 255, null, true));
// view build number
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fa3df7f/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 f71a4ed..02eeb55 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -537,7 +537,7 @@ CREATE TABLE viewinstanceproperty (
view_name VARCHAR(255) NOT NULL,
view_instance_name VARCHAR(255) NOT NULL,
NAME VARCHAR(255) NOT NULL,
- value VARCHAR(2000) NOT NULL,
+ value VARCHAR(2000),
PRIMARY KEY CLUSTERED (
view_name,
view_instance_name,
ambari git commit: AMBARI-11817 [WinTP2] Adding a view fails on Windows
Repository: ambari
Updated Branches:
refs/heads/trunk efc04b28a -> 1f371a592
AMBARI-11817 [WinTP2] Adding a view fails on Windows
Fixed database column description in ViewInstanceEntity and UpgradeCatalog210
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f371a59
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f371a59
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f371a59
Branch: refs/heads/trunk
Commit: 1f371a592d8ea478c1a0c5852f810c8c7277c93e
Parents: efc04b2
Author: Florian Barca
Authored: Wed Jun 10 08:35:40 2015 -0700
Committer: Florian Barca
Committed: Wed Jun 10 08:38:17 2015 -0700
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 2 +-
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f371a59/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 85cf39a..036dcce 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -282,7 +282,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
// determine whether to alter the names of the dynamic entities /
attributes to
// avoid db reserved word conflicts. should be false for existing
instances
// for backward compatibility.
-dbAccessor.addColumn(VIEW_INSTANCE_TABLE, new DBColumnInfo("alter_names",
Integer.class, null, 0, false));
+dbAccessor.addColumn(VIEW_INSTANCE_TABLE, new DBColumnInfo("alter_names",
Integer.class, 0, 0, false));
// cluster configuration
dbAccessor.addColumn(VIEW_PARAMETER_TABLE, new
DBColumnInfo("cluster_config", String.class, 255, null, true));
// view build number
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f371a59/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 f71a4ed..02eeb55 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -537,7 +537,7 @@ CREATE TABLE viewinstanceproperty (
view_name VARCHAR(255) NOT NULL,
view_instance_name VARCHAR(255) NOT NULL,
NAME VARCHAR(255) NOT NULL,
- value VARCHAR(2000) NOT NULL,
+ value VARCHAR(2000),
PRIMARY KEY CLUSTERED (
view_name,
view_instance_name,
