[09/35] git commit: AMBARI-6986. Upgrade to 1.7.0, ambari+mysql fails on "version" column.(vbrodetskyi)

2014-08-27 Thread jonathanhurley 
AMBARI-6986. Upgrade to 1.7.0, ambari+mysql fails on "version" 
column.(vbrodetskyi)


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

Branch: refs/heads/branch-alerts-dev
Commit: 160abc549c03cae1f34511582bc8a1cda467157b
Parents: a80066a
Author: Vitaly Brodetskyi 
Authored: Tue Aug 26 13:49:22 2014 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Aug 26 13:49:22 2014 +0300

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/160abc54/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index eeba932..30059ac 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -437,7 +437,7 @@ public class UpgradeCatalog170 extends 
AbstractUpgradeCatalog {
   private void renameSequenceValueColumnName() throws AmbariException, 
SQLException {
 final String dbType = getDbType();
 if (Configuration.MYSQL_DB_NAME.equals(dbType)) {
-  dbAccessor.executeQuery("ALTER TABLE ambari_sequences RENAME COLUMN 
\"value\" to sequence_value DECIMAL(38) NOT NULL");
+  dbAccessor.executeQuery("ALTER TABLE ambari_sequences RENAME COLUMN 
value to sequence_value DECIMAL(38) NOT NULL");
 } else if (Configuration.DERBY_DB_NAME.equals(dbType)) {
   dbAccessor.executeQuery("RENAME COLUMN ambari_sequences.\"value\" to 
sequence_value");
 } else if (Configuration.ORACLE_DB_NAME.equals(dbType)) {

git commit: AMBARI-6986. Upgrade to 1.7.0, ambari+mysql fails on "version" column.(vbrodetskyi)

2014-08-26 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/trunk a80066ae0 -> 160abc549


AMBARI-6986. Upgrade to 1.7.0, ambari+mysql fails on "version" 
column.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: 160abc549c03cae1f34511582bc8a1cda467157b
Parents: a80066a
Author: Vitaly Brodetskyi 
Authored: Tue Aug 26 13:49:22 2014 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Aug 26 13:49:22 2014 +0300

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/160abc54/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index eeba932..30059ac 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -437,7 +437,7 @@ public class UpgradeCatalog170 extends 
AbstractUpgradeCatalog {
   private void renameSequenceValueColumnName() throws AmbariException, 
SQLException {
 final String dbType = getDbType();
 if (Configuration.MYSQL_DB_NAME.equals(dbType)) {
-  dbAccessor.executeQuery("ALTER TABLE ambari_sequences RENAME COLUMN 
\"value\" to sequence_value DECIMAL(38) NOT NULL");
+  dbAccessor.executeQuery("ALTER TABLE ambari_sequences RENAME COLUMN 
value to sequence_value DECIMAL(38) NOT NULL");
 } else if (Configuration.DERBY_DB_NAME.equals(dbType)) {
   dbAccessor.executeQuery("RENAME COLUMN ambari_sequences.\"value\" to 
sequence_value");
 } else if (Configuration.ORACLE_DB_NAME.equals(dbType)) {