From 24033b10007339aa9487a4d0f78313d601c42a05 Mon Sep 17 00:00:00 2001 From: Gil Mizrahi Date: Thu, 26 Oct 2023 10:34:48 +0300 Subject: [PATCH] move postgres tests to other-db-tests (#108) ### What We'd like to have all of the tests in the same place. This also helps with compilation time. ### How - Copy citus - Fill in missing tests and make sure all snapshots are renames - Remove ndc-postgres/tests - Fix references --- .github/test-configuration.json | 22 +++--- .github/workflows/cargo-test.yaml | 9 ++- Cargo.lock | 2 + .../ndc-postgres/tests/capabilities_tests.rs | 6 -- .../ndc-postgres/tests/common/mod.rs | 28 ------- .../ndc-postgres/tests/configuration_tests.rs | 76 ------------------- .../ndc-postgres/tests/explain_tests.rs | 33 -------- .../ndc-postgres/tests/mutation_tests.rs | 29 ------- .../ndc-postgres/tests/ndc_tests.rs | 48 ------------ .../ndc-postgres/tests/schema_tests.rs | 7 -- ...ates__select_where_album_id_less_than.snap | 9 --- crates/tests/other-db-tests/Cargo.toml | 4 + .../other-db-tests/src/capabilities_tests.rs | 7 ++ .../src/citus/configuration_tests.rs | 4 +- .../src/cockroach/configuration_tests.rs | 4 +- crates/tests/other-db-tests/src/lib.rs | 9 ++- .../other-db-tests/src/postgres/common.rs | 10 +++ .../src/postgres/configuration_tests.rs | 48 ++++++++++++ .../src/postgres/explain_tests.rs | 34 +++++++++ .../tests/other-db-tests/src/postgres/mod.rs | 7 ++ .../src/postgres/mutation_tests.rs | 24 ++++++ .../other-db-tests/src/postgres/ndc_tests.rs | 13 ++++ .../src/postgres}/query_tests.rs | 31 ++++---- .../src/postgres/schema_tests.rs | 9 +++ ...e_initial_configuration_is_unchanged.snap} | 4 +- ...tion_tests__get_configuration_schema.snap} | 2 +- ...n_tests__get_rawconfiguration_schema.snap} | 2 +- ...explain_tests__explain__select_by_pk.snap} | 2 +- ...s__explain__select_where_name_nilike.snap} | 2 +- ...ests__explain__select_where_variable.snap} | 2 +- ..._mutation_tests__basic__select_by_pk.snap} | 2 +- ..._aggregation__aggregate_count_albums.snap} | 2 +- ...n__aggregate_count_albums_plus_field.snap} | 2 +- ...ation__aggregate_count_artist_albums.snap} | 2 +- ...egate_count_artist_albums_plus_field.snap} | 2 +- ...stgres__query_tests__basic__select_5.snap} | 2 +- ...es__query_tests__basic__select_by_pk.snap} | 2 +- ..._tests__basic__select_int_and_string.snap} | 2 +- ...tests__native_queries__select_artist.snap} | 2 +- ...lbum_by_title_relationship_arguments.snap} | 2 +- ...ive_queries__select_artists_below_id.snap} | 2 +- ...__select_order_by_artist_album_count.snap} | 2 +- ...ve_queries__select_sort_relationship.snap} | 2 +- ...e_queries__select_where_relationship.snap} | 2 +- ...s__select_where_album_id_equals_self.snap} | 2 +- ...__select_where_album_id_greater_than.snap} | 2 +- ...re_album_id_greater_than_or_equal_to.snap} | 2 +- ...s__select_where_album_id_is_not_null.snap} | 2 +- ...ates__select_where_album_id_less_than.snap | 9 +++ ...where_album_id_less_than_or_equal_to.snap} | 2 +- ..._tests__predicates__select_where_and.snap} | 2 +- ...tes__select_where_array_relationship.snap} | 2 +- ...ts__predicates__select_where_name_eq.snap} | 2 +- ..._predicates__select_where_name_ilike.snap} | 2 +- ...ts__predicates__select_where_name_in.snap} | 2 +- ...predicates__select_where_name_iregex.snap} | 2 +- ...__predicates__select_where_name_like.snap} | 2 +- ...s__predicates__select_where_name_neq.snap} | 2 +- ...predicates__select_where_name_nilike.snap} | 2 +- ...redicates__select_where_name_niregex.snap} | 2 +- ...predicates__select_where_name_not_in.snap} | 2 +- ...edicates__select_where_name_not_like.snap} | 2 +- ...predicates__select_where_name_nregex.snap} | 2 +- ..._predicates__select_where_name_regex.snap} | 2 +- ...y_tests__predicates__select_where_or.snap} | 2 +- ...dicates__select_where_related_exists.snap} | 2 +- ...cates__select_where_unrelated_exists.snap} | 2 +- ...s__predicates__select_where_variable.snap} | 2 +- ...redicates__select_where_variable_int.snap} | 2 +- ...elationships__dup_array_relationship.snap} | 2 +- ...ionships__nested_array_relationships.snap} | 2 +- ...onships__nested_object_relationships.snap} | 2 +- ..._album_object_relationship_to_artist.snap} | 2 +- ...t_artist_array_relationship_to_album.snap} | 2 +- ...__very_nested_recursive_relationship.snap} | 2 +- ...g__select_order_by_album_artist_name.snap} | 2 +- ...__select_order_by_artist_album_count.snap} | 2 +- ...lect_order_by_artist_album_count_agg.snap} | 2 +- ...sorting__select_order_by_artist_name.snap} | 2 +- ...elect_order_by_artist_name_with_name.snap} | 2 +- ...tests__sorting__select_order_by_name.snap} | 2 +- ...k_order_by_artist_id_and_album_title.snap} | 2 +- ...d_relationship_column_with_predicate.snap} | 2 +- ...ionship_column_with_predicate_exists.snap} | 2 +- ...by_relationship_count_with_predicate.snap} | 2 +- ...ery_tests__types__select_value_types.snap} | 2 +- ...chema_tests__schema_test__get_schema.snap} | 2 +- ...capabilities_tests__get_capabilities.snap} | 4 +- .../src/common_tests/configuration_tests.rs | 23 +++++- crates/tests/tests-common/src/router.rs | 17 +++++ justfile | 5 +- 91 files changed, 316 insertions(+), 341 deletions(-) delete mode 100644 crates/connectors/ndc-postgres/tests/capabilities_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/common/mod.rs delete mode 100644 crates/connectors/ndc-postgres/tests/configuration_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/explain_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/mutation_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/ndc_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/schema_tests.rs delete mode 100644 crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than.snap create mode 100644 crates/tests/other-db-tests/src/capabilities_tests.rs create mode 100644 crates/tests/other-db-tests/src/postgres/common.rs create mode 100644 crates/tests/other-db-tests/src/postgres/configuration_tests.rs create mode 100644 crates/tests/other-db-tests/src/postgres/explain_tests.rs create mode 100644 crates/tests/other-db-tests/src/postgres/mod.rs create mode 100644 crates/tests/other-db-tests/src/postgres/mutation_tests.rs create mode 100644 crates/tests/other-db-tests/src/postgres/ndc_tests.rs rename crates/{connectors/ndc-postgres/tests => tests/other-db-tests/src/postgres}/query_tests.rs (95%) create mode 100644 crates/tests/other-db-tests/src/postgres/schema_tests.rs rename crates/{connectors/ndc-postgres/tests/snapshots/configuration_tests__configure_initial_configuration_is_unchanged.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap} (99%) rename crates/{connectors/ndc-postgres/tests/snapshots/configuration_tests__get_configuration_schema.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap} (99%) rename crates/{connectors/ndc-postgres/tests/snapshots/configuration_tests__get_rawconfiguration_schema.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_rawconfiguration_schema.snap} (99%) rename crates/{connectors/ndc-postgres/tests/snapshots/explain_tests__select_by_pk.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_by_pk.snap} (88%) rename crates/{connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_name_nilike.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_name_nilike.snap} (90%) rename crates/{connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_variable.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_variable.snap} (89%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_by_pk.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__mutation_tests__basic__select_by_pk.snap} (63%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums.snap} (80%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums_plus_field.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums_plus_field.snap} (89%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums.snap} (92%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap} (95%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_5.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_5.snap} (82%) rename crates/{connectors/ndc-postgres/tests/snapshots/mutation_tests__basic__select_by_pk.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_by_pk.snap} (64%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_int_and_string.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_int_and_string.snap} (68%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist.snap} (81%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap} (94%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artists_below_id.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artists_below_id.snap} (78%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_order_by_artist_album_count.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_order_by_artist_album_count.snap} (96%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_sort_relationship.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_sort_relationship.snap} (87%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_where_relationship.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_where_relationship.snap} (86%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_equals_self.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_equals_self.snap} (71%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than.snap} (92%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap} (93%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_is_not_null.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_is_not_null.snap} (84%) create mode 100644 crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than.snap rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap} (70%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_and.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_and.snap} (62%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_array_relationship.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_array_relationship.snap} (85%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_eq.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_eq.snap} (68%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_ilike.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_ilike.snap} (91%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_in.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_in.snap} (68%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_iregex.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_iregex.snap} (67%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_like.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_like.snap} (91%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_neq.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_neq.snap} (87%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nilike.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nilike.snap} (84%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_niregex.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_niregex.snap} (87%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_in.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_in.snap} (87%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_like.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_like.snap} (86%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nregex.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nregex.snap} (92%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_regex.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_regex.snap} (67%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_or.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_or.snap} (69%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_related_exists.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_related_exists.snap} (85%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_unrelated_exists.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_unrelated_exists.snap} (80%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable.snap} (80%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable_int.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable_int.snap} (81%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__dup_array_relationship.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__dup_array_relationship.snap} (95%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_array_relationships.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_array_relationships.snap} (97%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_object_relationships.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_object_relationships.snap} (96%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_album_object_relationship_to_artist.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap} (93%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_artist_array_relationship_to_album.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_artist_array_relationship_to_album.snap} (94%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__relationships__very_nested_recursive_relationship.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap} (98%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_album_artist_name.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_album_artist_name.snap} (82%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count.snap} (75%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count_agg.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count_agg.snap} (75%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name.snap} (85%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name_with_name.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap} (94%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_name.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_name.snap} (84%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap} (83%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap} (70%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap} (83%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_relationship_count_with_predicate.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_relationship_count_with_predicate.snap} (81%) rename crates/{connectors/ndc-postgres/tests/snapshots/query_tests__types__select_value_types.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__types__select_value_types.snap} (90%) rename crates/{connectors/ndc-postgres/tests/snapshots/schema_tests__get_schema.snap => tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__schema_tests__schema_test__get_schema.snap} (99%) rename crates/{connectors/ndc-postgres/tests/snapshots/capabilities_tests__get_capabilities.snap => tests/other-db-tests/src/snapshots/other_db_tests__capabilities_tests__capabilities_tests__get_capabilities.snap} (63%) diff --git a/.github/test-configuration.json b/.github/test-configuration.json index f8381f346..5757b0cb4 100644 --- a/.github/test-configuration.json +++ b/.github/test-configuration.json @@ -1,6 +1,6 @@ { "ndc-postgres-citus": { - "package": "ndc-postgres", + "feature": "citus", "flags": "", "services": "citus", "env": { @@ -8,7 +8,7 @@ } }, "ndc-postgres-cockroach": { - "package": "ndc-postgres", + "feature": "cockroach", "flags": "", "services": "cockroach", "env": { @@ -16,8 +16,8 @@ } }, "ndc-postgres-12": { - "package": "ndc-postgres", - "flags": "-E 'not test(test_configure)'", + "feature": "postgres", + "flags": "-E 'not test(configure_initial_configuration_is_unchanged) and not test(configure_is_idempotent)'", "services": "postgres", "env": { "POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64002", @@ -25,8 +25,8 @@ } }, "ndc-postgres-13": { - "package": "ndc-postgres", - "flags": "-E 'not test(test_configure)'", + "feature": "postgres", + "flags": "-E 'not test(configure_initial_configuration_is_unchanged) and not test(configure_is_idempotent)'", "services": "postgres", "env": { "POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64002", @@ -34,8 +34,8 @@ } }, "ndc-postgres-14": { - "package": "ndc-postgres", - "flags": "-E 'not test(test_configure)'", + "feature": "postgres", + "flags": "-E 'not test(configure_initial_configuration_is_unchanged) and not test(configure_is_idempotent)'", "services": "postgres", "env": { "POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64002", @@ -43,8 +43,8 @@ } }, "ndc-postgres-15": { - "package": "ndc-postgres", - "flags": "-E 'not test(test_configure)'", + "feature": "postgres", + "flags": "-E 'not test(configure_initial_configuration_is_unchanged) and not test(configure_is_idempotent)'", "services": "postgres", "env": { "POSTGRESQL_CONNECTION_STRING": "postgresql://postgres:password@localhost:64002", @@ -52,7 +52,7 @@ } }, "ndc-postgres-16": { - "package": "ndc-postgres", + "feature": "postgres", "flags": "", "services": "postgres", "env": { diff --git a/.github/workflows/cargo-test.yaml b/.github/workflows/cargo-test.yaml index 0f99c43dd..39561629f 100644 --- a/.github/workflows/cargo-test.yaml +++ b/.github/workflows/cargo-test.yaml @@ -82,10 +82,10 @@ jobs: - name: run tests run: | - cargo nextest run --no-fail-fast --release -p ${{ env.PACKAGE_NAME }} ${{ env.TEST_FLAGS }} + cargo nextest run --no-fail-fast --release -p other-db-tests --features ${{ env.FEATURE_NAME }} ${{ env.TEST_FLAGS }} env: POSTGRESQL_CONNECTION_STRING: ${{ fromJSON(steps.configuration.outputs.configuration).env.POSTGRESQL_CONNECTION_STRING }} - PACKAGE_NAME: ${{ fromJSON(steps.configuration.outputs.configuration).package }} + FEATURE_NAME: ${{ fromJSON(steps.configuration.outputs.configuration).feature }} TEST_FLAGS: ${{ fromJSON(steps.configuration.outputs.configuration).flags }} RUST_LOG: INFO @@ -152,13 +152,14 @@ jobs: env: SLACK_WEBHOOK_URL: ${{ secrets.BROKEN_BUILD_SLACK_WEBHOOK_URL }} - test-ndc-postgres-with-yugabyte: + test-ndc-postgres-with-database: strategy: matrix: database: - - yugabyte + - postgres - citus - cockroach + - yugabyte name: "test connector (ndc-postgres on ${{ matrix.database }})" runs-on: ubuntu-latest env: diff --git a/Cargo.lock b/Cargo.lock index c40bba120..3e5f2e0a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1843,7 +1843,9 @@ version = "0.1.0" dependencies = [ "axum", "insta", + "ndc-postgres", "ndc-test", + "schemars", "tests-common", "tokio", ] diff --git a/crates/connectors/ndc-postgres/tests/capabilities_tests.rs b/crates/connectors/ndc-postgres/tests/capabilities_tests.rs deleted file mode 100644 index bf3dbbbc2..000000000 --- a/crates/connectors/ndc-postgres/tests/capabilities_tests.rs +++ /dev/null @@ -1,6 +0,0 @@ -use ndc_postgres::capabilities; - -#[tokio::test] -async fn get_capabilities() { - insta::assert_json_snapshot!(capabilities::get_capabilities()); -} diff --git a/crates/connectors/ndc-postgres/tests/common/mod.rs b/crates/connectors/ndc-postgres/tests/common/mod.rs deleted file mode 100644 index 8a7f80f3f..000000000 --- a/crates/connectors/ndc-postgres/tests/common/mod.rs +++ /dev/null @@ -1,28 +0,0 @@ -//! Common functions used across test cases. - -use ndc_postgres::connector; - -pub const POSTGRESQL_CONNECTION_STRING: &str = "postgresql://postgres:password@localhost:64002"; -pub const CHINOOK_DEPLOYMENT_PATH: &str = "static/chinook-deployment.json"; - -/// Creates a router with a fresh state from the test deployment. -pub async fn create_router() -> axum::Router { - create_router_from_deployment(CHINOOK_DEPLOYMENT_PATH).await -} - -/// Creates a router with a fresh state from a deployment file path -pub async fn create_router_from_deployment(deployment_path: &str) -> axum::Router { - let _ = env_logger::builder().is_test(true).try_init(); - - // work out where the deployment configs live - let test_deployment_file = - tests_common::deployment::helpers::get_path_from_project_root(deployment_path); - - // initialise server state with the static configuration. - let state = ndc_sdk::default_main::init_server_state::( - test_deployment_file.display().to_string(), - ) - .await; - - ndc_sdk::default_main::create_router(state, None) -} diff --git a/crates/connectors/ndc-postgres/tests/configuration_tests.rs b/crates/connectors/ndc-postgres/tests/configuration_tests.rs deleted file mode 100644 index 2b354d70e..000000000 --- a/crates/connectors/ndc-postgres/tests/configuration_tests.rs +++ /dev/null @@ -1,76 +0,0 @@ -pub mod common; - -use std::fs; - -use similar_asserts::assert_eq; - -use ndc_postgres::configuration; - -use tests_common::deployment::helpers::get_path_from_project_root; -use tests_common::schemas::check_value_conforms_to_schema; - -const CONFIGURATION_QUERY: &str = include_str!("../src/configuration.sql"); - -#[tokio::test] -// Tests that configuration generation has not changed. -// -// This test does not use insta snapshots because it checks the deployment file that is shared with -// other tests. -// -// If you have changed it intentionally, run `just generate-chinook-configuration`. -async fn test_configure_is_idempotent() { - let expected_value = read_configuration(); - - let mut args: configuration::RawConfiguration = serde_json::from_value(expected_value.clone()) - .expect("Unable to deserialize as RawConfiguration"); - args.connection_uri = configuration::ConnectionUri::Uri(configuration::ResolvedSecret( - common::POSTGRESQL_CONNECTION_STRING.to_string(), - )); - - let actual = configuration::configure(args, CONFIGURATION_QUERY) - .await - .expect("configuration::configure"); - - let actual_value = serde_json::to_value(actual).expect("serde_json::to_value"); - - assert_eq!(expected_value, actual_value); -} - -#[tokio::test] -async fn test_configure_initial_configuration_is_unchanged() { - let args = configuration::RawConfiguration { - connection_uri: configuration::ConnectionUri::Uri(configuration::ResolvedSecret( - common::POSTGRESQL_CONNECTION_STRING.to_string(), - )), - ..configuration::RawConfiguration::empty() - }; - - let default_configuration = configuration::configure(args, CONFIGURATION_QUERY) - .await - .expect("configuration::configure"); - - insta::assert_json_snapshot!(default_configuration); -} - -#[test] -fn configuration_conforms_to_the_schema() { - check_value_conforms_to_schema::(read_configuration()); -} - -#[tokio::test] -async fn get_rawconfiguration_schema() { - let schema = schemars::schema_for!(configuration::RawConfiguration); - insta::assert_json_snapshot!(schema); -} - -#[tokio::test] -async fn get_configuration_schema() { - let schema = schemars::schema_for!(configuration::Configuration); - insta::assert_json_snapshot!(schema); -} - -fn read_configuration() -> serde_json::Value { - let file = fs::File::open(get_path_from_project_root(common::CHINOOK_DEPLOYMENT_PATH)) - .expect("fs::File::open"); - serde_json::from_reader(file).expect("serde_json::from_reader") -} diff --git a/crates/connectors/ndc-postgres/tests/explain_tests.rs b/crates/connectors/ndc-postgres/tests/explain_tests.rs deleted file mode 100644 index 96900a98e..000000000 --- a/crates/connectors/ndc-postgres/tests/explain_tests.rs +++ /dev/null @@ -1,33 +0,0 @@ -pub mod common; - -use common::create_router; -use tests_common::assert::is_contained_in_lines; -use tests_common::request::run_explain; - -#[tokio::test] -async fn select_by_pk() { - let result = run_explain(create_router().await, "select_by_pk").await; - is_contained_in_lines(vec!["Aggregate", "Scan", "35"], result.details.plan); - insta::assert_snapshot!(result.details.query); -} - -#[tokio::test] -async fn select_where_variable() { - let result = run_explain(create_router().await, "select_where_variable").await; - is_contained_in_lines(vec!["Aggregate", "Seq Scan", "Filter"], result.details.plan); - insta::assert_snapshot!(result.details.query); -} - -#[tokio::test] -async fn select_where_name_nilike() { - let result = run_explain(create_router().await, "select_where_name_nilike").await; - let keywords = vec![ - "Aggregate", - "Subquery Scan", - "Limit", - "Index Scan", - "Filter", - ]; - is_contained_in_lines(keywords, result.details.plan); - insta::assert_snapshot!(result.details.query); -} diff --git a/crates/connectors/ndc-postgres/tests/mutation_tests.rs b/crates/connectors/ndc-postgres/tests/mutation_tests.rs deleted file mode 100644 index 5cd85900a..000000000 --- a/crates/connectors/ndc-postgres/tests/mutation_tests.rs +++ /dev/null @@ -1,29 +0,0 @@ -pub mod common; -use tests_common::deployment::{clean_up_deployment, create_fresh_deployment}; -use tests_common::request::run_query; - -pub const POSTGRESQL_CONNECTION_STRING: &str = "postgresql://postgres:password@localhost:64002"; -pub const CHINOOK_DEPLOYMENT_PATH: &str = "static/chinook-deployment.json"; - -/// create a fresh db then run a query against it -mod basic { - use super::{clean_up_deployment, create_fresh_deployment, run_query}; - - #[tokio::test] - async fn select_by_pk() { - let deployment = create_fresh_deployment( - super::POSTGRESQL_CONNECTION_STRING, - super::CHINOOK_DEPLOYMENT_PATH, - ) - .await; - - let result = run_query( - super::common::create_router_from_deployment(&deployment.deployment_path).await, - "select_by_pk", - ) - .await; - - clean_up_deployment(deployment).await; - insta::assert_json_snapshot!(result) - } -} diff --git a/crates/connectors/ndc-postgres/tests/ndc_tests.rs b/crates/connectors/ndc-postgres/tests/ndc_tests.rs deleted file mode 100644 index 9af7009e7..000000000 --- a/crates/connectors/ndc-postgres/tests/ndc_tests.rs +++ /dev/null @@ -1,48 +0,0 @@ -//! Runs the tests provided by the ndc-spec. - -pub mod common; - -use std::net; - -#[tokio::test] -async fn test_connector() -> Result<(), Vec> { - let router = common::create_router().await; - let server = hyper::Server::bind(&net::SocketAddr::new( - net::IpAddr::V4(net::Ipv4Addr::LOCALHOST), - 0, - )) - .serve(router.into_make_service()); - - let base_path = format!("http://{}", server.local_addr()); - eprintln!("Starting the server on {}", base_path); - - tokio::task::spawn(async { - if let Err(err) = server.await { - eprintln!("Server error: {}", err); - } - }); - - let configuration = ndc_client::apis::configuration::Configuration { - base_path, - user_agent: None, - client: reqwest::Client::new(), - basic_auth: None, - oauth_access_token: None, - bearer_access_token: None, - api_key: None, - }; - - let test_results = ndc_test::test_connector( - &ndc_test::TestConfiguration { - seed: None, - snapshots_dir: None, - }, - &configuration, - ) - .await; - if test_results.failures.is_empty() { - Ok(()) - } else { - Err(test_results.failures) - } -} diff --git a/crates/connectors/ndc-postgres/tests/schema_tests.rs b/crates/connectors/ndc-postgres/tests/schema_tests.rs deleted file mode 100644 index 664594eee..000000000 --- a/crates/connectors/ndc-postgres/tests/schema_tests.rs +++ /dev/null @@ -1,7 +0,0 @@ -pub mod common; - -#[tokio::test] -async fn get_schema() { - let result = tests_common::request::get_schema(common::create_router().await).await; - insta::assert_json_snapshot!(result); -} diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than.snap b/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than.snap deleted file mode 100644 index 92597a88b..000000000 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: crates/connectors/ndc-postgres/tests/query_tests.rs -expression: result ---- -[ - { - "rows": [] - } -] diff --git a/crates/tests/other-db-tests/Cargo.toml b/crates/tests/other-db-tests/Cargo.toml index ba55c97ac..4e704ad4b 100644 --- a/crates/tests/other-db-tests/Cargo.toml +++ b/crates/tests/other-db-tests/Cargo.toml @@ -16,11 +16,15 @@ yugabyte = [] cockroach = [] # We only run the Citus tests if this feature is enabled. citus = [] +# We only run the PostgreSQL tests if this feature is enabled. +postgres = [] [dependencies] +ndc-postgres = { path = "../../connectors/ndc-postgres" } ndc-test = { git = "https://github.com/hasura/ndc-spec.git", tag = "v0.1.0-rc.8" } tests-common = { path = "../tests-common" } axum = "0.6.19" insta = { version = "1.34.0", features = ["json"] } +schemars = { version = "0.8.15", features = ["smol_str", "preserve_order"] } tokio = { version = "1.33.0", features = ["full"] } diff --git a/crates/tests/other-db-tests/src/capabilities_tests.rs b/crates/tests/other-db-tests/src/capabilities_tests.rs new file mode 100644 index 000000000..c20574c76 --- /dev/null +++ b/crates/tests/other-db-tests/src/capabilities_tests.rs @@ -0,0 +1,7 @@ +#[cfg(test)] +mod capabilities_tests { + #[tokio::test] + async fn get_capabilities() { + insta::assert_json_snapshot!(ndc_postgres::capabilities::get_capabilities()); + } +} diff --git a/crates/tests/other-db-tests/src/citus/configuration_tests.rs b/crates/tests/other-db-tests/src/citus/configuration_tests.rs index 0ffe5f08e..c29652450 100644 --- a/crates/tests/other-db-tests/src/citus/configuration_tests.rs +++ b/crates/tests/other-db-tests/src/citus/configuration_tests.rs @@ -8,8 +8,8 @@ mod configuration_tests { use tests_common::common_tests; #[tokio::test] - async fn test_configure() { - common_tests::configuration_tests::test_configure( + async fn test_configure_is_idempotent() { + common_tests::configuration_tests::configure_is_idempotent( common::CONNECTION_STRING, common::CHINOOK_DEPLOYMENT_PATH, ) diff --git a/crates/tests/other-db-tests/src/cockroach/configuration_tests.rs b/crates/tests/other-db-tests/src/cockroach/configuration_tests.rs index 0ffe5f08e..c29652450 100644 --- a/crates/tests/other-db-tests/src/cockroach/configuration_tests.rs +++ b/crates/tests/other-db-tests/src/cockroach/configuration_tests.rs @@ -8,8 +8,8 @@ mod configuration_tests { use tests_common::common_tests; #[tokio::test] - async fn test_configure() { - common_tests::configuration_tests::test_configure( + async fn test_configure_is_idempotent() { + common_tests::configuration_tests::configure_is_idempotent( common::CONNECTION_STRING, common::CHINOOK_DEPLOYMENT_PATH, ) diff --git a/crates/tests/other-db-tests/src/lib.rs b/crates/tests/other-db-tests/src/lib.rs index 47a9c2ac5..253950d65 100644 --- a/crates/tests/other-db-tests/src/lib.rs +++ b/crates/tests/other-db-tests/src/lib.rs @@ -4,8 +4,13 @@ pub mod aurora; #[cfg(feature = "yugabyte")] pub mod yugabyte; +#[cfg(feature = "citus")] +pub mod citus; + #[cfg(feature = "cockroach")] pub mod cockroach; -#[cfg(feature = "citus")] -pub mod citus; +#[cfg(feature = "postgres")] +pub mod postgres; + +pub mod capabilities_tests; diff --git a/crates/tests/other-db-tests/src/postgres/common.rs b/crates/tests/other-db-tests/src/postgres/common.rs new file mode 100644 index 000000000..361402e67 --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/common.rs @@ -0,0 +1,10 @@ +//! Common functions used across test cases. + +pub const CHINOOK_DEPLOYMENT_PATH: &str = "static/chinook-deployment.json"; + +pub const CONNECTION_STRING: &str = "postgresql://postgres:password@localhost:64002"; + +/// Creates a router with a fresh state from the test deployment. +pub async fn create_router() -> axum::Router { + tests_common::router::create_router(CHINOOK_DEPLOYMENT_PATH).await +} diff --git a/crates/tests/other-db-tests/src/postgres/configuration_tests.rs b/crates/tests/other-db-tests/src/postgres/configuration_tests.rs new file mode 100644 index 000000000..4aeaf9e43 --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/configuration_tests.rs @@ -0,0 +1,48 @@ +//! Tests that configuration generation has not changed. +//! +//! If you have changed it intentionally, run `just generate-chinook-configuration`. + +#[cfg(test)] +mod configuration_tests { + use super::super::common; + use tests_common::common_tests; + + #[tokio::test] + async fn configure_is_idempotent() { + common_tests::configuration_tests::configure_is_idempotent( + common::CONNECTION_STRING, + common::CHINOOK_DEPLOYMENT_PATH, + ) + .await + } + + #[test] + fn configuration_conforms_to_the_schema() { + common_tests::configuration_tests::configuration_conforms_to_the_schema( + common::CHINOOK_DEPLOYMENT_PATH, + ) + } + + #[tokio::test] + async fn configure_initial_configuration_is_unchanged() { + let default_configuration = + common_tests::configuration_tests::configure_initial_configuration_is_unchanged( + common::CONNECTION_STRING, + ) + .await; + + insta::assert_json_snapshot!(default_configuration); + } + + #[tokio::test] + async fn get_rawconfiguration_schema() { + let schema = schemars::schema_for!(ndc_postgres::configuration::RawConfiguration); + insta::assert_json_snapshot!(schema); + } + + #[tokio::test] + async fn get_configuration_schema() { + let schema = schemars::schema_for!(ndc_postgres::configuration::Configuration); + insta::assert_json_snapshot!(schema); + } +} diff --git a/crates/tests/other-db-tests/src/postgres/explain_tests.rs b/crates/tests/other-db-tests/src/postgres/explain_tests.rs new file mode 100644 index 000000000..f6b35a47e --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/explain_tests.rs @@ -0,0 +1,34 @@ +#[cfg(test)] +mod explain { + use super::super::common::create_router; + use tests_common::assert::is_contained_in_lines; + use tests_common::request::run_explain; + + #[tokio::test] + async fn select_by_pk() { + let result = run_explain(create_router().await, "select_by_pk").await; + is_contained_in_lines(vec!["Aggregate", "Scan", "35"], result.details.plan); + insta::assert_snapshot!(result.details.query); + } + + #[tokio::test] + async fn select_where_variable() { + let result = run_explain(create_router().await, "select_where_variable").await; + is_contained_in_lines(vec!["Aggregate", "Seq Scan", "Filter"], result.details.plan); + insta::assert_snapshot!(result.details.query); + } + + #[tokio::test] + async fn select_where_name_nilike() { + let result = run_explain(create_router().await, "select_where_name_nilike").await; + let keywords = vec![ + "Aggregate", + "Subquery Scan", + "Limit", + "Index Scan", + "Filter", + ]; + is_contained_in_lines(keywords, result.details.plan); + insta::assert_snapshot!(result.details.query); + } +} diff --git a/crates/tests/other-db-tests/src/postgres/mod.rs b/crates/tests/other-db-tests/src/postgres/mod.rs new file mode 100644 index 000000000..5e8051225 --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/mod.rs @@ -0,0 +1,7 @@ +pub mod common; +pub mod configuration_tests; +pub mod explain_tests; +pub mod mutation_tests; +pub mod ndc_tests; +pub mod query_tests; +pub mod schema_tests; diff --git a/crates/tests/other-db-tests/src/postgres/mutation_tests.rs b/crates/tests/other-db-tests/src/postgres/mutation_tests.rs new file mode 100644 index 000000000..078d5f0e0 --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/mutation_tests.rs @@ -0,0 +1,24 @@ +#[cfg(test)] +/// create a fresh db then run a query against it +mod basic { + use super::super::common; + use tests_common::deployment::{clean_up_deployment, create_fresh_deployment}; + use tests_common::request::run_query; + + #[ignore = "for some reason this takes a long time"] + #[tokio::test] + async fn select_by_pk() { + let deployment = + create_fresh_deployment(common::CONNECTION_STRING, common::CHINOOK_DEPLOYMENT_PATH) + .await; + + let result = run_query( + tests_common::router::create_router_from_deployment(&deployment.deployment_path).await, + "select_by_pk", + ) + .await; + + clean_up_deployment(deployment).await; + insta::assert_json_snapshot!(result) + } +} diff --git a/crates/tests/other-db-tests/src/postgres/ndc_tests.rs b/crates/tests/other-db-tests/src/postgres/ndc_tests.rs new file mode 100644 index 000000000..ac675f2dc --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/ndc_tests.rs @@ -0,0 +1,13 @@ +//! Runs the tests provided by the ndc-spec. + +#[cfg(test)] +mod ndc_tests { + use super::super::common; + use tests_common::common_tests; + + #[tokio::test] + async fn test_connector() -> Result<(), Vec> { + let router = common::create_router().await; + common_tests::ndc_tests::test_connector(router).await + } +} diff --git a/crates/connectors/ndc-postgres/tests/query_tests.rs b/crates/tests/other-db-tests/src/postgres/query_tests.rs similarity index 95% rename from crates/connectors/ndc-postgres/tests/query_tests.rs rename to crates/tests/other-db-tests/src/postgres/query_tests.rs index 831925d52..442de344a 100644 --- a/crates/connectors/ndc-postgres/tests/query_tests.rs +++ b/crates/tests/other-db-tests/src/postgres/query_tests.rs @@ -1,10 +1,7 @@ -pub mod common; -use tests_common::request::run_query; - #[cfg(test)] mod basic { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_by_pk() { @@ -27,8 +24,8 @@ mod basic { #[cfg(test)] mod predicates { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_where_name_eq() { @@ -191,8 +188,8 @@ mod predicates { #[cfg(test)] mod sorting { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_order_by_name() { @@ -281,8 +278,8 @@ mod sorting { #[cfg(test)] mod aggregation { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn aggregate_count_albums() { @@ -315,8 +312,8 @@ mod aggregation { #[cfg(test)] mod relationships { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_album_object_relationship_to_artist() { @@ -365,8 +362,8 @@ mod relationships { #[cfg(test)] mod native_queries { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_artist() { @@ -427,8 +424,8 @@ mod native_queries { #[cfg(test)] mod types { - use super::common::create_router; - use super::run_query; + use super::super::common::create_router; + use tests_common::request::run_query; #[tokio::test] async fn select_value_types() { diff --git a/crates/tests/other-db-tests/src/postgres/schema_tests.rs b/crates/tests/other-db-tests/src/postgres/schema_tests.rs new file mode 100644 index 000000000..ef42c079e --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/schema_tests.rs @@ -0,0 +1,9 @@ +#[cfg(test)] +mod schema_test { + use super::super::common; + #[tokio::test] + async fn get_schema() { + let result = tests_common::request::get_schema(common::create_router().await).await; + insta::assert_json_snapshot!(result); + } +} diff --git a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__configure_initial_configuration_is_unchanged.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap similarity index 99% rename from crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__configure_initial_configuration_is_unchanged.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap index 0d971a4f1..cae436e07 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__configure_initial_configuration_is_unchanged.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap @@ -1,6 +1,6 @@ --- -source: crates/connectors/ndc-postgres/tests/configuration_tests.rs -expression: actual +source: crates/tests/other-db-tests/src/postgres/configuration_tests.rs +expression: default_configuration --- { "version": 1, diff --git a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_configuration_schema.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap similarity index 99% rename from crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_configuration_schema.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap index 7a3dd9c44..a9a61bdb0 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_configuration_schema.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_configuration_schema.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/configuration_tests.rs +source: crates/tests/other-db-tests/src/postgres/configuration_tests.rs expression: schema --- { diff --git a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_rawconfiguration_schema.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_rawconfiguration_schema.snap similarity index 99% rename from crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_rawconfiguration_schema.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_rawconfiguration_schema.snap index 80ffdafc2..1865d8241 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/configuration_tests__get_rawconfiguration_schema.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__configuration_tests__configuration_tests__get_rawconfiguration_schema.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/configuration_tests.rs +source: crates/tests/other-db-tests/src/postgres/configuration_tests.rs expression: schema --- { diff --git a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_by_pk.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_by_pk.snap similarity index 88% rename from crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_by_pk.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_by_pk.snap index 60335473d..01be958c3 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_by_pk.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_by_pk.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/explain_tests.rs +source: crates/tests/other-db-tests/src/postgres/explain_tests.rs expression: result.details.query --- EXPLAIN diff --git a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_name_nilike.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_name_nilike.snap similarity index 90% rename from crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_name_nilike.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_name_nilike.snap index 996654851..bf73ec175 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_name_nilike.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_name_nilike.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/explain_tests.rs +source: crates/tests/other-db-tests/src/postgres/explain_tests.rs expression: result.details.query --- EXPLAIN diff --git a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_variable.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_variable.snap similarity index 89% rename from crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_variable.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_variable.snap index 1493af72f..8a087e3fd 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/explain_tests__select_where_variable.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__explain_tests__explain__select_where_variable.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/explain_tests.rs +source: crates/tests/other-db-tests/src/postgres/explain_tests.rs expression: result.details.query --- EXPLAIN diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_by_pk.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__mutation_tests__basic__select_by_pk.snap similarity index 63% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_by_pk.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__mutation_tests__basic__select_by_pk.snap index 1ef81d1e3..74b9b2934 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_by_pk.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__mutation_tests__basic__select_by_pk.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/mutation_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums.snap similarity index 80% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums.snap index 58244bcb5..680250dd8 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums_plus_field.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums_plus_field.snap similarity index 89% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums_plus_field.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums_plus_field.snap index 58a8e4425..34a458640 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_albums_plus_field.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_albums_plus_field.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums.snap similarity index 92% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums.snap index 44ba6fb46..fc3cd6d70 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap similarity index 95% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap index af041d2db..447e18d6b 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__aggregation__aggregate_count_artist_albums_plus_field.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_5.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_5.snap similarity index 82% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_5.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_5.snap index 34018786b..a2f29e510 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_5.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_5.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/mutation_tests__basic__select_by_pk.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_by_pk.snap similarity index 64% rename from crates/connectors/ndc-postgres/tests/snapshots/mutation_tests__basic__select_by_pk.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_by_pk.snap index 924c88681..4c6c8a11e 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/mutation_tests__basic__select_by_pk.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_by_pk.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/mutation_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_int_and_string.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_int_and_string.snap similarity index 68% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_int_and_string.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_int_and_string.snap index 218eda639..7706f6309 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__basic__select_int_and_string.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__basic__select_int_and_string.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist.snap similarity index 81% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist.snap index eadd88f39..272e37528 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap similarity index 94% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap index 9a9331cd9..59fff1340 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artist_with_album_by_title_relationship_arguments.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artists_below_id.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artists_below_id.snap similarity index 78% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artists_below_id.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artists_below_id.snap index f908cc69f..8318d26f1 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_artists_below_id.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_artists_below_id.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_order_by_artist_album_count.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_order_by_artist_album_count.snap similarity index 96% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_order_by_artist_album_count.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_order_by_artist_album_count.snap index d1ad495c9..b89d4b25b 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_order_by_artist_album_count.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_order_by_artist_album_count.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_sort_relationship.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_sort_relationship.snap similarity index 87% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_sort_relationship.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_sort_relationship.snap index ce9328c92..294abf32b 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_sort_relationship.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_sort_relationship.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_where_relationship.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_where_relationship.snap similarity index 86% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_where_relationship.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_where_relationship.snap index ce829284c..b328458df 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__native_queries__select_where_relationship.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__native_queries__select_where_relationship.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_equals_self.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_equals_self.snap similarity index 71% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_equals_self.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_equals_self.snap index 9f64b3c2f..7c351ff27 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_equals_self.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_equals_self.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than.snap similarity index 92% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than.snap index 1db97ad11..637a44ff9 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap similarity index 93% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap index 530d24a6d..27f67a9f5 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_greater_than_or_equal_to.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_is_not_null.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_is_not_null.snap similarity index 84% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_is_not_null.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_is_not_null.snap index b842cdc8c..0d3ab1586 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_is_not_null.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_is_not_null.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than.snap new file mode 100644 index 000000000..59fda0364 --- /dev/null +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than.snap @@ -0,0 +1,9 @@ +--- +source: crates/tests/other-db-tests/src/postgres/query_tests.rs +expression: result +--- +[ + { + "rows": [] + } +] diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap similarity index 70% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap index 7ee719a8b..784a1689e 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_album_id_less_than_or_equal_to.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_and.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_and.snap similarity index 62% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_and.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_and.snap index 5e7dd29cf..89824c66c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_and.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_and.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_array_relationship.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_array_relationship.snap similarity index 85% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_array_relationship.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_array_relationship.snap index 89bec0608..1dd80ce5c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_array_relationship.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_array_relationship.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_eq.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_eq.snap similarity index 68% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_eq.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_eq.snap index ad13b6e21..36c34e668 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_eq.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_eq.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_ilike.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_ilike.snap similarity index 91% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_ilike.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_ilike.snap index 4a96a541b..b6b41ca1d 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_ilike.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_ilike.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_in.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_in.snap similarity index 68% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_in.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_in.snap index cc7e6307e..409b12d17 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_in.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_in.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_iregex.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_iregex.snap similarity index 67% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_iregex.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_iregex.snap index 3c97b759e..08828f8c0 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_iregex.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_iregex.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_like.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_like.snap similarity index 91% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_like.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_like.snap index 4a96a541b..b6b41ca1d 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_like.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_like.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_neq.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_neq.snap similarity index 87% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_neq.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_neq.snap index 8637e36f1..c9ab1c1a2 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_neq.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_neq.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nilike.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nilike.snap similarity index 84% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nilike.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nilike.snap index 957ff8138..a65e9de1b 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nilike.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nilike.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_niregex.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_niregex.snap similarity index 87% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_niregex.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_niregex.snap index 2825571f8..49940e34c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_niregex.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_niregex.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_in.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_in.snap similarity index 87% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_in.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_in.snap index 2825571f8..49940e34c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_in.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_in.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_like.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_like.snap similarity index 86% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_like.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_like.snap index be38bab1a..768d45a6e 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_not_like.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_not_like.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nregex.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nregex.snap similarity index 92% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nregex.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nregex.snap index 90c1e55df..eb72177eb 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_nregex.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_nregex.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_regex.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_regex.snap similarity index 67% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_regex.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_regex.snap index 3c97b759e..08828f8c0 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_name_regex.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_name_regex.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_or.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_or.snap similarity index 69% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_or.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_or.snap index 9116aae21..65192fd43 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_or.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_or.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_related_exists.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_related_exists.snap similarity index 85% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_related_exists.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_related_exists.snap index 89bec0608..1dd80ce5c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_related_exists.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_related_exists.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_unrelated_exists.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_unrelated_exists.snap similarity index 80% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_unrelated_exists.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_unrelated_exists.snap index c655b701d..07f6183f3 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_unrelated_exists.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_unrelated_exists.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable.snap similarity index 80% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable.snap index b01508f34..db50d7706 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable_int.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable_int.snap similarity index 81% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable_int.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable_int.snap index 165d6ecbb..fed49c691 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__predicates__select_where_variable_int.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__predicates__select_where_variable_int.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__dup_array_relationship.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__dup_array_relationship.snap similarity index 95% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__dup_array_relationship.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__dup_array_relationship.snap index 1f8759069..b380c9f7d 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__dup_array_relationship.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__dup_array_relationship.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_array_relationships.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_array_relationships.snap similarity index 97% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_array_relationships.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_array_relationships.snap index 4ea7e6672..b8562c98f 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_array_relationships.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_array_relationships.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_object_relationships.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_object_relationships.snap similarity index 96% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_object_relationships.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_object_relationships.snap index 3c3146e24..d4ef65494 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__nested_object_relationships.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap similarity index 93% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_album_object_relationship_to_artist.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap index e3bcbd923..29925ad46 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_artist_array_relationship_to_album.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_artist_array_relationship_to_album.snap similarity index 94% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_artist_array_relationship_to_album.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_artist_array_relationship_to_album.snap index 4cef16e7c..869099458 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__select_artist_array_relationship_to_album.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__select_artist_array_relationship_to_album.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap similarity index 98% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__very_nested_recursive_relationship.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap index 71762a49d..6c5f39ecc 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_album_artist_name.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_album_artist_name.snap similarity index 82% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_album_artist_name.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_album_artist_name.snap index 63dbc25c2..18bc8d326 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_album_artist_name.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_album_artist_name.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count.snap similarity index 75% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count.snap index dcfd5fc5e..93909278c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count_agg.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count_agg.snap similarity index 75% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count_agg.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count_agg.snap index dcfd5fc5e..93909278c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_album_count_agg.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_album_count_agg.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name.snap similarity index 85% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name.snap index 95a904b8b..6df8d05a8 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap similarity index 94% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name_with_name.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap index aff13f3a9..851c19b94 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_name.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_name.snap similarity index 84% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_name.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_name.snap index 2ed1c534c..296707e66 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_order_by_name.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_order_by_name.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap similarity index 83% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap index ef1f9bfa2..308234e47 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__select_track_order_by_artist_id_and_album_title.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap similarity index 70% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap index e191f5ca6..6b95b5275 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap similarity index 83% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap index ca9c725cc..6e49c8f11 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_nested_relationship_column_with_predicate_exists.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_relationship_count_with_predicate.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_relationship_count_with_predicate.snap similarity index 81% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_relationship_count_with_predicate.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_relationship_count_with_predicate.snap index 7f7e99b5e..de3194b31 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__sorting__sorting_by_relationship_count_with_predicate.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__sorting__sorting_by_relationship_count_with_predicate.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__types__select_value_types.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__types__select_value_types.snap similarity index 90% rename from crates/connectors/ndc-postgres/tests/snapshots/query_tests__types__select_value_types.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__types__select_value_types.snap index 5a1f4e4fd..e9e383442 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/query_tests__types__select_value_types.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__query_tests__types__select_value_types.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/query_tests.rs +source: crates/tests/other-db-tests/src/postgres/query_tests.rs expression: result --- [ diff --git a/crates/connectors/ndc-postgres/tests/snapshots/schema_tests__get_schema.snap b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__schema_tests__schema_test__get_schema.snap similarity index 99% rename from crates/connectors/ndc-postgres/tests/snapshots/schema_tests__get_schema.snap rename to crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__schema_tests__schema_test__get_schema.snap index 3a72c0fd1..0710e5115 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/schema_tests__get_schema.snap +++ b/crates/tests/other-db-tests/src/postgres/snapshots/other_db_tests__postgres__schema_tests__schema_test__get_schema.snap @@ -1,5 +1,5 @@ --- -source: crates/connectors/ndc-postgres/tests/schema_tests.rs +source: crates/tests/other-db-tests/src/postgres/schema_tests.rs expression: result --- { diff --git a/crates/connectors/ndc-postgres/tests/snapshots/capabilities_tests__get_capabilities.snap b/crates/tests/other-db-tests/src/snapshots/other_db_tests__capabilities_tests__capabilities_tests__get_capabilities.snap similarity index 63% rename from crates/connectors/ndc-postgres/tests/snapshots/capabilities_tests__get_capabilities.snap rename to crates/tests/other-db-tests/src/snapshots/other_db_tests__capabilities_tests__capabilities_tests__get_capabilities.snap index f01ea5c5d..f9b50997c 100644 --- a/crates/connectors/ndc-postgres/tests/snapshots/capabilities_tests__get_capabilities.snap +++ b/crates/tests/other-db-tests/src/snapshots/other_db_tests__capabilities_tests__capabilities_tests__get_capabilities.snap @@ -1,6 +1,6 @@ --- -source: crates/connectors/ndc-postgres/tests/capabilities_tests.rs -expression: "capabilities::get_capabilities()" +source: crates/tests/other-db-tests/src/capabilities_tests.rs +expression: "ndc_postgres::capabilities::get_capabilities()" --- { "versions": "^0.1.0", diff --git a/crates/tests/tests-common/src/common_tests/configuration_tests.rs b/crates/tests/tests-common/src/common_tests/configuration_tests.rs index 3a12b7474..6080329b1 100644 --- a/crates/tests/tests-common/src/common_tests/configuration_tests.rs +++ b/crates/tests/tests-common/src/common_tests/configuration_tests.rs @@ -7,7 +7,13 @@ use std::fs; const CONFIGURATION_QUERY: &str = include_str!("../../../../connectors/ndc-postgres/src/configuration.sql"); -pub async fn test_configure(connection_string: &str, chinook_deployment_path: &str) { +// Tests that configuration generation has not changed. +// +// This test does not use insta snapshots because it checks the deployment file that is shared with +// other tests. +// +// If you have changed it intentionally, run `just generate-chinook-configuration`. +pub async fn configure_is_idempotent(connection_string: &str, chinook_deployment_path: &str) { let expected_value = read_configuration(chinook_deployment_path); let mut args: configuration::RawConfiguration = serde_json::from_value(expected_value.clone()) @@ -26,6 +32,21 @@ pub async fn test_configure(connection_string: &str, chinook_deployment_path: &s assert_eq!(expected_value, actual_value); } +pub async fn configure_initial_configuration_is_unchanged( + connection_string: &str, +) -> ndc_postgres::configuration::RawConfiguration { + let args = configuration::RawConfiguration { + connection_uri: configuration::ConnectionUri::Uri(configuration::ResolvedSecret( + connection_string.to_string(), + )), + ..configuration::RawConfiguration::empty() + }; + + configuration::configure(args, CONFIGURATION_QUERY) + .await + .expect("configuration::configure") +} + pub fn configuration_conforms_to_the_schema(chinook_deployment_path: &str) { check_value_conforms_to_schema::(read_configuration( chinook_deployment_path, diff --git a/crates/tests/tests-common/src/router.rs b/crates/tests/tests-common/src/router.rs index cb9d7695e..f50762526 100644 --- a/crates/tests/tests-common/src/router.rs +++ b/crates/tests/tests-common/src/router.rs @@ -14,3 +14,20 @@ pub async fn create_router(chinook_deployment_path: &str) -> axum::Router { ndc_sdk::default_main::create_router(state, None) } + +/// Creates a router with a fresh state from a deployment file path +pub async fn create_router_from_deployment(deployment_path: &str) -> axum::Router { + let _ = env_logger::builder().is_test(true).try_init(); + + // work out where the deployment configs live + let test_deployment_file = + super::deployment::helpers::get_path_from_project_root(deployment_path); + + // initialise server state with the static configuration. + let state = ndc_sdk::default_main::init_server_state::( + test_deployment_file.display().to_string(), + ) + .await; + + ndc_sdk::default_main::create_router(state, None) +} diff --git a/justfile b/justfile index ff158fb75..393c424c5 100644 --- a/justfile +++ b/justfile @@ -87,7 +87,7 @@ dev: start-dependencies OTEL_SERVICE_NAME=ndc-postgres \ cargo watch -i "**/snapshots/*" \ -c \ - -x 'test -p query-engine-translation -p ndc-postgres' \ + -x 'test -p query-engine-translation -p other-db-tests --features postgres' \ -x clippy \ -x 'run --bin ndc-postgres -- serve --configuration {{POSTGRES_CHINOOK_DEPLOYMENT}}' @@ -203,6 +203,9 @@ test *args: start-dependencies create-aurora-deployment # run cockroach tests TEST_COMMAND+=(--features cockroach) + # run postgres tests + TEST_COMMAND+=(--features postgres) + TEST_COMMAND+=({{ args }}) echo "$(tput bold)${TEST_COMMAND[*]}$(tput sgr0)"