You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2020/07/21 11:50:30 UTC
[ranger] branch master updated: RANGER-2920: Improvement in DB
scripts for handling upgrade scenario for MS-SQL
This is an automated email from the ASF dual-hosted git repository.
pradeep pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 0ecdb14 RANGER-2920: Improvement in DB scripts for handling upgrade scenario for MS-SQL
0ecdb14 is described below
commit 0ecdb149010a2c75265826bd523b480b20976adb
Author: Dhaval B. Shah <dh...@gmail.com>
AuthorDate: Tue Jul 21 15:30:26 2020 +0530
RANGER-2920: Improvement in DB scripts for handling upgrade scenario for MS-SQL
Signed-off-by: pradeep <pr...@apache.org>
---
.../patches/046-insert-statename-in-x-ranger-global-state.sql | 6 +++---
security-admin/db/sqlserver/patches/047-sortorder-column-size.sql | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql b/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
index 1d37a3b..d76254b 100644
--- a/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
+++ b/security-admin/db/sqlserver/patches/046-insert-statename-in-x-ranger-global-state.sql
@@ -19,17 +19,17 @@ IF EXISTS(select * from INFORMATION_SCHEMA.columns where table_name = 'x_ranger_
IF NOT EXISTS(select * from x_ranger_global_state where state_name='RangerRole')
BEGIN
- INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,getXportalUIdByLoginId('admin'),getXportalUIdByLoginId('admin'),1,'RangerRole','{"Version":"1"}');
+ INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,dbo.getXportalUIdByLoginId('admin'),dbo.getXportalUIdByLoginId('admin'),1,'RangerRole','{"Version":"1"}');
END;
IF NOT EXISTS(select * from x_ranger_global_state where state_name='RangerUserStore')
BEGIN
- INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,getXportalUIdByLoginId('admin'),getXportalUIdByLoginId('admin'),1,'RangerUserStore','{"Version":"1"}');
+ INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,dbo.getXportalUIdByLoginId('admin'),dbo.getXportalUIdByLoginId('admin'),1,'RangerUserStore','{"Version":"1"}');
END;
IF NOT EXISTS(select * from x_ranger_global_state where state_name='RangerSecurityZone')
BEGIN
- INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,getXportalUIdByLoginId('admin'),getXportalUIdByLoginId('admin'),1,'RangerSecurityZone','{"Version":"1"}');
+ INSERT INTO x_ranger_global_state (create_time,update_time,added_by_id,upd_by_id,version,state_name,app_data) VALUES (CURRENT_TIMESTAMP,CURRENT_TIMESTAMP,dbo.getXportalUIdByLoginId('admin'),dbo.getXportalUIdByLoginId('admin'),1,'RangerSecurityZone','{"Version":"1"}');
END;
END;
GO
diff --git a/security-admin/db/sqlserver/patches/047-sortorder-column-size.sql b/security-admin/db/sqlserver/patches/047-sortorder-column-size.sql
index d812df6..eb16d99 100644
--- a/security-admin/db/sqlserver/patches/047-sortorder-column-size.sql
+++ b/security-admin/db/sqlserver/patches/047-sortorder-column-size.sql
@@ -38,6 +38,7 @@ BEGIN
IF EXISTS(select * from INFORMATION_SCHEMA.columns where table_name = @tablename and column_name = 'sort_order' and DATA_TYPE='tinyint')
BEGIN
DECLARE @ObjectName VARCHAR(100);
+ DECLARE @stmt VARCHAR(100);
SELECT @ObjectName = OBJECT_NAME([default_object_id]) FROM SYS.COLUMNS WHERE [object_id] = OBJECT_ID('[dbo].[' + @tablename + ']') AND [name] = 'sort_order';
IF @ObjectName IS NOT NULL
BEGIN
@@ -79,4 +80,4 @@ EXEC dbo.alterSortOrderColumn 'x_policy_item_group_perm'
GO
EXEC dbo.alterSortOrderColumn 'x_datamask_type_def'
GO
-EXIT
\ No newline at end of file
+EXIT