This is an automated email from the ASF dual-hosted git repository.
cloud-fan pushed a commit to branch branch-4.x
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-4.x by this push:
new 7433a5c4edad Revert "[SPARK-52825][SQL] Recognize well-known JDBC URL
prefixes in MySQL/PostgresDialect"
7433a5c4edad is described below
commit 7433a5c4edad3d7a2a1966d10023a57022f2cd82
Author: Wenchen Fan <[email protected]>
AuthorDate: Thu Jul 23 04:32:37 2026 +0000
Revert "[SPARK-52825][SQL] Recognize well-known JDBC URL prefixes in
MySQL/PostgresDialect"
This reverts commit 79be66a04b96512c184f39f12b3b144ec28f04eb.
---
sql/core/src/main/scala/org/apache/spark/sql/jdbc/MySQLDialect.scala | 2 +-
sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala | 2 +-
sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MySQLDialect.scala
b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MySQLDialect.scala
index d5a1aa8bd712..b301c0c0bd5b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MySQLDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/MySQLDialect.scala
@@ -37,7 +37,7 @@ import org.apache.spark.sql.types._
private case class MySQLDialect() extends JdbcDialect with SQLConfHelper with
NoLegacyJDBCError {
override def canHandle(url : String): Boolean =
- url.toLowerCase(Locale.ROOT).matches("jdbc:(.*:)?mysql.*")
+ url.toLowerCase(Locale.ROOT).startsWith("jdbc:mysql")
private val distinctUnsupportedAggregateFunctions =
Set("VAR_POP", "VAR_SAMP", "STDDEV_POP", "STDDEV_SAMP")
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
index 068c62b1736b..9fc69594932b 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
@@ -41,7 +41,7 @@ private case class PostgresDialect()
extends JdbcDialect with SQLConfHelper with NoLegacyJDBCError {
override def canHandle(url: String): Boolean =
- url.toLowerCase(Locale.ROOT).matches("jdbc:(.*:)?postgresql.*")
+ url.toLowerCase(Locale.ROOT).startsWith("jdbc:postgresql")
// See https://www.postgresql.org/docs/8.4/functions-aggregate.html
private val supportedAggregateFunctions = Set("MAX", "MIN", "SUM", "COUNT",
"AVG",
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
index de863b244be8..279ac4a1a62f 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
@@ -912,9 +912,7 @@ class JDBCSuite extends SharedSparkSession {
test("Default jdbc dialect registration") {
assert(JdbcDialects.get("jdbc:mysql://127.0.0.1/db") === MySQLDialect())
- assert(JdbcDialects.get("jdbc:aws-wrapper:mysql://127.0.0.1/db") ===
MySQLDialect())
assert(JdbcDialects.get("jdbc:postgresql://127.0.0.1/db") ===
PostgresDialect())
- assert(JdbcDialects.get("jdbc:aws-wrapper:postgresql://127.0.0.1/db") ===
PostgresDialect())
assert(JdbcDialects.get("jdbc:db2://127.0.0.1/db") === DB2Dialect())
assert(JdbcDialects.get("jdbc:sqlserver://127.0.0.1/db") ===
MsSqlServerDialect())
assert(JdbcDialects.get("jdbc:derby:db") === DerbyDialect())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
