Ensure scoped table retrieval for MySQL/MariaDB connections

Updated table retrieval logic to use `connection.catalog` when no specific catalog is provided. Added tests to verify tables are limited to the active database in MySQL, MariaDB, and MSSQL scenarios. Fixed connection URL constants in test files.

Author: zaleslaw

dataframe-jdbc/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/readDataFrameSchema.kt

@@ -432,7 +432,12 @@ public fun DataFrameSchema.Companion.readAllSqlTables(
 
     // exclude system- and other tables without data
     val tableTypes = determinedDbType.tableTypes?.toTypedArray()
-    val tables = metaData.getTables(null, null, null, tableTypes)
+    // Same catalog-scoping fix as in readJdbc.kt: use connection.catalog to avoid reading
+    // tables from all MySQL/MariaDB databases when no specific catalog is given.
+    val effectiveCatalog = try {
+        connection.catalog.takeUnless { it.isNullOrBlank() }
+    } catch (_: Exception) { null }
+    val tables = metaData.getTables(effectiveCatalog, null, null, tableTypes)
 
     val dataFrameSchemas = mutableMapOf<String, DataFrameSchema>()
 

dataframe-jdbc/src/main/kotlin/org/jetbrains/kotlinx/dataframe/io/readJdbc.kt

@@ -765,7 +765,13 @@ public fun DataFrame.Companion.readAllSqlTables(
     validateLimit(limit)
     val determinedDbType = dbType ?: extractDBTypeFromConnection(connection)
     val metaData = connection.metaData
-    val tablesResultSet = retrieveTableMetadata(metaData, catalogue, determinedDbType)
+    // Fall back to connection.catalog so that MySQL/MariaDB connections scoped to a specific database
+    // (e.g. jdbc:mysql://host/mydb) don't leak tables from other databases. MySQL's getTables(null,...)
+    // returns tables from ALL catalogs, unlike PostgreSQL/SQLite where the connection is already scoped.
+    val effectiveCatalogue = catalogue ?: try {
+        connection.catalog.takeUnless { it.isNullOrBlank() }
+    } catch (_: Exception) { null }
+    val tablesResultSet = retrieveTableMetadata(metaData, effectiveCatalogue, determinedDbType)
 
     return buildMap {
         while (tablesResultSet.next()) {

dataframe-jdbc/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/local/mariadbTest.kt

@@ -27,7 +27,7 @@ import java.util.Date
 import kotlin.reflect.typeOf
 import kotlin.time.Instant
 
-private const val URL = "jdbc:mariadb://localhost:3307"
+private const val URL = "jdbc:mariadb://localhost:3306"
 private const val USER_NAME = "root"
 private const val PASSWORD = "pass"
 private const val TEST_DATABASE_NAME = "testKDFdatabase"
@@ -488,4 +488,33 @@ class MariadbTest {
     fun `infer nullability`() {
         inferNullability(connection)
     }
+
+    // https://github.com/Kotlin/dataframe/issues/1746
+    @Test
+    fun `readAllSqlTables without catalogue should only return tables from URL database`() {
+        val secondDb = "testKDFdatabase2"
+        val testRootConn = DriverManager.getConnection(URL, USER_NAME, PASSWORD)
+        try {
+            testRootConn.createStatement().use { stmt ->
+                stmt.executeUpdate("DROP DATABASE IF EXISTS $secondDb")
+                stmt.executeUpdate("CREATE DATABASE $secondDb")
+            }
+            DriverManager.getConnection("$URL/$secondDb", USER_NAME, PASSWORD).use { conn2 ->
+                conn2.createStatement().use { stmt ->
+                    stmt.executeUpdate("CREATE TABLE onlyInDb2 (id INT PRIMARY KEY, val VARCHAR(50))")
+                }
+            }
+
+            DriverManager.getConnection("$URL/$TEST_DATABASE_NAME", USER_NAME, PASSWORD).use { scopedConn ->
+                val tableNames = DataFrame.readAllSqlTables(scopedConn).keys
+
+                tableNames.none { "onlyInDb2" in it } shouldBe true
+                tableNames.any { "table1" in it } shouldBe true
+            }
+        } finally {
+            testRootConn.use { conn ->
+                conn.createStatement().execute("DROP DATABASE IF EXISTS $secondDb")
+            }
+        }
+    }
 }

dataframe-jdbc/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/local/mssqlTest.kt

@@ -296,4 +296,37 @@ class MSSQLTest {
     fun `infer nullability`() {
         inferNullability(connection)
     }
+
+    // https://github.com/Kotlin/dataframe/issues/1746
+    @Test
+    fun `readAllSqlTables without catalogue should only return tables from URL database`() {
+        val secondDb = "testKDFdatabase2"
+        val testRootConn = DriverManager.getConnection(URL, USER_NAME, PASSWORD)
+        try {
+            testRootConn.createStatement().use { stmt ->
+                stmt.executeUpdate(
+                    "IF DB_ID('$secondDb') IS NOT NULL DROP DATABASE $secondDb"
+                )
+                stmt.executeUpdate("CREATE DATABASE $secondDb")
+            }
+            DriverManager.getConnection("$URL;databaseName=$secondDb", USER_NAME, PASSWORD).use { conn2 ->
+                conn2.createStatement().use { stmt ->
+                    stmt.executeUpdate("CREATE TABLE onlyInDb2 (id INT PRIMARY KEY, val VARCHAR(50))")
+                }
+            }
+
+            DriverManager.getConnection("$URL;databaseName=$TEST_DATABASE_NAME", USER_NAME, PASSWORD).use { scopedConn ->
+                val tableNames = DataFrame.readAllSqlTables(scopedConn).keys
+
+                tableNames.none { "onlyInDb2" in it } shouldBe true
+                tableNames.any { "Table1" in it } shouldBe true
+            }
+        } finally {
+            testRootConn.use { conn ->
+                conn.createStatement().execute(
+                    "IF DB_ID('$secondDb') IS NOT NULL DROP DATABASE $secondDb"
+                )
+            }
+        }
+    }
 }

dataframe-jdbc/src/test/kotlin/org/jetbrains/kotlinx/dataframe/io/local/mysqlTest.kt

@@ -27,7 +27,7 @@ import java.util.Date
 import kotlin.reflect.typeOf
 import kotlin.time.Instant
 
-private const val URL = "jdbc:mysql://localhost:3306"
+private const val URL = "jdbc:mysql://localhost:3307"
 private const val USER_NAME = "root"
 private const val PASSWORD = "pass"
 private const val TEST_DATABASE_NAME = "testKDFdatabase"
@@ -491,4 +491,33 @@ class MySqlTest {
     fun `infer nullability`() {
         inferNullability(connection)
     }
+
+    // https://github.com/Kotlin/dataframe/issues/1746
+    @Test
+    fun `readAllSqlTables without catalogue should only return tables from URL database`() {
+        val secondDb = "testKDFdatabase2"
+        val testRootConn = DriverManager.getConnection(URL, USER_NAME, PASSWORD)
+        try {
+            testRootConn.createStatement().use { stmt ->
+                stmt.executeUpdate("DROP DATABASE IF EXISTS $secondDb")
+                stmt.executeUpdate("CREATE DATABASE $secondDb")
+            }
+            DriverManager.getConnection("$URL/$secondDb", USER_NAME, PASSWORD).use { conn2 ->
+                conn2.createStatement().use { stmt ->
+                    stmt.executeUpdate("CREATE TABLE onlyInDb2 (id INT PRIMARY KEY, val VARCHAR(50))")
+                }
+            }
+
+            DriverManager.getConnection("$URL/$TEST_DATABASE_NAME", USER_NAME, PASSWORD).use { scopedConn ->
+                val tableNames = DataFrame.readAllSqlTables(scopedConn).keys
+
+                tableNames.none { "onlyInDb2" in it } shouldBe true
+                tableNames.any { "table1" in it } shouldBe true
+            }
+        } finally {
+            testRootConn.use { conn ->
+                conn.createStatement().execute("DROP DATABASE IF EXISTS $secondDb")
+            }
+        }
+    }
 }