Skip to content

fix: TAP-5869 mysql discover tables of system versioned type #486

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

Merged
jarad0628 merged 3 commits into from
Mar 3, 2025
Merged

fix: TAP-5869 mysql discover tables of system versioned type #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4399a2
fix: TAP-5869 mysql discover tables of system versioned type
mnianqi Feb 27, 2025
37f917f
fix: TAP-5869 fix unit test
mnianqi Feb 28, 2025
7f4b25c
fix: TAP-5869 fix unit test
mnianqi Feb 28, 2025
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
2 changes: 1 addition & 1 deletion connectors-common/connector-core/src/test/java/io/tapdata/base/BeforeAndAfterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ void testAfterContainsNull() {
entry("name", "jarad"),
entry("birth", "2022-05-29")
);
// lastAfter.put("age", null);
lastAfter.put("age", null);
assertBeforeAndAfter(COMMON_ALL_COLUMN, COMMON_UNIQUE_CONDITION, after, before, lastAfter, lastBefore);
}
}
2 changes: 1 addition & 1 deletion ...ectors-common/mysql-core/src/main/java/io/tapdata/connector/mysql/MysqlJdbcContextV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ public void queryWithStream(String sql, ResultSetConsumer resultSetConsumer) thr
"\tINFORMATION_SCHEMA.TABLES\n" +
"WHERE\n" +
"\tTABLE_SCHEMA = '%s' %s\n" +
"\tAND TABLE_TYPE = 'BASE TABLE'";
"\tAND (TABLE_TYPE = 'BASE TABLE' OR TABLE_TYPE = 'SYSTEM VERSIONED')";

private static final String MYSQL_ALL_COLUMN =
"SELECT TABLE_NAME `tableName`,\n" +
Expand Down
7 changes: 3 additions & 4 deletions connectors-common/sql-core/src/test/java/io/tapdata/common/dml/NormalWriteRecorderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.tapdata.common.dml;

import io.tapdata.pdk.apis.entity.ConnectionOptions;
import io.tapdata.pdk.apis.entity.WriteListResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
Expand Down Expand Up @@ -40,7 +39,7 @@ void beforeEach() throws SQLException {
void testNormal() throws SQLException {
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
ReflectionTestUtils.setField(recorder, "updatePolicy", ConnectionOptions.DML_UPDATE_POLICY_IGNORE_ON_NON_EXISTS);
ReflectionTestUtils.setField(recorder, "updatePolicy", WritePolicyEnum.IGNORE_ON_NONEXISTS);
Map<String, Object> after = map(entry("id", 1), entry("name", "name"));
Map<String, Object> before = map(entry("id", 1));
doCallRealMethod().when(recorder).addUpdateBatch(any(), any(), any());
Expand All @@ -53,7 +52,7 @@ void testNormal() throws SQLException {
void testInsertUpdate() throws SQLException {
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
ReflectionTestUtils.setField(recorder, "updatePolicy", ConnectionOptions.DML_UPDATE_POLICY_INSERT_ON_NON_EXISTS);
ReflectionTestUtils.setField(recorder, "updatePolicy", WritePolicyEnum.INSERT_ON_NONEXISTS);
Map<String, Object> after = map(entry("id", 1), entry("name", "name"));
Map<String, Object> before = map(entry("id", 1));
doCallRealMethod().when(recorder).addUpdateBatch(any(), any(), any());
Expand All @@ -66,7 +65,7 @@ void testInsertUpdate() throws SQLException {
void testEmptyAfter() throws SQLException {
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
doAnswer(invocationOnMock -> null).when(recorder).insertUpdate(any(), any(), any());
ReflectionTestUtils.setField(recorder, "updatePolicy", ConnectionOptions.DML_UPDATE_POLICY_INSERT_ON_NON_EXISTS);
ReflectionTestUtils.setField(recorder, "updatePolicy", WritePolicyEnum.INSERT_ON_NONEXISTS);
Map<String, Object> after = Collections.emptyMap();
Map<String, Object> before = map(entry("id", 1));
doCallRealMethod().when(recorder).addUpdateBatch(any(), any(), any());
Expand Down