Skip to content

Commit

Permalink
[SPARK-48172][SQL][FOLLOWUP] Fix escaping issues in JDBCDialects
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
Removal of stripMargin from the code in `DockerJDBCIntegrationV2Suite`.

### Why are the changes needed?
apache#46588
Given PR was merged to master/3.5/3.4. This PR broke daily jobs for `OracleIntegrationSuite`. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and spliting `INSERT INTO` statements into multiple lines, all integration tests have passed.

### Does this PR introduce _any_ user-facing change?
No, only loading of the test data was changed to follow language requirements.

### How was this patch tested?
Existing suite was aborted in the job and now it is running.

### Was this patch authored or co-authored using generative AI tooling?
No

Closes apache#46806

Closes apache#46807 from mihailom-db/FixOracleMaster.

Authored-by: Mihailo Milosevic <mihailo.milosevic@databricks.com>
Signed-off-by: Kent Yao <yao@apache.org>
  • Loading branch information
mihailom-db authored and riyaverm-db committed Jun 7, 2024
1 parent 8400573 commit ca46aa3
Showing 1 changed file with 18 additions and 10 deletions.
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 "
+ "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

0 comments on commit ca46aa3

Please sign in to comment.