Support MERGE for MySQL connector #24428
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ebyhr
reviewed
Dec 10, 2024
plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/BaseMySqlConnectorTest.java
Outdated
Show resolved
Hide resolved
plugin/trino-base-jdbc/src/test/java/io/trino/plugin/jdbc/BaseJdbcConnectorTest.java
Show resolved
Hide resolved
chenjian2664
force-pushed
the
mysql_merge
branch
4 times, most recently
from
b4e8e08 to
c0b86ce
Compare
Is there a test verifying error message when executing MERGE statement on table without primary keys? |
chenjian2664
force-pushed
the
mysql_merge
branch
3 times, most recently
from
a4d84a0 to
3deed31
Compare
chenjian2664
force-pushed
the
mysql_merge
branch
2 times, most recently
from
537b087 to
1146ad7
Compare
|
This pull request has gone a while without any activity. Tagging for triage help: @mosabua |
chenjian2664
force-pushed
the
mysql_merge
branch
2 times, most recently
from
d20d159 to
5b93e35
Compare
|
Dont forget the docs update .. should be an easy one line include now .. |
chenjian2664
force-pushed
the
mysql_merge
branch
from
5b93e35 to
d25cda3
Compare
|
Thank you @chenjian2664 |
ebyhr
reviewed
Jan 16, 2025
| protected void testUpdateWithSubquery() | ||
| { | ||
| assertThatThrownBy(super::testUpdateWithSubquery).hasMessageContaining("Non-transactional MERGE is disabled"); | ||
| abort("skipped"); |
There was a problem hiding this comment.
Why does this test have abort and other two tests don't have the call?
Comment on lines
+56
to
+57
| case SUPPORTS_ROW_LEVEL_UPDATE: | ||
| case SUPPORTS_MERGE: |
| @Override | ||
| protected boolean hasBehavior(TestingConnectorBehavior connectorBehavior) | ||
| { | ||
| switch (connectorBehavior) { | ||
| case SUPPORTS_RENAME_SCHEMA: | ||
| return false; | ||
|
|
||
| case SUPPORTS_ROW_LEVEL_UPDATE: | ||
| case SUPPORTS_MERGE: | ||
| return true; |
There was a problem hiding this comment.
Move true cases above false case.
| protected TestTable createTestTableForWrites(String tablePrefix) | ||
| { | ||
| TestTable table = super.createTestTableForWrites(tablePrefix); | ||
| String tableName = table.getName(); |
| protected TestTable createTestTableForWrites(String namePrefix, String tableDefinition, String primaryKey) | ||
| { | ||
| TestTable testTable = super.createTestTableForWrites(namePrefix, tableDefinition, primaryKey); | ||
| String tableName = testTable.getName(); |
| protected TestTable createTestTableForWrites(String namePrefix, String tableDefinition, List<String> rowsToInsert, String primaryKey) | ||
| { | ||
| TestTable testTable = super.createTestTableForWrites(namePrefix, tableDefinition, rowsToInsert, primaryKey); | ||
| String tableName = testTable.getName(); |
| } | ||
|
|
||
| @Test | ||
| public void testMergeTargetWithNoPrimaryKeys() |
There was a problem hiding this comment.
Suggested change
| public void testMergeTargetWithNoPrimaryKeys() | |
| public void testMergeTargetWithoutPrimaryKeys() |
Comment on lines
+104
to
+109
| assertQueryFails(format("DELETE FROM %s WHERE a IS NOT NULL AND abs(a + b) > 10", tableName), "The connector can not perform merge on the target table without primary keys"); | ||
| assertQueryFails(format("UPDATE %s SET a = a+b WHERE a IS NOT NULL AND (a + b) > 10", tableName), "The connector can not perform merge on the target table without primary keys"); | ||
| assertQueryFails(format("MERGE INTO %s t USING (VALUES (3, 3)) AS s(x, y) " + | ||
| " ON t.a = s.x " + | ||
| " WHEN MATCHED THEN UPDATE SET b = y " + | ||
| " WHEN NOT MATCHED THEN INSERT (a, b) VALUES (s.x, s.y) ", tableName), "The connector can not perform merge on the target table without primary keys"); |
There was a problem hiding this comment.
This exception comes from DefaultJdbcMetadata, not MySQL connector. Can we move this test to BaseJdbcConnectorTest?
|
|
||
| Set<String> primaryKeyNames = new HashSet<>(); | ||
| while (primaryKeys.next()) { | ||
| String columnName = primaryKeys.getString("COLUMN_NAME"); |
| continue; | ||
| } | ||
| JdbcTypeHandle handle = columnHandle.getJdbcTypeHandle(); | ||
| CaseSensitivity caseSensitivity = handle.caseSensitivity().orElse(CASE_INSENSITIVE); |
There was a problem hiding this comment.
Why do we want to set CASE_INSENSITIVE by default?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The tests that are updated in the
BaseJdbcConnectorTestbecause current the implementation of MERGE for Mysql connector requires the table has primary keys, thus modified the table creation logic to usecreateTestTableForWrites, allowing the MySQL connector test class to override it and add primary keys as needed.Release notes