From a2d1aaa49fac101ea52e95f6b7f9b54424876122 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 8 Feb 2024 10:50:50 +0100 Subject: [PATCH] [jOOQ/jOOQ#16237] SQL Server is also affected --- .../src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java | 1 + jOOQ-meta/src/main/java/org/jooq/meta/h2/H2Database.java | 1 + jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java | 1 + jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java | 1 + .../src/main/java/org/jooq/meta/postgres/PostgresDatabase.java | 1 + jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteDatabase.java | 1 + 6 files changed, 6 insertions(+) diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java index c2eda598d3..e2c50197ae 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/firebird/FirebirdDatabase.java @@ -352,6 +352,7 @@ public class FirebirdDatabase extends AbstractDatabase implements ResultQueryDat final boolean unique = index.get(i.RDB$UNIQUE_FLAG, boolean.class); // [#6310] [#6620] Function-based indexes are not yet supported + // [#16237] Alternatively, the column could be hidden or excluded for (Record column : columns) if (table.getColumn(column.get(s.RDB$FIELD_NAME)) == null) continue indexLoop; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/h2/H2Database.java b/jOOQ-meta/src/main/java/org/jooq/meta/h2/H2Database.java index f426642532..5490cb61cb 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/h2/H2Database.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/h2/H2Database.java @@ -257,6 +257,7 @@ public class H2Database extends AbstractDatabase implements ResultQueryDatabase final boolean unique = !index.get(INDEXES.NON_UNIQUE, boolean.class); // [#6310] [#6620] Function-based indexes are not yet supported + // [#16237] Alternatively, the column could be hidden or excluded for (Record column : columns) if (table.getColumn(column.get(INDEXES.COLUMN_NAME)) == null) continue indexLoop; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java index 8c0af6c9b6..c648cfc2fc 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/hsqldb/HSQLDBDatabase.java @@ -206,6 +206,7 @@ public class HSQLDBDatabase extends AbstractDatabase implements ResultQueryDatab final boolean unique = !index.get(SYSTEM_INDEXINFO.NON_UNIQUE, boolean.class); // [#6310] [#6620] Function-based indexes are not yet supported + // [#16237] Alternatively, the column could be hidden or excluded for (Record column : cols) if (table.getColumn(column.get(SYSTEM_INDEXINFO.COLUMN_NAME)) == null) continue indexLoop; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java index 6df1d02fc5..d2c4b901d0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/mysql/MySQLDatabase.java @@ -209,6 +209,7 @@ public class MySQLDatabase extends AbstractDatabase implements ResultQueryDataba final boolean unique = !index.get(STATISTICS.NON_UNIQUE, boolean.class); // [#6310] [#6620] Function-based indexes are not yet supported + // [#16237] Alternatively, the column could be hidden or excluded for (Record column : columns) if (table.getColumn(column.get(STATISTICS.COLUMN_NAME)) == null) continue indexLoop; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java index 7a6d1a7e2b..d82ef9e32c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/postgres/PostgresDatabase.java @@ -262,6 +262,7 @@ public class PostgresDatabase extends AbstractDatabase implements ResultQueryDat // [#6310] [#6620] Function-based indexes are not yet supported // [#11047] Even without supporting function-based indexes, we might have to parse // the column expression, because it might be quoted + // [#16237] Alternatively, the column could be hidden or excluded if (table.getColumn(columns[k]) == null && table.getColumn(columns[k] = tryParseColumnName(columns[k])) == null) continue indexLoop; diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteDatabase.java index 342659fc2b..ac9d5a9386 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/sqlite/SQLiteDatabase.java @@ -201,6 +201,7 @@ public class SQLiteDatabase extends AbstractDatabase implements ResultQueryDatab final boolean unique = index.get(fUnique); // [#6310] [#6620] Function-based indexes are not yet supported + // [#16237] Alternatively, the column could be hidden or excluded for (Record column : columns) if (table.getColumn(column.get(fColumnName)) == null) continue indexLoop;