Repository: incubator-ranger Updated Branches: refs/heads/master 7d8baf866 -> 6228e4e3a
RANGER-984: Ranger Admin Install fails with sql patch 022 for oracle Signed-off-by: Gautam Borad <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6228e4e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6228e4e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6228e4e3 Branch: refs/heads/master Commit: 6228e4e3a141fb3e60cdb218a2c1673445db3767 Parents: 7d8baf8 Author: pradeep agrawal <[email protected]> Authored: Fri May 13 08:19:26 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Fri May 13 10:45:38 2016 +0530 ---------------------------------------------------------------------- .../mysql/patches/022-split-service-table.sql | 6 +++--- .../oracle/patches/022-split-service-table.sql | 21 +++++++------------- 2 files changed, 10 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6228e4e3/security-admin/db/mysql/patches/022-split-service-table.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/mysql/patches/022-split-service-table.sql b/security-admin/db/mysql/patches/022-split-service-table.sql index 962e715..d99bfc1 100644 --- a/security-admin/db/mysql/patches/022-split-service-table.sql +++ b/security-admin/db/mysql/patches/022-split-service-table.sql @@ -19,11 +19,11 @@ CREATE TABLE `x_service_version_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `service_id` bigint(20) NOT NULL, `policy_version` bigint(20) NOT NULL DEFAULT 0, -`policy_update_time` datetime DEFAULT NULL, +`policy_update_time` datetime NULL DEFAULT NULL, `tag_version` bigint(20) NOT NULL DEFAULT 0, -`tag_update_time` datetime DEFAULT NULL, +`tag_update_time` datetime NULL DEFAULT NULL, primary key (`id`), -CONSTRAINT `x_service_version_info_service_id` FOREIGN KEY (`service_id`) REFERENCES `x_service` (`id`) +CONSTRAINT `x_service_version_info_FK_service_id` FOREIGN KEY (`service_id`) REFERENCES `x_service` (`id`) ); CREATE INDEX x_service_version_info_IDX_service_id ON x_service_version_info(service_id); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6228e4e3/security-admin/db/oracle/patches/022-split-service-table.sql ---------------------------------------------------------------------- diff --git a/security-admin/db/oracle/patches/022-split-service-table.sql b/security-admin/db/oracle/patches/022-split-service-table.sql index 7059be2..9b4f69c 100644 --- a/security-admin/db/oracle/patches/022-split-service-table.sql +++ b/security-admin/db/oracle/patches/022-split-service-table.sql @@ -14,23 +14,16 @@ -- limitations under the License. / -DROP SEQUENCE IF EXISTS x_service_version_info_seq; - -CREATE SEQUENCE x_service_version_info_seq START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE; - -DROP TABLE IF EXISTS `x_service_version_info`; - -CREATE TABLE `x_service_version_info` ( +CREATE SEQUENCE X_SERVICE_VERSION_INFO_SEQ START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE; +CREATE TABLE x_service_version_info( id NUMBER(20) NOT NULL, service_id NUMBER(20) NOT NULL, -policy_version NUMBER(20) NOT NULL DEFAULT 0, +policy_version NUMBER(20) DEFAULT 0 NOT NULL, policy_update_time DATE DEFAULT NULL NULL, -tag_version NUMBER(20) NOT NULL DEFAULT 0, +tag_version NUMBER(20) DEFAULT 0 NOT NULL, tag_update_time DATE DEFAULT NULL NULL, primary key (id), -CONSTRAINT x_service_version_info_service_id FOREIGN KEY (service_id) REFERENCES x_service(id) +CONSTRAINT x_svc_ver_info_FK_service_id FOREIGN KEY (service_id) REFERENCES x_service(id) ); -CREATE INDEX x_service_version_info_IDX_service_id ON x_service_version_info(service_id); - -commit; - +CREATE INDEX x_svc_ver_info_IDX_service_id ON x_service_version_info(service_id); +commit; \ No newline at end of file
