Updated Branches: refs/heads/trunk db264c8c5 -> 49de3a349
AMBARI-4391. Fix for Oracle upgrade DML scripts (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49de3a34 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49de3a34 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49de3a34 Branch: refs/heads/trunk Commit: 49de3a3496979f65684e8d960383e941e0e3eb3e Parents: db264c8 Author: Nate Cole <[email protected]> Authored: Thu Jan 23 10:24:50 2014 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Jan 23 10:24:50 2014 -0500 ---------------------------------------------------------------------- .../upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql | 10 +++++----- .../upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/49de3a34/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql index 21b2568..9e93c70 100644 --- a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql +++ b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-FIX_LOCAL_REPO.sql @@ -24,22 +24,22 @@ UPDATE ambari.clusters UPDATE ambari.clusterstate SET current_stack_version = replace(current_stack_version, 'HDPLocal', 'HDP') - WHERE INSTR('HDPLocal' in current_stack_version) > 0; + WHERE INSTR(current_stack_version, 'HDPLocal') > 0; UPDATE ambari.hostcomponentdesiredstate SET desired_stack_version = replace(desired_stack_version, 'HDPLocal', 'HDP') - WHERE INSTR('HDPLocal' in desired_stack_version) > 0; + WHERE INSTR(desired_stack_version, 'HDPLocal') > 0; UPDATE ambari.hostcomponentstate SET current_stack_version = replace(current_stack_version, 'HDPLocal', 'HDP') - WHERE INSTR('HDPLocal' in current_stack_version) > 0; + WHERE INSTR(current_stack_version, 'HDPLocal') > 0; UPDATE ambari.servicecomponentdesiredstate SET desired_stack_version = replace(desired_stack_version, 'HDPLocal', 'HDP') - WHERE INSTR('HDPLocal' in desired_stack_version) > 0; + WHERE INSTR(desired_stack_version, 'HDPLocal') > 0; UPDATE ambari.servicedesiredstate SET desired_stack_version = replace(desired_stack_version, 'HDPLocal', 'HDP') - WHERE INSTR('HDPLocal' in desired_stack_version) > 0; + WHERE INSTR(desired_stack_version, 'HDPLocal') > 0; commit; http://git-wip-us.apache.org/repos/asf/ambari/blob/49de3a34/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql index c0f269e..0ba5471 100644 --- a/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql +++ b/ambari-server/src/main/resources/upgrade/dml/Ambari-DML-Oracle-INSERT_METAINFO.sql @@ -20,5 +20,7 @@ -- &1 - metainfo_key -- &2 - metainfo_value -INSERT INTO ambari.metainfo (metainfo_key, metainfo_value) SELECT "&1", "&2" FROM dual WHERE - NOT EXISTS (SELECT metainfo_key FROM ambari.metainfo WHERE metainfo_key = "&1") +INSERT INTO ambari.metainfo ("metainfo_key", "metainfo_value") SELECT '&1', '&2' FROM dual WHERE + NOT EXISTS (SELECT "metainfo_key" FROM ambari.metainfo WHERE "metainfo_key" = '&1'); + +commit;
