Skip to content

[SPARK-48172][SQL][FOLLOWUP] Fix escaping issues in JDBCDialects #46807

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

[SPARK-48172][SQL][FOLLOWUP] Fix escaping issues in JDBCDialects #46807

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d54453e
Fix OracleIntegrationSuite for JDK8
mihailom-db May 30, 2024
7d00764
Revert "Fix OracleIntegrationSuite for JDK8"
mihailom-db May 30, 2024
9fd1873
Fix oracle integration test
mihailom-db May 30, 2024
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
28 changes: 18 additions & 10 deletions ...tion-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/DockerJDBCIntegrationV2Suite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,24 @@ abstract class DockerJDBCIntegrationV2Suite extends DockerJDBCIntegrationSuite {
connection.prepareStatement("INSERT INTO employee VALUES (6, 'jen', 12000, 1200)")
.executeUpdate()

connection.prepareStatement(
s"""
|INSERT INTO pattern_testing_table VALUES
|('special_character_quote''_present'),
|('special_character_quote_not_present'),
|('special_character_percent%_present'),
|('special_character_percent_not_present'),
|('special_character_underscore_present'),
|('special_character_underscorenot_present')
""".stripMargin).executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
+ "VALUES ('special_character_quote''_present')")
.executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
Copy link
Member

@yaooqinn yaooqinn May 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can these *not* values be collapsed？

Copy link
Contributor Author

@mihailom-db mihailom-db May 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Collapsing them now would require changes in the ordering of results of tests in V2JDBCTest, as collapsing might reorder inputs, so maybe it is better to keep this change scoped to fixing the JDK problem for CI runs.

+ "VALUES ('special_character_quote_not_present')")
.executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
+ "VALUES ('special_character_percent%_present')")
.executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
+ "VALUES ('special_character_percent_not_present')")
.executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
+ "VALUES ('special_character_underscore_present')")
.executeUpdate()
connection.prepareStatement("INSERT INTO pattern_testing_table "
+ "VALUES ('special_character_underscorenot_present')")
.executeUpdate()
}

def tablePreparation(connection: Connection): Unit
Expand Down