Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix getTableNames for cockroachdb #3752

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ alter table FLW_RU_BATCH_PART

insert into ACT_GE_PROPERTY values ('batch.schema.version', '7.0.0.0', 1);

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
drop table if exists flw_ru_batch_part cascade;
drop table if exists flw_ru_batch cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ protected List<String> getTableNames(DatabaseMetaData databaseMetaData, String c
List<String> tableNames = new ArrayList<>();
try (ResultSet tables = databaseMetaData.getTables(catalog, schema, tableNameFilter, DbSqlSession.JDBC_METADATA_TABLE_TYPES)) {
while (tables.next()) {
if ("cockroachdb".equals(getDbSqlSession().getDbSqlSessionFactory().getDatabaseType())) {
String schemaName = tables.getString("TABLE_SCHEM");
if ("crdb_internal".equals(schemaName)) {
continue;
}
}
String tableName = tables.getString("TABLE_NAME");
tableName = tableName.toUpperCase(Locale.ROOT);
tableNames.add(tableName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ values ('common.schema.version', '7.0.0.0', 1);
insert into ACT_GE_PROPERTY
values ('next.dbid', '1', 1);

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
drop table if exists act_ge_bytearray cascade;
drop table if exists act_ge_property cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ create index ACT_IDX_MODEL_DEPLOYMENT on ACT_RE_MODEL(DEPLOYMENT_ID_);
create index ACT_IDX_PROCDEF_INFO_JSON on ACT_PROCDEF_INFO(INFO_JSON_ID_);
create index ACT_IDX_PROCDEF_INFO_PROC on ACT_PROCDEF_INFO(PROC_DEF_ID_);

-- force-commit


alter table ACT_GE_BYTEARRAY
add constraint ACT_FK_BYTEARR_DEPL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,4 @@ create index ACT_IDX_HI_IDENT_LNK_TASK on ACT_HI_IDENTITYLINK(TASK_ID_);
create index ACT_IDX_HI_IDENT_LNK_PROCINST on ACT_HI_IDENTITYLINK(PROC_INST_ID_);
create index ACT_IDX_HI_TASK_INST_PROCINST on ACT_HI_TASKINST(PROC_INST_ID_);

-- force-commit

Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ drop table if exists act_evt_log cascade;
drop sequence if exists act_evt_log_nr__seq;
drop table if exists act_procdef_info cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ drop table if exists act_hi_detail cascade;
drop table if exists act_hi_comment cascade;
drop table if exists act_hi_attachment cascade;

-- force-commit

Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ create index ACT_IDX_HI_ENT_LNK_REF_SCOPE on ACT_HI_ENTITYLINK(REF_SCOPE_ID_, RE
create index ACT_IDX_HI_ENT_LNK_ROOT_SCOPE on ACT_HI_ENTITYLINK(ROOT_SCOPE_ID_, ROOT_SCOPE_TYPE_, LINK_TYPE_);
create index ACT_IDX_HI_ENT_LNK_SCOPE_DEF on ACT_HI_ENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_, LINK_TYPE_);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ create index ACT_IDX_ENT_LNK_SCOPE_DEF on ACT_RU_ENTITYLINK(SCOPE_DEFINITION_ID_

insert into ACT_GE_PROPERTY values ('entitylink.schema.version', '7.0.0.0', 1);

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_hi_entitylink cascade;

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_ru_entitylink cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ create index ACT_IDX_HI_IDENT_LNK_SCOPE on ACT_HI_IDENTITYLINK(SCOPE_ID_, SCOPE_
create index ACT_IDX_HI_IDENT_LNK_SUB_SCOPE on ACT_HI_IDENTITYLINK(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_IDENT_LNK_SCOPE_DEF on ACT_HI_IDENTITYLINK(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ create index ACT_IDX_IDENT_LNK_SCOPE_DEF on ACT_RU_IDENTITYLINK(SCOPE_DEFINITION

insert into ACT_GE_PROPERTY values ('identitylink.schema.version', '7.0.0.0', 1);

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_hi_identitylink cascade;

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_ru_identitylink cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ create index ACT_IDX_PRIV_MAPPING on ACT_ID_PRIV_MAPPING(PRIV_ID_);
create index ACT_IDX_PRIV_USER on ACT_ID_PRIV_MAPPING(USER_ID_);
create index ACT_IDX_PRIV_GROUP on ACT_ID_PRIV_MAPPING(GROUP_ID_);

-- force-commit


alter table ACT_ID_MEMBERSHIP
add constraint ACT_FK_MEMB_GROUP
Expand All @@ -108,4 +108,3 @@ alter table ACT_ID_PRIV
add constraint ACT_UNIQ_PRIV_NAME
unique (NAME_);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ drop table if exists act_id_token cascade;
drop table if exists act_id_priv cascade;
drop table if exists act_id_priv_mapping cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ create index ACT_IDX_EJOB_SCOPE on ACT_RU_EXTERNAL_JOB(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_EJOB_SUB_SCOPE on ACT_RU_EXTERNAL_JOB(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_EJOB_SCOPE_DEF on ACT_RU_EXTERNAL_JOB(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);

-- force-commit


alter table ACT_RU_JOB
add constraint ACT_FK_JOB_EXCEPTION
Expand Down Expand Up @@ -261,4 +261,3 @@ alter table ACT_RU_EXTERNAL_JOB

insert into ACT_GE_PROPERTY values ('job.schema.version', '7.0.0.0', 1);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ drop table if exists act_ru_deadletter_job cascade;
drop table if exists act_ru_history_job cascade;
drop table if exists act_ru_external_job cascade;

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,3 @@ create index ACT_IDX_HI_TASK_SCOPE on ACT_HI_TASKINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SUB_SCOPE on ACT_HI_TASKINST(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_TASK_SCOPE_DEF on ACT_HI_TASKINST(SCOPE_DEFINITION_ID_, SCOPE_TYPE_);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ create index ACT_IDX_TASK_SCOPE_DEF on ACT_RU_TASK(SCOPE_DEFINITION_ID_, SCOPE_T

insert into ACT_GE_PROPERTY values ('task.schema.version', '7.0.0.0', 1);

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
drop table if exists act_hi_taskinst cascade;
drop table if exists act_hi_TSK_log cascade;

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
drop table if exists act_ru_task cascade;

-- force-commit

Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ create index ACT_IDX_HI_PROCVAR_NAME_TYPE on ACT_HI_VARINST(NAME_, VAR_TYPE_);
create index ACT_IDX_HI_VAR_SCOPE_ID_TYPE on ACT_HI_VARINST(SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_HI_VAR_SUB_ID_TYPE on ACT_HI_VARINST(SUB_SCOPE_ID_, SCOPE_TYPE_);

-- force-commit
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ create index ACT_IDX_RU_VAR_SCOPE_ID_TYPE on ACT_RU_VARIABLE(SCOPE_ID_, SCOPE_TY
create index ACT_IDX_RU_VAR_SUB_ID_TYPE on ACT_RU_VARIABLE(SUB_SCOPE_ID_, SCOPE_TYPE_);
create index ACT_IDX_VAR_BYTEARRAY on ACT_RU_VARIABLE(BYTEARRAY_ID_);

-- force-commit


alter table ACT_RU_VARIABLE
add constraint ACT_FK_VAR_BYTEARRAY
Expand All @@ -31,4 +31,4 @@ alter table ACT_RU_VARIABLE

insert into ACT_GE_PROPERTY values ('variable.schema.version', '7.0.0.0', 1);

-- force-commit

Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_hi_varinst cascade;

-- force-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
drop table if exists act_ru_variable cascade;

-- force-commit
Loading