diff --git a/crates/dbx-core/src/db/postgres.rs b/crates/dbx-core/src/db/postgres.rs index 935b278409..83add15ad0 100644 --- a/crates/dbx-core/src/db/postgres.rs +++ b/crates/dbx-core/src/db/postgres.rs @@ -1166,7 +1166,7 @@ pub async fn list_schemas(pool: &Pool) -> Result, String> { const POSTGRES_COLUMNS_SQL: &str = "SELECT a.attname AS column_name, \ format_type(a.atttypid, a.atttypmod) AS full_type, \ - NOT a.attnotnull AS is_nullable, \ + COALESCE(c.is_nullable = 'YES', NOT a.attnotnull) AS is_nullable, \ CASE WHEN a.attgenerated <> '' THEN NULL ELSE pg_get_expr(ad.adbin, ad.adrelid) END AS column_default, \ EXISTS ( \ SELECT 1 FROM pg_constraint co \ @@ -1195,13 +1195,15 @@ const POSTGRES_COLUMNS_SQL: &str = "SELECT a.attname AS column_name, \ LEFT JOIN pg_attrdef ad ON ad.adrelid = a.attrelid AND ad.adnum = a.attnum \ LEFT JOIN pg_depend dep ON dep.refobjid = a.attrelid AND dep.refobjsubid = a.attnum AND dep.deptype = 'i' \ LEFT JOIN pg_sequence pseq ON pseq.seqrelid = dep.objid \ + LEFT JOIN information_schema.columns c \ + ON c.table_schema = $1 AND c.table_name = $2 AND c.column_name = a.attname \ WHERE a.attrelid = (quote_ident($1) || '.' || quote_ident($2))::regclass \ AND a.attnum > 0 AND NOT a.attisdropped \ ORDER BY a.attnum"; const POSTGRES_COLUMNS_COMPAT_SQL: &str = "SELECT a.attname AS column_name, \ format_type(a.atttypid, a.atttypmod) AS full_type, \ - NOT a.attnotnull AS is_nullable, \ + COALESCE(c.is_nullable = 'YES', NOT a.attnotnull) AS is_nullable, \ pg_get_expr(ad.adbin, ad.adrelid) AS column_default, \ EXISTS ( \ SELECT 1 FROM pg_constraint co \ @@ -1220,6 +1222,8 @@ const POSTGRES_COLUMNS_COMPAT_SQL: &str = "SELECT a.attname AS column_name, \ FROM pg_attribute a \ JOIN pg_type t ON t.oid = a.atttypid \ LEFT JOIN pg_attrdef ad ON ad.adrelid = a.attrelid AND ad.adnum = a.attnum \ + LEFT JOIN information_schema.columns c \ + ON c.table_schema = $1 AND c.table_name = $2 AND c.column_name = a.attname \ WHERE a.attrelid = (quote_ident($1) || '.' || quote_ident($2))::regclass \ AND a.attnum > 0 AND NOT a.attisdropped \ ORDER BY a.attnum"; @@ -2325,6 +2329,8 @@ mod tests { assert!(POSTGRES_COLUMNS_SQL.contains("pg_sequence")); assert!(POSTGRES_COLUMNS_SQL.contains("generated by default as identity")); assert!(POSTGRES_COLUMNS_SQL.contains("generated always as identity")); + assert!(POSTGRES_COLUMNS_SQL.contains("COALESCE(c.is_nullable = 'YES', NOT a.attnotnull)")); + assert!(POSTGRES_COLUMNS_SQL.contains("LEFT JOIN information_schema.columns")); } #[test] @@ -2333,6 +2339,8 @@ mod tests { assert!(!POSTGRES_COLUMNS_COMPAT_SQL.contains("pg_sequence")); assert!(POSTGRES_COLUMNS_COMPAT_SQL.contains("NULL::text AS column_extra")); assert!(POSTGRES_COLUMNS_COMPAT_SQL.contains("col_description")); + assert!(POSTGRES_COLUMNS_COMPAT_SQL.contains("COALESCE(c.is_nullable = 'YES', NOT a.attnotnull)")); + assert!(POSTGRES_COLUMNS_COMPAT_SQL.contains("LEFT JOIN information_schema.columns")); } #[test] diff --git a/crates/dbx-core/src/schema.rs b/crates/dbx-core/src/schema.rs index 2cec8a12df..de10511102 100644 --- a/crates/dbx-core/src/schema.rs +++ b/crates/dbx-core/src/schema.rs @@ -2047,6 +2047,35 @@ pub async fn get_table_ddl_core( } if let Some(client) = extract_pool!(&connections, &pool_key, Agent) { drop(connections); + if let Some(config) = db_config.as_ref().filter(|config| is_agent_postgres_metadata_fallback_config(config)) + { + match native_postgres_metadata_pool(state, connection_id, database, config).await { + Ok(Some(pool)) => match pg_ddl(&pool, schema, table).await { + Ok(ddl) => return Ok(ddl), + Err(error) => { + log::warn!( + "[schema][agent:get_table_ddl:postgres-compatible-native-fallback-failed] connection_id={} database={} schema={} table={} error={}", + connection_id, + database, + schema, + table, + error + ); + } + }, + Ok(None) => {} + Err(error) => { + log::warn!( + "[schema][agent:get_table_ddl:postgres-compatible-native-pool-failed] connection_id={} database={} schema={} table={} error={}", + connection_id, + database, + schema, + table, + error + ); + } + } + } let mut client = client.lock().await; return client.get_table_ddl(database, schema, table, agent_metadata_timeout(db_config.as_ref())).await; } diff --git a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java index 642816e457..599734f939 100644 --- a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java +++ b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java @@ -1409,7 +1409,7 @@ public final class DbxJdbcPlugin { String name = rs.getString("COLUMN_NAME"); ObjectNode item = columnNode(result, name); item.put("data_type", rs.getString("TYPE_NAME")); - item.put("is_nullable", rs.getInt("NULLABLE") != DatabaseMetaData.columnNoNulls); + item.put("is_nullable", columnIsNullable(rs)); putNullablePreferValue(item, "column_default", rs.getString("COLUMN_DEF")); item.put("is_primary_key", primaryKeys.contains(name)); item.putNull("extra"); @@ -1421,6 +1421,20 @@ public final class DbxJdbcPlugin { } } + private static boolean columnIsNullable(ResultSet rs) throws SQLException { + try { + String isNullableStr = rs.getString("IS_NULLABLE"); + if ("YES".equalsIgnoreCase(isNullableStr)) { + return true; + } + if ("NO".equalsIgnoreCase(isNullableStr)) { + return false; + } + } catch (SQLException ignored) { + } + return rs.getInt("NULLABLE") != DatabaseMetaData.columnNoNulls; + } + private static void mergeShowFullColumnMetadata(Connection conn, ArrayNode result, String schema, String table) { String target = qualifiedJdbcTableName(schema, table); try (Statement statement = conn.createStatement(); ResultSet rs = statement.executeQuery("SHOW FULL COLUMNS FROM " + target)) { diff --git a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java index 954ac28cbb..0cf9bd8706 100644 --- a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java +++ b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java @@ -638,6 +638,26 @@ final class DbxJdbcPluginTest { assertEquals(true, response.path("result").path(0).path("is_primary_key").asBoolean()); } + @Test + void columnIsNullablePrefersIsNullableStringWhenNullableCodeIsWrong() throws Exception { + Method method = DbxJdbcPlugin.class.getDeclaredMethod("columnIsNullable", ResultSet.class); + method.setAccessible(true); + + ResultSet rs = columnNullableResultSet("YES", DatabaseMetaData.columnNoNulls); + + assertEquals(true, method.invoke(null, rs)); + } + + @Test + void columnIsNullableFallsBackToNullableCodeWhenStringIsMissing() throws Exception { + Method method = DbxJdbcPlugin.class.getDeclaredMethod("columnIsNullable", ResultSet.class); + method.setAccessible(true); + + ResultSet rs = columnNullableResultSet(null, DatabaseMetaData.columnNullable); + + assertEquals(true, method.invoke(null, rs)); + } + @Test void showFullColumnsMetadataCompletesMysqlCompatibleTypesAndComments() throws Exception { Method method = DbxJdbcPlugin.class.getDeclaredMethod( @@ -897,6 +917,25 @@ final class DbxJdbcPluginTest { ); } + private static ResultSet columnNullableResultSet(String isNullable, int nullableCode) { + return (ResultSet) Proxy.newProxyInstance( + DbxJdbcPluginTest.class.getClassLoader(), + new Class[] { ResultSet.class }, + (proxy, method, args) -> { + if ("getString".equals(method.getName()) && "IS_NULLABLE".equals(args[0])) { + if (isNullable == null) { + throw new SQLException("Column not found: IS_NULLABLE"); + } + return isNullable; + } + if ("getInt".equals(method.getName()) && "NULLABLE".equals(args[0])) { + return nullableCode; + } + return defaultValue(method.getReturnType()); + } + ); + } + private static Statement showFullColumnsStatement() { return (Statement) Proxy.newProxyInstance( DbxJdbcPluginTest.class.getClassLoader(),