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 dac14f9 RANGER-2327: Update Ranger db schema to use common sequence
name
dac14f9 is described below
commit dac14f91e94af78204997a6cdf172c786a535a05
Author: Pradeep <[email protected]>
AuthorDate: Tue Jan 29 12:56:27 2019 +0530
RANGER-2327: Update Ranger db schema to use common sequence name
---
.../optimized/current/ranger_core_db_oracle.sql | 16 ++++----
.../patches/037-create-security-zone-schema.sql | 16 ++++----
.../optimized/current/ranger_core_db_postgres.sql | 24 +++++------
.../patches/037-create-security-zone-schema.sql | 26 ++++++------
security-admin/scripts/db_setup.py | 46 +++++++++++-----------
.../ranger/entity/XXSecurityZoneRefGroup.java | 4 +-
.../ranger/entity/XXSecurityZoneRefResource.java | 4 +-
.../ranger/entity/XXSecurityZoneRefService.java | 4 +-
.../ranger/entity/XXSecurityZoneRefUser.java | 4 +-
9 files changed, 71 insertions(+), 73 deletions(-)
diff --git
a/security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql
b/security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql
index f90248a..6b569f2 100644
--- a/security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql
+++ b/security-admin/db/oracle/optimized/current/ranger_core_db_oracle.sql
@@ -84,10 +84,10 @@ call spdropsequence('X_PLUGIN_INFO_SEQ');
call spdropsequence('X_POLICY_LABEL_MAP_SEQ');
call spdropsequence('X_POLICY_LABEL_SEQ');
call spdropsequence('X_UGSYNC_AUDIT_INFO_SEQ');
-call spdropsequence('X_SZONE_REF_ADMIN_GROUP_SEQ');
-call spdropsequence('X_SZONE_REF_ADMIN_USER_SEQ');
-call spdropsequence('X_SZONE_REF_RESOURCE_SEQ');
-call spdropsequence('X_SZONE_REF_SERVICE_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_GROUP_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_USER_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_RESOURCE_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_SERVICE_SEQ');
call spdropsequence('X_RANGER_GLOBAL_STATE_SEQ');
call spdropsequence('X_SECURITY_ZONE_SEQ');
@@ -153,10 +153,10 @@ CREATE SEQUENCE X_POLICY_LABEL_SEQ START WITH 1 INCREMENT
BY 1 NOCACHE NOCYCLE;
CREATE SEQUENCE X_UGSYNC_AUDIT_INFO_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
CREATE SEQUENCE X_SECURITY_ZONE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
CREATE SEQUENCE X_RANGER_GLOBAL_STATE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_SERVICE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_RESOURCE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_ADMIN_USER_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_ADMIN_GROUP_SEQ START WITH 1 INCREMENT BY 1
NOCACHE NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_SERVICE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_RESOURCE_SEQ START WITH 1 INCREMENT BY 1
NOCACHE NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_USER_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_GROUP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
call spdropsequence('X_DB_VERSION_H_SEQ');
CREATE SEQUENCE X_DB_VERSION_H_SEQ START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE;
commit;
diff --git
a/security-admin/db/oracle/patches/037-create-security-zone-schema.sql
b/security-admin/db/oracle/patches/037-create-security-zone-schema.sql
index 357e73f..e71f3db 100644
--- a/security-admin/db/oracle/patches/037-create-security-zone-schema.sql
+++ b/security-admin/db/oracle/patches/037-create-security-zone-schema.sql
@@ -56,19 +56,19 @@ BEGIN
END;/
/
-call spdropsequence('X_SZONE_REF_ADMIN_GROUP_SEQ');
-call spdropsequence('X_SZONE_REF_ADMIN_USER_SEQ');
-call spdropsequence('X_SZONE_REF_RESOURCE_SEQ');
-call spdropsequence('X_SZONE_REF_SERVICE_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_GROUP_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_USER_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_RESOURCE_SEQ');
+call spdropsequence('X_SEC_ZONE_REF_SERVICE_SEQ');
call spdropsequence('X_RANGER_GLOBAL_STATE_SEQ');
call spdropsequence('X_SECURITY_ZONE_SEQ');
CREATE SEQUENCE X_SECURITY_ZONE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
CREATE SEQUENCE X_RANGER_GLOBAL_STATE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_SERVICE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_RESOURCE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_ADMIN_USER_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
-CREATE SEQUENCE X_SZONE_REF_ADMIN_GROUP_SEQ START WITH 1 INCREMENT BY 1
NOCACHE NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_SERVICE_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_RESOURCE_SEQ START WITH 1 INCREMENT BY 1
NOCACHE NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_USER_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
+CREATE SEQUENCE X_SEC_ZONE_REF_GROUP_SEQ START WITH 1 INCREMENT BY 1 NOCACHE
NOCYCLE;
call spdroptable('x_security_zone_ref_resource');
call spdroptable('x_security_zone_ref_group');
diff --git
a/security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql
b/security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql
index 79357ed..a4e93ca 100644
--- a/security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql
+++ b/security-admin/db/postgres/optimized/current/ranger_core_db_postgres.sql
@@ -82,10 +82,10 @@ DROP TABLE IF EXISTS x_portal_user_role CASCADE;
DROP TABLE IF EXISTS x_portal_user CASCADE;
DROP TABLE IF EXISTS x_db_version_h CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_group_seq;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_user_seq;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_resource_seq;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_service_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_group_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_user_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_resource_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_service_seq;
DROP SEQUENCE IF EXISTS x_ranger_global_state_seq;
DROP SEQUENCE IF EXISTS x_security_zone_seq;
DROP SEQUENCE IF EXISTS x_policy_ref_group_seq;
@@ -1333,9 +1333,9 @@ CONSTRAINT x_p_ref_grp_FK_upd_by_id FOREIGN
KEY(upd_by_id) REFERENCES x_portal_u
);
commit;
-CREATE SEQUENCE x_security_zone_ref_service_seq;
+CREATE SEQUENCE x_sec_zone_ref_service_seq;
CREATE TABLE x_security_zone_ref_service (
-id BIGINT DEFAULT nextval('x_security_zone_ref_service_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_service_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -1351,9 +1351,9 @@ CONSTRAINT x_sz_ref_service_FK_service_id FOREIGN KEY
(service_id) REFERENCES x_
CONSTRAINT x_sz_ref_service_FK_service_name FOREIGN KEY (service_name)
REFERENCES x_service (name)
);
-CREATE SEQUENCE x_security_zone_ref_resource_seq;
+CREATE SEQUENCE x_sec_zone_ref_resource_seq;
CREATE TABLE x_security_zone_ref_resource (
-id BIGINT DEFAULT nextval('x_security_zone_ref_resource_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_resource_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -1368,9 +1368,9 @@ CONSTRAINT x_sz_ref_service_FK_zone_id FOREIGN KEY
(zone_id) REFERENCES x_securi
CONSTRAINT x_sz_ref_res_FK_resource_def_id FOREIGN KEY (resource_def_id)
REFERENCES x_resource_def (id)
);
-CREATE SEQUENCE x_security_zone_ref_user_seq;
+CREATE SEQUENCE x_sec_zone_ref_user_seq;
CREATE TABLE x_security_zone_ref_user (
-id BIGINT DEFAULT nextval('x_security_zone_ref_user_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_user_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -1387,9 +1387,9 @@ CONSTRAINT x_sz_ref_user_FK_user_id FOREIGN KEY (user_id)
REFERENCES x_user (id)
CONSTRAINT x_sz_ref_user_FK_user_name FOREIGN KEY (user_name) REFERENCES
x_user (user_name)
);
-CREATE SEQUENCE x_security_zone_ref_group_seq;
+CREATE SEQUENCE x_sec_zone_ref_group_seq;
CREATE TABLE x_security_zone_ref_group (
-id BIGINT DEFAULT nextval('x_security_zone_ref_group_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_group_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
diff --git
a/security-admin/db/postgres/patches/037-create-security-zone-schema.sql
b/security-admin/db/postgres/patches/037-create-security-zone-schema.sql
index 6baa7b9..e81da80 100644
--- a/security-admin/db/postgres/patches/037-create-security-zone-schema.sql
+++ b/security-admin/db/postgres/patches/037-create-security-zone-schema.sql
@@ -51,15 +51,13 @@ select remove_x_policy_zone_id();
select 'delimiter end';
DROP TABLE IF EXISTS x_security_zone_ref_group CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_group_seq;
-DROP TABLE IF EXISTS x_security_zone_ref_group CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_group_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_group_seq;
DROP TABLE IF EXISTS x_security_zone_ref_user CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_user_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_user_seq;
DROP TABLE IF EXISTS x_security_zone_ref_resource CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_resource_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_resource_seq;
DROP TABLE IF EXISTS x_security_zone_ref_service CASCADE;
-DROP SEQUENCE IF EXISTS x_security_zone_ref_service_seq;
+DROP SEQUENCE IF EXISTS x_sec_zone_ref_service_seq;
DROP TABLE IF EXISTS x_ranger_global_state CASCADE;
DROP SEQUENCE IF EXISTS x_ranger_global_state_seq;
DROP TABLE IF EXISTS x_security_zone CASCADE;
@@ -97,9 +95,9 @@ CONSTRAINT x_ranger_global_state_FK_added_by_id FOREIGN KEY
(added_by_id) REFERE
CONSTRAINT x_ranger_global_state_FK_upd_by_id FOREIGN KEY (upd_by_id)
REFERENCES x_portal_user (id)
);
-CREATE SEQUENCE x_security_zone_ref_service_seq;
+CREATE SEQUENCE x_sec_zone_ref_service_seq;
CREATE TABLE x_security_zone_ref_service (
-id BIGINT DEFAULT nextval('x_security_zone_ref_service_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_service_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -115,9 +113,9 @@ CONSTRAINT x_sz_ref_service_FK_service_id FOREIGN KEY
(service_id) REFERENCES x_
CONSTRAINT x_sz_ref_service_FK_service_name FOREIGN KEY (service_name)
REFERENCES x_service (name)
);
-CREATE SEQUENCE x_security_zone_ref_resource_seq;
+CREATE SEQUENCE x_sec_zone_ref_resource_seq;
CREATE TABLE x_security_zone_ref_resource (
-id BIGINT DEFAULT nextval('x_security_zone_ref_resource_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_resource_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -132,9 +130,9 @@ CONSTRAINT x_sz_ref_service_FK_zone_id FOREIGN KEY
(zone_id) REFERENCES x_securi
CONSTRAINT x_sz_ref_res_FK_resource_def_id FOREIGN KEY (resource_def_id)
REFERENCES x_resource_def (id)
);
-CREATE SEQUENCE x_security_zone_ref_user_seq;
+CREATE SEQUENCE x_sec_zone_ref_user_seq;
CREATE TABLE x_security_zone_ref_user (
-id BIGINT DEFAULT nextval('x_security_zone_ref_user_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_user_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
@@ -151,9 +149,9 @@ CONSTRAINT x_sz_ref_user_FK_user_id FOREIGN KEY (user_id)
REFERENCES x_user (id)
CONSTRAINT x_sz_ref_user_FK_user_name FOREIGN KEY (user_name) REFERENCES
x_user (user_name)
);
-CREATE SEQUENCE x_security_zone_ref_group_seq;
+CREATE SEQUENCE x_sec_zone_ref_group_seq;
CREATE TABLE x_security_zone_ref_group (
-id BIGINT DEFAULT nextval('x_security_zone_ref_group_seq'::regclass),
+id BIGINT DEFAULT nextval('x_sec_zone_ref_group_seq'::regclass),
create_time TIMESTAMP DEFAULT NULL NULL,
update_time TIMESTAMP DEFAULT NULL NULL,
added_by_id BIGINT DEFAULT NULL NULL,
diff --git a/security-admin/scripts/db_setup.py
b/security-admin/scripts/db_setup.py
index cab9e59..e16d15e 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -201,7 +201,7 @@ class BaseDB(object):
return ret
def check_table(self, db_name, db_user, db_password, TABLE_NAME):
- if self.XA_DB_FLAVOR == "POSTGRES":
+ if self.XA_DB_FLAVOR == "SQLA":
self.set_options(db_name, db_user, db_password,
TABLE_NAME)
output =
self.execute_query(self.get_check_table_query(TABLE_NAME))
if output.strip(TABLE_NAME + " |"):
@@ -885,28 +885,6 @@ class PostgresConf(BaseDB):
log("[E] LANGUAGE plpgsql creation failed",
"error")
sys.exit(1)
- def set_options(self, db_name, db_user, db_password, TABLE_NAME):
- CT=self.commandTerminator
- get_cmd = self.get_jisql_cmd(db_user, db_password, db_name)
- if is_unix:
- query = get_cmd + CT + " -query \"set option
public.reserved_keywords='LIMIT';\""
- elif os_name == "WINDOWS":
- query = get_cmd + " -query \"set option
public.reserved_keywords='LIMIT';\" -c ;"
- jisql_log(query, db_password)
- ret = subprocessCallWithRetry(shlex.split(query))
- if is_unix:
- query = get_cmd + CT + " -query \"set option
public.max_statement_count=0;\""
- elif os_name == "WINDOWS":
- query = get_cmd + " -query \"set option
public.max_statement_count=0;\" -c;"
- jisql_log(query, db_password)
- ret = subprocessCallWithRetry(shlex.split(query))
- if is_unix:
- query = get_cmd + CT + " -query \"set option
public.max_cursor_count=0;\""
- elif os_name == "WINDOWS":
- query = get_cmd + " -query \"set option
public.max_cursor_count=0;\" -c;"
- jisql_log(query, db_password)
- ret = subprocessCallWithRetry(shlex.split(query))
-
def get_check_table_query(self, TABLE_NAME):
return "select * from (select table_name from
information_schema.tables where table_catalog='%s' and table_name = '%s') as
temp;" % (self.db_name,TABLE_NAME)
@@ -989,6 +967,28 @@ class SqlAnywhereConf(BaseDB):
def get_db_server_status_query(self):
return "select 1;"
+ def set_options(self, db_name, db_user, db_password, TABLE_NAME):
+ CT=self.commandTerminator
+ get_cmd = self.get_jisql_cmd(db_user, db_password, db_name)
+ if is_unix:
+ query = get_cmd + CT + " -query \"set option
public.reserved_keywords='LIMIT';\""
+ elif os_name == "WINDOWS":
+ query = get_cmd + " -query \"set option
public.reserved_keywords='LIMIT';\" -c ;"
+ jisql_log(query, db_password)
+ ret = subprocessCallWithRetry(shlex.split(query))
+ if is_unix:
+ query = get_cmd + CT + " -query \"set option
public.max_statement_count=0;\""
+ elif os_name == "WINDOWS":
+ query = get_cmd + " -query \"set option
public.max_statement_count=0;\" -c;"
+ jisql_log(query, db_password)
+ ret = subprocessCallWithRetry(shlex.split(query))
+ if is_unix:
+ query = get_cmd + CT + " -query \"set option
public.max_cursor_count=0;\""
+ elif os_name == "WINDOWS":
+ query = get_cmd + " -query \"set option
public.max_cursor_count=0;\" -c;"
+ jisql_log(query, db_password)
+ ret = subprocessCallWithRetry(shlex.split(query))
+
def main(argv):
populate_global_dict()
diff --git
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
index 91d9070..0ae6b2f 100644
---
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
+++
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefGroup.java
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlRootElement;
public class XXSecurityZoneRefGroup extends XXDBBase implements
java.io.Serializable{
private static final long serialVersionUID = 1L;
@Id
- @SequenceGenerator(name = "x_security_zone_ref_group_SEQ", sequenceName =
"x_security_zone_ref_group_SEQ", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_security_zone_ref_group_SEQ")
+ @SequenceGenerator(name = "x_sec_zone_ref_group_SEQ", sequenceName =
"x_sec_zone_ref_group_SEQ", allocationSize = 1)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_sec_zone_ref_group_SEQ")
@Column(name = "id")
protected Long id;
diff --git
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
index 3d68ba3..3d7197a 100644
---
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
+++
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefResource.java
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlRootElement;
public class XXSecurityZoneRefResource extends XXDBBase implements
java.io.Serializable{
private static final long serialVersionUID = 1L;
@Id
- @SequenceGenerator(name = "x_security_zone_ref_resource_SEQ", sequenceName
= "x_security_zone_ref_resource_SEQ", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_security_zone_ref_resource_SEQ")
+ @SequenceGenerator(name = "x_sec_zone_ref_resource_SEQ", sequenceName =
"x_sec_zone_ref_resource_SEQ", allocationSize = 1)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_sec_zone_ref_resource_SEQ")
@Column(name = "id")
protected Long id;
diff --git
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
index 56ec018..a2cacc6 100644
---
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
+++
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefService.java
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlRootElement;
public class XXSecurityZoneRefService extends XXDBBase implements
java.io.Serializable{
private static final long serialVersionUID = 1L;
@Id
- @SequenceGenerator(name = "x_security_zone_ref_service_SEQ", sequenceName
= "x_security_zone_ref_service_SEQ", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_security_zone_ref_service_SEQ")
+ @SequenceGenerator(name = "x_sec_zone_ref_service_SEQ", sequenceName =
"x_sec_zone_ref_service_SEQ", allocationSize = 1)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_sec_zone_ref_service_SEQ")
@Column(name = "id")
protected Long id;
diff --git
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
index 3e57366..4af242f 100644
---
a/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
+++
b/security-admin/src/main/java/org/apache/ranger/entity/XXSecurityZoneRefUser.java
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlRootElement;
public class XXSecurityZoneRefUser extends XXDBBase implements
java.io.Serializable{
private static final long serialVersionUID = 1L;
@Id
- @SequenceGenerator(name = "x_security_zone_ref_user_SEQ", sequenceName =
"x_security_zone_ref_user_SEQ", allocationSize = 1)
- @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_security_zone_ref_user_SEQ")
+ @SequenceGenerator(name = "x_sec_zone_ref_user_SEQ", sequenceName =
"x_sec_zone_ref_user_SEQ", allocationSize = 1)
+ @GeneratedValue(strategy = GenerationType.AUTO, generator =
"x_sec_zone_ref_user_SEQ")
@Column(name = "id")
protected Long id;
