Skip to content

Commit 8341b36

Browse files
committed
Merge branch 'DBTOOLS-1773-fix-ch-tests' into 'master'
DBTOOLS-1773 fixed clickhouse tests See merge request codekeeper/pgcodekeeper-core!92
2 parents 285afe7 + e3eee00 commit 8341b36

20 files changed

+623
-6598
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2424
- Fixed bug in generating the migration script when adding a column to Log family tables in ClickHouse.
2525
- Fixed a false difference between NOT NULL constraints with the default name in PostgreSQL.
2626
- Fixed adding ONLY for columns in partitioned tables in PostgreSQL.
27+
- Fixed broken ClickHouse tests.
2728

2829
## [12.0.0] - 2025-10-14
2930

CHANGELOG.ru.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
- Исправлена ошибка в генерации скрипта миграции при добавлении колонки в таблицах семейства Log в ClickHouse.
2525
- Исправлено ложное различие ограничений NOT NULL с именем по умолчанию в PostgreSQL.
2626
- Исправлено добавление ONLY для колонок в партиционных таблицах в PostgreSQL.
27+
- Исправлены неработающие тесты ClickHouse.
2728

2829
## [12.0.0] - 2025-10-14
2930

src/test/java/org/pgcodekeeper/core/it/diff/ch/ChDiffTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ class ChDiffTest {
6060
"drop_ch_table",
6161
"drop_ch_user",
6262
"drop_ch_view",
63-
"revoke_ch_privilegies",
64-
// uncovereged cases
65-
// "ch_table_uncovereged_cases_with_diffs",
66-
// "ch_table_uncovereged_cases_without_diffs",
67-
// "ch_view_uncovereged_cases_with_diffs_original",
63+
"revoke_ch_privilegies"
6864

6965
})
7066
void diffTest(String fileNameTemplate) throws IOException, InterruptedException {

src/test/java/org/pgcodekeeper/core/it/parser/ch/CHParserTest.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,22 @@ class CHParserTest {
4242

4343
@ParameterizedTest
4444
@CsvSource({
45-
"ch_database, 0",
46-
"ch_function, 2",
47-
// "ch_index, 0",
48-
// "ch_insert, 0",
49-
// "ch_other, 0",
50-
"ch_show, 0",
51-
"ch_view, 10",
52-
"ch_policy, 0",
53-
"ch_table, 1",
54-
"ch_select, 180",
55-
"ch_privileges, 0",
56-
"ch_user, 0",
57-
"ch_role, 0",
58-
"ch_dictionary, 0",
59-
"ch_update, 0",
60-
"ch_delete, 0"
45+
"ch_database, 0",
46+
"ch_function, 2",
47+
"ch_index, 0",
48+
"ch_insert, 10",
49+
"ch_other, 4",
50+
"ch_show, 0",
51+
"ch_view, 10",
52+
"ch_policy, 0",
53+
"ch_table, 1",
54+
"ch_select, 180",
55+
"ch_privileges, 0",
56+
"ch_user, 0",
57+
"ch_role, 0",
58+
"ch_dictionary, 0",
59+
"ch_update, 0",
60+
"ch_delete, 0"
6161
})
6262
void parse(String fileNameTemplate, int allowedAmbiguity) throws IOException {
6363
List<Object> errors = new ArrayList<>();

src/test/java/org/pgcodekeeper/core/it/parser/ch/ChObjReferencesTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ class ChObjReferencesTest {
3535
@ValueSource(strings = {
3636
"ch_database",
3737
"ch_function",
38+
"ch_index",
39+
"ch_insert",
40+
"ch_other",
3841
"ch_show",
3942
"ch_view",
4043
"ch_policy",

src/test/resources/org/pgcodekeeper/core/it/diff/ch/ch_table_uncovereged_cases_with_diffs_diff.sql

Lines changed: 0 additions & 115 deletions
This file was deleted.

src/test/resources/org/pgcodekeeper/core/it/diff/ch/ch_table_uncovereged_cases_with_diffs_new.sql

Lines changed: 0 additions & 141 deletions
This file was deleted.

0 commit comments

Comments
 (0)