From 287dd6ea95e609ee17e8967754cd43646a1d975b Mon Sep 17 00:00:00 2001 From: Gil Mizrahi Date: Fri, 3 Nov 2023 15:47:58 +0200 Subject: [PATCH] Omit the public schema in configuration generation response (#142) ### What We were asked to omit the schema in the configuration generation response if that schema is `public`. ### How ```patch - s.schema_name || '_' || rel.relation_name, + CASE + WHEN s.schema_name = 'public' + THEN rel.relation_name + ELSE s.schema_name || '_' || rel.relation_name + END, ``` And then regenerate the deployment file and re-run the tests. --- .../component/benchmarks/select-by-pk.js | 2 +- .../component/benchmarks/select-variables.js | 2 +- .../component/benchmarks/select-where.js | 2 +- benchmarks/component/benchmarks/select.js | 2 +- .../ndc-postgres/src/configuration.sql | 6 +- ...ionships__nested_object_relationships.snap | 20 +- ...t_album_object_relationship_to_artist.snap | 10 +- ...s__very_nested_recursive_relationship.snap | 28 +- ...select_order_by_artist_name_with_name.snap | 10 +- ..._explain_tests__explain__select_by_pk.snap | 6 +- ...ts__explain__select_where_name_nilike.snap | 10 +- ...tests__explain__select_where_variable.snap | 8 +- ...ionships__nested_object_relationships.snap | 20 +- ...t_album_object_relationship_to_artist.snap | 10 +- ...s__very_nested_recursive_relationship.snap | 28 +- ...select_order_by_artist_name_with_name.snap | 10 +- ...schema_tests__schema_test__get_schema.snap | 222 +++--- ..._explain_tests__explain__select_by_pk.snap | 6 +- ...ts__explain__select_where_name_nilike.snap | 10 +- ...tests__explain__select_where_variable.snap | 10 +- ...ionships__nested_object_relationships.snap | 40 +- ...t_album_object_relationship_to_artist.snap | 30 +- ...s__very_nested_recursive_relationship.snap | 28 +- ...select_order_by_artist_name_with_name.snap | 30 +- ...schema_tests__schema_test__get_schema.snap | 686 +++++++++--------- ...re_initial_configuration_is_unchanged.snap | 28 +- ..._explain_tests__explain__select_by_pk.snap | 6 +- ...ts__explain__select_where_name_nilike.snap | 10 +- ...tests__explain__select_where_variable.snap | 8 +- ...ionships__nested_object_relationships.snap | 20 +- ...t_album_object_relationship_to_artist.snap | 10 +- ...s__very_nested_recursive_relationship.snap | 28 +- ...select_order_by_artist_name_with_name.snap | 10 +- ...schema_tests__schema_test__get_schema.snap | 234 +++--- ...ionships__nested_object_relationships.snap | 20 +- ...t_album_object_relationship_to_artist.snap | 10 +- ...s__very_nested_recursive_relationship.snap | 28 +- ...select_order_by_artist_name_with_name.snap | 10 +- .../goldenfiles/aggregate_count_albums.json | 2 +- .../aggregate_count_albums_plus_field.json | 2 +- .../aggregate_count_artist_albums.json | 6 +- ...regate_count_artist_albums_plus_field.json | 6 +- .../goldenfiles/dup_array_relationship.json | 6 +- ...album_by_title_relationship_arguments.json | 4 +- .../select_order_by_artist_album_count.json | 4 +- .../nested_array_relationships.json | 10 +- .../nested_object_relationships.json | 14 +- .../tests-common/goldenfiles/select_5.json | 2 +- ...t_album_object_relationship_to_artist.json | 8 +- ...ct_artist_array_relationship_to_album.json | 6 +- .../goldenfiles/select_by_pk.json | 2 +- .../goldenfiles/select_int_and_string.json | 2 +- .../select_order_by_album_artist_name.json | 10 +- .../select_order_by_artist_album_count.json | 6 +- ...elect_order_by_artist_album_count_agg.json | 6 +- .../select_order_by_artist_name.json | 6 +- ...select_order_by_artist_name_with_name.json | 8 +- .../goldenfiles/select_order_by_name.json | 2 +- ...ck_order_by_artist_id_and_album_title.json | 6 +- .../select_where_album_id_equals_self.json | 2 +- ...quals_self_nested_object_relationship.json | 14 +- .../select_where_album_id_greater_than.json | 2 +- ...ere_album_id_greater_than_or_equal_to.json | 2 +- .../select_where_album_id_is_not_null.json | 2 +- .../select_where_album_id_less_than.json | 2 +- ..._where_album_id_less_than_or_equal_to.json | 2 +- .../goldenfiles/select_where_and.json | 2 +- .../select_where_array_relationship.json | 6 +- .../goldenfiles/select_where_name_eq.json | 2 +- .../goldenfiles/select_where_name_ilike.json | 2 +- .../goldenfiles/select_where_name_in.json | 2 +- .../goldenfiles/select_where_name_iregex.json | 2 +- .../goldenfiles/select_where_name_like.json | 2 +- .../goldenfiles/select_where_name_neq.json | 2 +- .../goldenfiles/select_where_name_nilike.json | 2 +- .../select_where_name_niregex.json | 2 +- .../goldenfiles/select_where_name_not_in.json | 2 +- .../select_where_name_not_like.json | 2 +- .../goldenfiles/select_where_name_nregex.json | 2 +- .../select_where_name_nsimilar.json | 2 +- .../goldenfiles/select_where_name_regex.json | 2 +- .../select_where_name_similar.json | 2 +- .../goldenfiles/select_where_or.json | 2 +- .../select_where_related_exists.json | 6 +- .../select_where_unrelated_exists.json | 4 +- .../goldenfiles/select_where_variable.json | 2 +- .../select_where_variable_int.json | 2 +- ...ed_relationship_column_with_predicate.json | 10 +- ...tionship_column_with_predicate_exists.json | 10 +- ..._by_relationship_count_with_predicate.json | 10 +- .../very_nested_recursive_relationship.json | 14 +- .../aurora/chinook-deployment-template.json | 22 +- static/citus/chinook-deployment.json | 24 +- static/cockroach/chinook-deployment.json | 304 ++++---- static/postgres/chinook-deployment.json | 28 +- static/yugabyte/chinook-deployment.json | 22 +- 96 files changed, 1147 insertions(+), 1151 deletions(-) diff --git a/benchmarks/component/benchmarks/select-by-pk.js b/benchmarks/component/benchmarks/select-by-pk.js index edd89a578..5f0027ec0 100644 --- a/benchmarks/component/benchmarks/select-by-pk.js +++ b/benchmarks/component/benchmarks/select-by-pk.js @@ -6,7 +6,7 @@ const testid = "select-by-pk"; const agentSocket = __ENV.AGENT_SOCKET || "localhost:8100"; const url = `http://${agentSocket}/query`; const data = { - collection: "public_Album", + collection: "Album", query: { fields: { id: { type: "column", column: "AlbumId", arguments: {} }, diff --git a/benchmarks/component/benchmarks/select-variables.js b/benchmarks/component/benchmarks/select-variables.js index a1f17b2c0..e58335492 100644 --- a/benchmarks/component/benchmarks/select-variables.js +++ b/benchmarks/component/benchmarks/select-variables.js @@ -6,7 +6,7 @@ const testid = "select-variables"; const agentSocket = __ENV.AGENT_SOCKET || "localhost:8100"; const url = `http://${agentSocket}/query`; const data = { - collection: "public_Album", + collection: "Album", query: { fields: { Title: { diff --git a/benchmarks/component/benchmarks/select-where.js b/benchmarks/component/benchmarks/select-where.js index 34ddce6e0..2608af0e0 100644 --- a/benchmarks/component/benchmarks/select-where.js +++ b/benchmarks/component/benchmarks/select-where.js @@ -6,7 +6,7 @@ const testid = "select-where"; const agentSocket = __ENV.AGENT_SOCKET || "localhost:8100"; const url = `http://${agentSocket}/query`; const data = { - collection: "public_Album", + collection: "Album", query: { fields: { id: { type: "column", column: "AlbumId", arguments: {} }, diff --git a/benchmarks/component/benchmarks/select.js b/benchmarks/component/benchmarks/select.js index bc74fab2c..d555a47fa 100644 --- a/benchmarks/component/benchmarks/select.js +++ b/benchmarks/component/benchmarks/select.js @@ -6,7 +6,7 @@ const testid = "select"; const agentSocket = __ENV.AGENT_SOCKET || "localhost:8100"; const url = `http://${agentSocket}/query`; const data = { - collection: "public_Album", + collection: "Album", query: { fields: { id: { type: "column", column: "AlbumId", arguments: {} }, diff --git a/crates/connectors/ndc-postgres/src/configuration.sql b/crates/connectors/ndc-postgres/src/configuration.sql index 9b883bed8..faf85d642 100644 --- a/crates/connectors/ndc-postgres/src/configuration.sql +++ b/crates/connectors/ndc-postgres/src/configuration.sql @@ -545,7 +545,11 @@ FROM -- Tables and views SELECT jsonb_object_agg( - s.schema_name || '_' || rel.relation_name, + CASE + WHEN s.schema_name = 'public' + THEN rel.relation_name + ELSE s.schema_name || '_' || rel.relation_name + END, jsonb_build_object( 'schemaName', s.schema_name, diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__nested_object_relationships.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__nested_object_relationships.snap index 64c70d4cc..9aa181720 100644 --- a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__nested_object_relationships.snap @@ -7,11 +7,11 @@ expression: result "rows": [ { "track": "Grito De Alerta", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -24,11 +24,11 @@ expression: result }, { "track": "Não Dá Mais Pra Segurar (Explode Coração)", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -41,11 +41,11 @@ expression: result }, { "track": "Começaria Tudo Outra Vez", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -58,11 +58,11 @@ expression: result }, { "track": "O Que É O Que É ?", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -75,11 +75,11 @@ expression: result }, { "track": "Sangrando", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__select_album_object_relationship_to_artist.snap index abe294e83..19f223f95 100644 --- a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aerosmith" @@ -27,7 +27,7 @@ expression: result }, { "Title": "Jagged Little Pill", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alanis Morissette" @@ -37,7 +37,7 @@ expression: result }, { "Title": "Facelift", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alice In Chains" @@ -47,7 +47,7 @@ expression: result }, { "Title": "Warner 25 Anos", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Antônio Carlos Jobim" diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__very_nested_recursive_relationship.snap index c208b4360..fa443b48b 100644 --- a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__relationships__very_nested_recursive_relationship.snap @@ -11,7 +11,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -19,7 +19,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -29,7 +29,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -45,7 +45,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -53,7 +53,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -63,7 +63,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -86,7 +86,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -94,7 +94,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -104,7 +104,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -120,7 +120,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -128,7 +128,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -138,7 +138,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -161,7 +161,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 3, @@ -169,7 +169,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Aerosmith" diff --git a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__sorting__select_order_by_artist_name_with_name.snap index a2143a244..d5e4ceca5 100644 --- a/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/databases-tests/src/aurora/snapshots/databases_tests__aurora__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Name": "A Copland Celebration, Vol. I", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Copland & London Symphony Orchestra" @@ -17,7 +17,7 @@ expression: result }, { "Name": "Worlds", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Goldberg" @@ -27,7 +27,7 @@ expression: result }, { "Name": "Sir Neville Marriner: A Celebration", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields Chamber Ensemble & Sir Neville Marriner" @@ -37,7 +37,7 @@ expression: result }, { "Name": "Fauré: Requiem, Ravel: Pavane & Others", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields, John Birch, Sir Neville Marriner & Sylvia McNair" @@ -47,7 +47,7 @@ expression: result }, { "Name": "The World of Classical Favourites", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields & Sir Neville Marriner" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_by_pk.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_by_pk.snap index 0c03f32ff..019458868 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_by_pk.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_by_pk.snap @@ -16,11 +16,11 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ("%0_public_Album"."AlbumId" = 35) + ("%0_Album"."AlbumId" = 35) ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_name_nilike.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_name_nilike.snap index e4e77d3ba..4d3f99dee 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_name_nilike.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_name_nilike.snap @@ -16,15 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ( - "%0_public_Album"."Title" !~~* cast($1 as varchar) - ) + ("%0_Album"."Title" !~~* cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC LIMIT 5 ) AS "%2_rows" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap index 3e013c0e6..d3f082458 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__explain_tests__explain__select_where_variable.snap @@ -16,13 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ("%0_public_Album"."Title" ~~ cast($1 as varchar)) + ("%0_Album"."Title" ~~ cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__nested_object_relationships.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__nested_object_relationships.snap index c91e3a549..77c1a90d6 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__nested_object_relationships.snap @@ -7,11 +7,11 @@ expression: result "rows": [ { "track": "Grito De Alerta", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -24,11 +24,11 @@ expression: result }, { "track": "Não Dá Mais Pra Segurar (Explode Coração)", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -41,11 +41,11 @@ expression: result }, { "track": "Começaria Tudo Outra Vez", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -58,11 +58,11 @@ expression: result }, { "track": "O Que É O Que É ?", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -75,11 +75,11 @@ expression: result }, { "track": "Sangrando", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__select_album_object_relationship_to_artist.snap index fe0e614a7..8debe9851 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aerosmith" @@ -27,7 +27,7 @@ expression: result }, { "Title": "Jagged Little Pill", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alanis Morissette" @@ -37,7 +37,7 @@ expression: result }, { "Title": "Facelift", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alice In Chains" @@ -47,7 +47,7 @@ expression: result }, { "Title": "Warner 25 Anos", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Antônio Carlos Jobim" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__very_nested_recursive_relationship.snap index c5381837a..c0b6828ff 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__relationships__very_nested_recursive_relationship.snap @@ -11,7 +11,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -19,7 +19,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -29,7 +29,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -45,7 +45,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -53,7 +53,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -63,7 +63,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -86,7 +86,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -94,7 +94,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -104,7 +104,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -120,7 +120,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -128,7 +128,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -138,7 +138,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -161,7 +161,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 3, @@ -169,7 +169,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Aerosmith" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__sorting__select_order_by_artist_name_with_name.snap index 65e57cbdb..d3b86f859 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Name": "A Copland Celebration, Vol. I", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Copland & London Symphony Orchestra" @@ -17,7 +17,7 @@ expression: result }, { "Name": "Worlds", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Goldberg" @@ -27,7 +27,7 @@ expression: result }, { "Name": "Sir Neville Marriner: A Celebration", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields Chamber Ensemble & Sir Neville Marriner" @@ -37,7 +37,7 @@ expression: result }, { "Name": "Fauré: Requiem, Ravel: Pavane & Others", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields, John Birch, Sir Neville Marriner & Sylvia McNair" @@ -47,7 +47,7 @@ expression: result }, { "Name": "The World of Classical Favourites", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields & Sir Neville Marriner" diff --git a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap index 15d870401..0dcb2cbd6 100644 --- a/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap +++ b/crates/tests/databases-tests/src/citus/snapshots/databases_tests__citus__schema_tests__schema_test__get_schema.snap @@ -1471,82 +1471,7 @@ expression: result } }, "object_types": { - "album_by_title": { - "fields": { - "AlbumId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Title": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "artist": { - "fields": { - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Name": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "artist_below_id": { - "fields": { - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Name": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "public_Album": { + "Album": { "description": "The record of all albums", "fields": { "AlbumId": { @@ -1572,7 +1497,7 @@ expression: result } } }, - "public_Artist": { + "Artist": { "description": "The record of all artists", "fields": { "ArtistId": { @@ -1594,7 +1519,7 @@ expression: result } } }, - "public_Customer": { + "Customer": { "description": "The record of all customers", "fields": { "Address": { @@ -1707,7 +1632,7 @@ expression: result } } }, - "public_Employee": { + "Employee": { "fields": { "Address": { "type": { @@ -1837,7 +1762,7 @@ expression: result } } }, - "public_Genre": { + "Genre": { "fields": { "GenreId": { "type": { @@ -1856,7 +1781,7 @@ expression: result } } }, - "public_Invoice": { + "Invoice": { "fields": { "BillingAddress": { "type": { @@ -1929,7 +1854,7 @@ expression: result } } }, - "public_InvoiceLine": { + "InvoiceLine": { "fields": { "InvoiceId": { "type": { @@ -1963,7 +1888,7 @@ expression: result } } }, - "public_MediaType": { + "MediaType": { "fields": { "MediaTypeId": { "type": { @@ -1982,7 +1907,7 @@ expression: result } } }, - "public_Playlist": { + "Playlist": { "fields": { "Name": { "type": { @@ -2001,7 +1926,7 @@ expression: result } } }, - "public_PlaylistTrack": { + "PlaylistTrack": { "fields": { "PlaylistId": { "type": { @@ -2017,7 +1942,7 @@ expression: result } } }, - "public_Track": { + "Track": { "fields": { "AlbumId": { "type": { @@ -2087,7 +2012,82 @@ expression: result } } }, - "public_citus_tables": { + "album_by_title": { + "fields": { + "AlbumId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Title": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "artist": { + "fields": { + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Name": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "artist_below_id": { + "fields": { + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Name": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "citus_tables": { "fields": { "access_method": { "type": { @@ -2314,10 +2314,10 @@ expression: result }, "collections": [ { - "name": "public_Album", + "name": "Album", "description": "The record of all albums", "arguments": {}, - "type": "public_Album", + "type": "Album", "deletable": false, "uniqueness_constraints": { "PK_Album": { @@ -2336,10 +2336,10 @@ expression: result } }, { - "name": "public_Artist", + "name": "Artist", "description": "The record of all artists", "arguments": {}, - "type": "public_Artist", + "type": "Artist", "deletable": false, "uniqueness_constraints": { "PK_Artist": { @@ -2351,10 +2351,10 @@ expression: result "foreign_keys": {} }, { - "name": "public_Customer", + "name": "Customer", "description": "The record of all customers", "arguments": {}, - "type": "public_Customer", + "type": "Customer", "deletable": false, "uniqueness_constraints": { "PK_Customer": { @@ -2373,9 +2373,9 @@ expression: result } }, { - "name": "public_Employee", + "name": "Employee", "arguments": {}, - "type": "public_Employee", + "type": "Employee", "deletable": false, "uniqueness_constraints": { "PK_Employee": { @@ -2394,9 +2394,9 @@ expression: result } }, { - "name": "public_Genre", + "name": "Genre", "arguments": {}, - "type": "public_Genre", + "type": "Genre", "deletable": false, "uniqueness_constraints": { "PK_Genre": { @@ -2408,9 +2408,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Invoice", + "name": "Invoice", "arguments": {}, - "type": "public_Invoice", + "type": "Invoice", "deletable": false, "uniqueness_constraints": { "PK_Invoice": { @@ -2429,9 +2429,9 @@ expression: result } }, { - "name": "public_InvoiceLine", + "name": "InvoiceLine", "arguments": {}, - "type": "public_InvoiceLine", + "type": "InvoiceLine", "deletable": false, "uniqueness_constraints": { "PK_InvoiceLine": { @@ -2456,9 +2456,9 @@ expression: result } }, { - "name": "public_MediaType", + "name": "MediaType", "arguments": {}, - "type": "public_MediaType", + "type": "MediaType", "deletable": false, "uniqueness_constraints": { "PK_MediaType": { @@ -2470,9 +2470,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Playlist", + "name": "Playlist", "arguments": {}, - "type": "public_Playlist", + "type": "Playlist", "deletable": false, "uniqueness_constraints": { "PK_Playlist": { @@ -2484,9 +2484,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_PlaylistTrack", + "name": "PlaylistTrack", "arguments": {}, - "type": "public_PlaylistTrack", + "type": "PlaylistTrack", "deletable": false, "uniqueness_constraints": { "PK_PlaylistTrack": { @@ -2512,9 +2512,9 @@ expression: result } }, { - "name": "public_Track", + "name": "Track", "arguments": {}, - "type": "public_Track", + "type": "Track", "deletable": false, "uniqueness_constraints": { "PK_Track": { @@ -2545,9 +2545,9 @@ expression: result } }, { - "name": "public_citus_tables", + "name": "citus_tables", "arguments": {}, - "type": "public_citus_tables", + "type": "citus_tables", "deletable": false, "uniqueness_constraints": {}, "foreign_keys": {} diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_by_pk.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_by_pk.snap index f7d959a0b..ed88487b9 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_by_pk.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_by_pk.snap @@ -16,11 +16,11 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ("%0_public_Album"."AlbumId" = 35) + ("%0_Album"."AlbumId" = 35) ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_name_nilike.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_name_nilike.snap index f79592102..e94bb409b 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_name_nilike.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_name_nilike.snap @@ -16,15 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ( - "%0_public_Album"."Title" NOT ILIKE cast($1 as varchar) - ) + ("%0_Album"."Title" NOT ILIKE cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC LIMIT 5 ) AS "%2_rows" diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap index ab474b9b3..f68f0f979 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__explain_tests__explain__select_where_variable.snap @@ -16,15 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ( - "%0_public_Album"."Title" LIKE cast($1 as varchar) - ) + ("%0_Album"."Title" LIKE cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__nested_object_relationships.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__nested_object_relationships.snap index 70bc2a601..1328b9769 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__nested_object_relationships.snap @@ -6,85 +6,85 @@ expression: result { "rows": [ { - "public_Album": { + "Album": { "rows": [ { - "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" } ] - } + }, + "album": "Meus Momentos" } ] }, "track": "Grito De Alerta" }, { - "public_Album": { + "Album": { "rows": [ { - "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" } ] - } + }, + "album": "Meus Momentos" } ] }, "track": "Não Dá Mais Pra Segurar (Explode Coração)" }, { - "public_Album": { + "Album": { "rows": [ { - "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" } ] - } + }, + "album": "Meus Momentos" } ] }, "track": "Começaria Tudo Outra Vez" }, { - "public_Album": { + "Album": { "rows": [ { - "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" } ] - } + }, + "album": "Meus Momentos" } ] }, "track": "O Que É O Que É ?" }, { - "public_Album": { + "Album": { "rows": [ { - "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" } ] - } + }, + "album": "Meus Momentos" } ] }, diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__select_album_object_relationship_to_artist.snap index 0e0d7ceaa..1d7e5446d 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -6,54 +6,54 @@ expression: result { "rows": [ { - "Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" } ] - } + }, + "Title": "Let There Be Rock" }, { - "Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aerosmith" } ] - } + }, + "Title": "Big Ones" }, { - "Title": "Jagged Little Pill", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alanis Morissette" } ] - } + }, + "Title": "Jagged Little Pill" }, { - "Title": "Facelift", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alice In Chains" } ] - } + }, + "Title": "Facelift" }, { - "Title": "Warner 25 Anos", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Antônio Carlos Jobim" } ] - } + }, + "Title": "Warner 25 Anos" } ] } diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__very_nested_recursive_relationship.snap index a2540199d..e62f02314 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__relationships__very_nested_recursive_relationship.snap @@ -11,7 +11,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -19,7 +19,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -29,7 +29,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -45,7 +45,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -53,7 +53,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -63,7 +63,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -86,7 +86,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -94,7 +94,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -104,7 +104,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -120,7 +120,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -128,7 +128,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -138,7 +138,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -161,7 +161,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 3, @@ -169,7 +169,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Aerosmith" diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__sorting__select_order_by_artist_name_with_name.snap index e2dcd8a13..f3106114c 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -6,54 +6,54 @@ expression: result { "rows": [ { - "Name": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" } ] - } + }, + "Name": "For Those About To Rock We Salute You" }, { - "Name": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" } ] - } + }, + "Name": "Let There Be Rock" }, { - "Name": "A Copland Celebration, Vol. I", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Copland & London Symphony Orchestra" } ] - } + }, + "Name": "A Copland Celebration, Vol. I" }, { - "Name": "Worlds", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Goldberg" } ] - } + }, + "Name": "Worlds" }, { - "Name": "The World of Classical Favourites", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields & Sir Neville Marriner" } ] - } + }, + "Name": "The World of Classical Favourites" } ] } diff --git a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap index c4c09f0de..d777fd1a6 100644 --- a/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap +++ b/crates/tests/databases-tests/src/cockroach/snapshots/databases_tests__cockroach__schema_tests__schema_test__get_schema.snap @@ -1175,46 +1175,34 @@ expression: result } }, "object_types": { - "album_by_title": { + "Album": { "fields": { "AlbumId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } + "type": "named", + "name": "int8" } }, "ArtistId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } + "type": "named", + "name": "int8" } }, "Title": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "varchar" } } } }, - "artist": { + "Artist": { "fields": { "ArtistId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } + "type": "named", + "name": "int8" } }, "Name": { @@ -1228,18 +1216,18 @@ expression: result } } }, - "artist_below_id": { + "Customer": { "fields": { - "ArtistId": { + "Address": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int4" + "name": "varchar" } } }, - "Name": { + "City": { "type": { "type": "nullable", "underlying_type": { @@ -1247,164 +1235,189 @@ expression: result "name": "varchar" } } - } - } - }, - "pg_extension_geography_columns": { - "fields": { - "coord_dimension": { + }, + "Company": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } }, - "f_geography_column": { + "Country": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "f_table_catalog": { + "CustomerId": { + "type": { + "type": "named", + "name": "int8" + } + }, + "Email": { + "type": { + "type": "named", + "name": "varchar" + } + }, + "Fax": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "f_table_name": { + "FirstName": { + "type": { + "type": "named", + "name": "varchar" + } + }, + "LastName": { + "type": { + "type": "named", + "name": "varchar" + } + }, + "Phone": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "f_table_schema": { + "PostalCode": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "srid": { + "State": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } }, - "type": { + "SupportRepId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "text" + "name": "int8" } } } } }, - "pg_extension_geometry_columns": { + "Employee": { "fields": { - "coord_dimension": { + "Address": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } }, - "f_geometry_column": { + "BirthDate": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "timestamp" } } }, - "f_table_catalog": { + "City": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "f_table_name": { + "Country": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "f_table_schema": { + "Email": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "name" + "name": "varchar" } } }, - "srid": { + "EmployeeId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int8" - } + "type": "named", + "name": "int8" } }, - "type": { + "Fax": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "text" + "name": "varchar" } } - } - } - }, - "pg_extension_spatial_ref_sys": { - "fields": { - "auth_name": { + }, + "FirstName": { + "type": { + "type": "named", + "name": "varchar" + } + }, + "HireDate": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "timestamp" } } }, - "auth_srid": { + "LastName": { + "type": { + "type": "named", + "name": "varchar" + } + }, + "Phone": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } }, - "proj4text": { + "PostalCode": { "type": { "type": "nullable", "underlying_type": { @@ -1413,7 +1426,7 @@ expression: result } } }, - "srid": { + "ReportsTo": { "type": { "type": "nullable", "underlying_type": { @@ -1422,7 +1435,7 @@ expression: result } } }, - "srtext": { + "State": { "type": { "type": "nullable", "underlying_type": { @@ -1430,34 +1443,21 @@ expression: result "name": "varchar" } } - } - } - }, - "public_Album": { - "fields": { - "AlbumId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "ArtistId": { - "type": { - "type": "named", - "name": "int8" - } }, "Title": { "type": { - "type": "named", - "name": "varchar" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } } } } }, - "public_Artist": { + "Genre": { "fields": { - "ArtistId": { + "GenreId": { "type": { "type": "named", "name": "int8" @@ -1474,9 +1474,9 @@ expression: result } } }, - "public_Customer": { + "Invoice": { "fields": { - "Address": { + "BillingAddress": { "type": { "type": "nullable", "underlying_type": { @@ -1485,7 +1485,7 @@ expression: result } } }, - "City": { + "BillingCity": { "type": { "type": "nullable", "underlying_type": { @@ -1494,7 +1494,7 @@ expression: result } } }, - "Company": { + "BillingCountry": { "type": { "type": "nullable", "underlying_type": { @@ -1503,7 +1503,16 @@ expression: result } } }, - "Country": { + "BillingPostalCode": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + }, + "BillingState": { "type": { "type": "nullable", "underlying_type": { @@ -1518,74 +1527,82 @@ expression: result "name": "int8" } }, - "Email": { + "InvoiceDate": { "type": { "type": "named", - "name": "varchar" + "name": "timestamp" } }, - "Fax": { + "InvoiceId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "int8" } }, - "FirstName": { + "Total": { "type": { "type": "named", - "name": "varchar" + "name": "numeric" + } + } + } + }, + "InvoiceLine": { + "fields": { + "InvoiceId": { + "type": { + "type": "named", + "name": "int8" } }, - "LastName": { + "InvoiceLineId": { "type": { "type": "named", - "name": "varchar" + "name": "int8" } }, - "Phone": { + "Quantity": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "int8" } }, - "PostalCode": { + "TrackId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "int8" } }, - "State": { + "UnitPrice": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "numeric" + } + } + } + }, + "MediaType": { + "fields": { + "MediaTypeId": { + "type": { + "type": "named", + "name": "int8" } }, - "SupportRepId": { + "Name": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } } } }, - "public_Employee": { + "Playlist": { "fields": { - "Address": { + "Name": { "type": { "type": "nullable", "underlying_type": { @@ -1594,34 +1611,51 @@ expression: result } } }, - "BirthDate": { + "PlaylistId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "timestamp" - } + "type": "named", + "name": "int8" + } + } + } + }, + "PlaylistTrack": { + "fields": { + "PlaylistId": { + "type": { + "type": "named", + "name": "int8" } }, - "City": { + "TrackId": { + "type": { + "type": "named", + "name": "int8" + } + } + } + }, + "Track": { + "fields": { + "AlbumId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int8" } } }, - "Country": { + "Bytes": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int8" } } }, - "Email": { + "Composer": { "type": { "type": "nullable", "underlying_type": { @@ -1630,75 +1664,64 @@ expression: result } } }, - "EmployeeId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "Fax": { + "GenreId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int8" } } }, - "FirstName": { + "MediaTypeId": { "type": { "type": "named", - "name": "varchar" + "name": "int8" } }, - "HireDate": { + "Milliseconds": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "timestamp" - } + "type": "named", + "name": "int8" } }, - "LastName": { + "Name": { "type": { "type": "named", "name": "varchar" } }, - "Phone": { + "TrackId": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "int8" } }, - "PostalCode": { + "UnitPrice": { "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } + "type": "named", + "name": "numeric" } - }, - "ReportsTo": { + } + } + }, + "album_by_title": { + "fields": { + "AlbumId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "int4" } } }, - "State": { + "ArtistId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int4" } } }, @@ -1713,12 +1736,15 @@ expression: result } } }, - "public_Genre": { + "artist": { "fields": { - "GenreId": { + "ArtistId": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } } }, "Name": { @@ -1732,18 +1758,18 @@ expression: result } } }, - "public_Invoice": { + "artist_below_id": { "fields": { - "BillingAddress": { + "ArtistId": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int4" } } }, - "BillingCity": { + "Name": { "type": { "type": "nullable", "underlying_type": { @@ -1751,160 +1777,155 @@ expression: result "name": "varchar" } } - }, - "BillingCountry": { + } + } + }, + "pg_extension_geography_columns": { + "fields": { + "coord_dimension": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "int8" } } }, - "BillingPostalCode": { + "f_geography_column": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "name" } } }, - "BillingState": { + "f_table_catalog": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "name" } } }, - "CustomerId": { + "f_table_name": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "name" + } } }, - "InvoiceDate": { + "f_table_schema": { "type": { - "type": "named", - "name": "timestamp" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "name" + } } }, - "InvoiceId": { + "srid": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int8" + } } }, - "Total": { + "type": { "type": { - "type": "named", - "name": "numeric" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "text" + } } } } }, - "public_InvoiceLine": { + "pg_extension_geometry_columns": { "fields": { - "InvoiceId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "InvoiceLineId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "Quantity": { + "coord_dimension": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int8" + } } }, - "TrackId": { + "f_geometry_column": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "name" + } } }, - "UnitPrice": { - "type": { - "type": "named", - "name": "numeric" - } - } - } - }, - "public_MediaType": { - "fields": { - "MediaTypeId": { + "f_table_catalog": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "name" + } } }, - "Name": { + "f_table_name": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "name" } } - } - } - }, - "public_Playlist": { - "fields": { - "Name": { + }, + "f_table_schema": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "varchar" + "name": "name" } } }, - "PlaylistId": { - "type": { - "type": "named", - "name": "int8" - } - } - } - }, - "public_PlaylistTrack": { - "fields": { - "PlaylistId": { + "srid": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int8" + } } }, - "TrackId": { + "type": { "type": { - "type": "named", - "name": "int8" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "text" + } } } } }, - "public_Track": { + "pg_extension_spatial_ref_sys": { "fields": { - "AlbumId": { + "auth_name": { "type": { "type": "nullable", "underlying_type": { "type": "named", - "name": "int8" + "name": "varchar" } } }, - "Bytes": { + "auth_srid": { "type": { "type": "nullable", "underlying_type": { @@ -1913,7 +1934,7 @@ expression: result } } }, - "Composer": { + "proj4text": { "type": { "type": "nullable", "underlying_type": { @@ -1922,7 +1943,7 @@ expression: result } } }, - "GenreId": { + "srid": { "type": { "type": "nullable", "underlying_type": { @@ -1931,34 +1952,13 @@ expression: result } } }, - "MediaTypeId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "Milliseconds": { - "type": { - "type": "named", - "name": "int8" - } - }, - "Name": { - "type": { - "type": "named", - "name": "varchar" - } - }, - "TrackId": { - "type": { - "type": "named", - "name": "int8" - } - }, - "UnitPrice": { + "srtext": { "type": { - "type": "named", - "name": "numeric" + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } } } } @@ -2114,33 +2114,9 @@ expression: result }, "collections": [ { - "name": "pg_extension_geography_columns", - "arguments": {}, - "type": "pg_extension_geography_columns", - "deletable": false, - "uniqueness_constraints": {}, - "foreign_keys": {} - }, - { - "name": "pg_extension_geometry_columns", - "arguments": {}, - "type": "pg_extension_geometry_columns", - "deletable": false, - "uniqueness_constraints": {}, - "foreign_keys": {} - }, - { - "name": "pg_extension_spatial_ref_sys", - "arguments": {}, - "type": "pg_extension_spatial_ref_sys", - "deletable": false, - "uniqueness_constraints": {}, - "foreign_keys": {} - }, - { - "name": "public_Album", + "name": "Album", "arguments": {}, - "type": "public_Album", + "type": "Album", "deletable": false, "uniqueness_constraints": { "PK_Album": { @@ -2159,9 +2135,9 @@ expression: result } }, { - "name": "public_Artist", + "name": "Artist", "arguments": {}, - "type": "public_Artist", + "type": "Artist", "deletable": false, "uniqueness_constraints": { "PK_Artist": { @@ -2173,9 +2149,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Customer", + "name": "Customer", "arguments": {}, - "type": "public_Customer", + "type": "Customer", "deletable": false, "uniqueness_constraints": { "PK_Customer": { @@ -2194,9 +2170,9 @@ expression: result } }, { - "name": "public_Employee", + "name": "Employee", "arguments": {}, - "type": "public_Employee", + "type": "Employee", "deletable": false, "uniqueness_constraints": { "PK_Employee": { @@ -2215,9 +2191,9 @@ expression: result } }, { - "name": "public_Genre", + "name": "Genre", "arguments": {}, - "type": "public_Genre", + "type": "Genre", "deletable": false, "uniqueness_constraints": { "PK_Genre": { @@ -2229,9 +2205,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Invoice", + "name": "Invoice", "arguments": {}, - "type": "public_Invoice", + "type": "Invoice", "deletable": false, "uniqueness_constraints": { "PK_Invoice": { @@ -2250,9 +2226,9 @@ expression: result } }, { - "name": "public_InvoiceLine", + "name": "InvoiceLine", "arguments": {}, - "type": "public_InvoiceLine", + "type": "InvoiceLine", "deletable": false, "uniqueness_constraints": { "PK_InvoiceLine": { @@ -2277,9 +2253,9 @@ expression: result } }, { - "name": "public_MediaType", + "name": "MediaType", "arguments": {}, - "type": "public_MediaType", + "type": "MediaType", "deletable": false, "uniqueness_constraints": { "PK_MediaType": { @@ -2291,9 +2267,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Playlist", + "name": "Playlist", "arguments": {}, - "type": "public_Playlist", + "type": "Playlist", "deletable": false, "uniqueness_constraints": { "PK_Playlist": { @@ -2305,9 +2281,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_PlaylistTrack", + "name": "PlaylistTrack", "arguments": {}, - "type": "public_PlaylistTrack", + "type": "PlaylistTrack", "deletable": false, "uniqueness_constraints": { "PK_PlaylistTrack": { @@ -2333,9 +2309,9 @@ expression: result } }, { - "name": "public_Track", + "name": "Track", "arguments": {}, - "type": "public_Track", + "type": "Track", "deletable": false, "uniqueness_constraints": { "PK_Track": { @@ -2365,6 +2341,30 @@ expression: result } } }, + { + "name": "pg_extension_geography_columns", + "arguments": {}, + "type": "pg_extension_geography_columns", + "deletable": false, + "uniqueness_constraints": {}, + "foreign_keys": {} + }, + { + "name": "pg_extension_geometry_columns", + "arguments": {}, + "type": "pg_extension_geometry_columns", + "deletable": false, + "uniqueness_constraints": {}, + "foreign_keys": {} + }, + { + "name": "pg_extension_spatial_ref_sys", + "arguments": {}, + "type": "pg_extension_spatial_ref_sys", + "deletable": false, + "uniqueness_constraints": {}, + "foreign_keys": {} + }, { "name": "album_by_title", "arguments": { diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap index 72634ab95..b59bc4750 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__configuration_tests__configuration_tests__configure_initial_configuration_is_unchanged.snap @@ -11,7 +11,7 @@ expression: default_configuration }, "metadata": { "tables": { - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -49,7 +49,7 @@ expression: default_configuration }, "description": "The record of all albums" }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -74,7 +74,7 @@ expression: default_configuration "foreignRelations": {}, "description": "The record of all artists" }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -172,7 +172,7 @@ expression: default_configuration }, "description": "The record of all customers" }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -282,7 +282,7 @@ expression: default_configuration }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -307,7 +307,7 @@ expression: default_configuration "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -381,7 +381,7 @@ expression: default_configuration }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -437,7 +437,7 @@ expression: default_configuration }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -462,7 +462,7 @@ expression: default_configuration "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -487,7 +487,7 @@ expression: default_configuration "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -526,7 +526,7 @@ expression: default_configuration }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": { @@ -612,7 +612,7 @@ expression: default_configuration }, "description": null }, - "public_geography_columns": { + "geography_columns": { "schemaName": "public", "tableName": "geography_columns", "columns": { @@ -663,7 +663,7 @@ expression: default_configuration "foreignRelations": {}, "description": null }, - "public_geometry_columns": { + "geometry_columns": { "schemaName": "public", "tableName": "geometry_columns", "columns": { @@ -714,7 +714,7 @@ expression: default_configuration "foreignRelations": {}, "description": null }, - "public_spatial_ref_sys": { + "spatial_ref_sys": { "schemaName": "public", "tableName": "spatial_ref_sys", "columns": { diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_by_pk.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_by_pk.snap index e975d2cd7..384330710 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_by_pk.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_by_pk.snap @@ -16,11 +16,11 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ("%0_public_Album"."AlbumId" = 35) + ("%0_Album"."AlbumId" = 35) ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_name_nilike.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_name_nilike.snap index c45528c7b..7eb30de72 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_name_nilike.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_name_nilike.snap @@ -16,15 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ( - "%0_public_Album"."Title" !~~* cast($1 as varchar) - ) + ("%0_Album"."Title" !~~* cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC LIMIT 5 ) AS "%2_rows" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap index fcfae9b64..407c7ae31 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__explain_tests__explain__select_where_variable.snap @@ -16,13 +16,13 @@ FROM FROM ( SELECT - "%0_public_Album"."Title" AS "Title" + "%0_Album"."Title" AS "Title" FROM - "public"."Album" AS "%0_public_Album" + "public"."Album" AS "%0_Album" WHERE - ("%0_public_Album"."Title" ~~ cast($1 as varchar)) + ("%0_Album"."Title" ~~ cast($1 as varchar)) ORDER BY - "%0_public_Album"."AlbumId" ASC + "%0_Album"."AlbumId" ASC ) AS "%2_rows" ) AS "%2_rows" ) AS "%1_universe" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__nested_object_relationships.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__nested_object_relationships.snap index b76e0c5b9..6221cf810 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__nested_object_relationships.snap @@ -7,11 +7,11 @@ expression: result "rows": [ { "track": "Grito De Alerta", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -24,11 +24,11 @@ expression: result }, { "track": "Não Dá Mais Pra Segurar (Explode Coração)", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -41,11 +41,11 @@ expression: result }, { "track": "Começaria Tudo Outra Vez", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -58,11 +58,11 @@ expression: result }, { "track": "O Que É O Que É ?", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -75,11 +75,11 @@ expression: result }, { "track": "Sangrando", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap index ca000d760..ca89fdb0a 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aerosmith" @@ -27,7 +27,7 @@ expression: result }, { "Title": "Jagged Little Pill", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alanis Morissette" @@ -37,7 +37,7 @@ expression: result }, { "Title": "Facelift", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alice In Chains" @@ -47,7 +47,7 @@ expression: result }, { "Title": "Warner 25 Anos", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Antônio Carlos Jobim" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap index 5da398726..476253267 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__relationships__very_nested_recursive_relationship.snap @@ -11,7 +11,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -19,7 +19,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -29,7 +29,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -45,7 +45,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -53,7 +53,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -63,7 +63,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -86,7 +86,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -94,7 +94,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -104,7 +104,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -120,7 +120,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -128,7 +128,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -138,7 +138,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -161,7 +161,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 3, @@ -169,7 +169,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Aerosmith" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap index 8143dd6f6..f78a92504 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Name": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Name": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -27,7 +27,7 @@ expression: result }, { "Name": "A Copland Celebration, Vol. I", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Copland & London Symphony Orchestra" @@ -37,7 +37,7 @@ expression: result }, { "Name": "Worlds", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Goldberg" @@ -47,7 +47,7 @@ expression: result }, { "Name": "The World of Classical Favourites", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields & Sir Neville Marriner" diff --git a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap index 63079c534..88715294d 100644 --- a/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap +++ b/crates/tests/databases-tests/src/postgres/snapshots/databases_tests__postgres__schema_tests__schema_test__get_schema.snap @@ -1429,82 +1429,7 @@ expression: result } }, "object_types": { - "album_by_title": { - "fields": { - "AlbumId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Title": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "artist": { - "fields": { - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Name": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "artist_below_id": { - "fields": { - "ArtistId": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "int4" - } - } - }, - "Name": { - "type": { - "type": "nullable", - "underlying_type": { - "type": "named", - "name": "varchar" - } - } - } - } - }, - "public_Album": { + "Album": { "description": "The record of all albums", "fields": { "AlbumId": { @@ -1530,7 +1455,7 @@ expression: result } } }, - "public_Artist": { + "Artist": { "description": "The record of all artists", "fields": { "ArtistId": { @@ -1552,7 +1477,7 @@ expression: result } } }, - "public_Customer": { + "Customer": { "description": "The record of all customers", "fields": { "Address": { @@ -1665,7 +1590,7 @@ expression: result } } }, - "public_Employee": { + "Employee": { "fields": { "Address": { "type": { @@ -1795,7 +1720,7 @@ expression: result } } }, - "public_Genre": { + "Genre": { "fields": { "GenreId": { "type": { @@ -1814,7 +1739,7 @@ expression: result } } }, - "public_Invoice": { + "Invoice": { "fields": { "BillingAddress": { "type": { @@ -1887,7 +1812,7 @@ expression: result } } }, - "public_InvoiceLine": { + "InvoiceLine": { "fields": { "InvoiceId": { "type": { @@ -1921,7 +1846,7 @@ expression: result } } }, - "public_MediaType": { + "MediaType": { "fields": { "MediaTypeId": { "type": { @@ -1940,7 +1865,7 @@ expression: result } } }, - "public_Playlist": { + "Playlist": { "fields": { "Name": { "type": { @@ -1959,7 +1884,7 @@ expression: result } } }, - "public_PlaylistTrack": { + "PlaylistTrack": { "fields": { "PlaylistId": { "type": { @@ -1975,7 +1900,7 @@ expression: result } } }, - "public_Track": { + "Track": { "fields": { "AlbumId": { "type": { @@ -2045,7 +1970,82 @@ expression: result } } }, - "public_geography_columns": { + "album_by_title": { + "fields": { + "AlbumId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Title": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "artist": { + "fields": { + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Name": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "artist_below_id": { + "fields": { + "ArtistId": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "int4" + } + } + }, + "Name": { + "type": { + "type": "nullable", + "underlying_type": { + "type": "named", + "name": "varchar" + } + } + } + } + }, + "geography_columns": { "fields": { "coord_dimension": { "type": { @@ -2112,7 +2112,7 @@ expression: result } } }, - "public_geometry_columns": { + "geometry_columns": { "fields": { "coord_dimension": { "type": { @@ -2179,7 +2179,7 @@ expression: result } } }, - "public_spatial_ref_sys": { + "spatial_ref_sys": { "fields": { "auth_name": { "type": { @@ -2465,10 +2465,10 @@ expression: result }, "collections": [ { - "name": "public_Album", + "name": "Album", "description": "The record of all albums", "arguments": {}, - "type": "public_Album", + "type": "Album", "deletable": false, "uniqueness_constraints": { "PK_Album": { @@ -2487,10 +2487,10 @@ expression: result } }, { - "name": "public_Artist", + "name": "Artist", "description": "The record of all artists", "arguments": {}, - "type": "public_Artist", + "type": "Artist", "deletable": false, "uniqueness_constraints": { "PK_Artist": { @@ -2502,10 +2502,10 @@ expression: result "foreign_keys": {} }, { - "name": "public_Customer", + "name": "Customer", "description": "The record of all customers", "arguments": {}, - "type": "public_Customer", + "type": "Customer", "deletable": false, "uniqueness_constraints": { "PK_Customer": { @@ -2524,9 +2524,9 @@ expression: result } }, { - "name": "public_Employee", + "name": "Employee", "arguments": {}, - "type": "public_Employee", + "type": "Employee", "deletable": false, "uniqueness_constraints": { "PK_Employee": { @@ -2545,9 +2545,9 @@ expression: result } }, { - "name": "public_Genre", + "name": "Genre", "arguments": {}, - "type": "public_Genre", + "type": "Genre", "deletable": false, "uniqueness_constraints": { "PK_Genre": { @@ -2559,9 +2559,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Invoice", + "name": "Invoice", "arguments": {}, - "type": "public_Invoice", + "type": "Invoice", "deletable": false, "uniqueness_constraints": { "PK_Invoice": { @@ -2580,9 +2580,9 @@ expression: result } }, { - "name": "public_InvoiceLine", + "name": "InvoiceLine", "arguments": {}, - "type": "public_InvoiceLine", + "type": "InvoiceLine", "deletable": false, "uniqueness_constraints": { "PK_InvoiceLine": { @@ -2607,9 +2607,9 @@ expression: result } }, { - "name": "public_MediaType", + "name": "MediaType", "arguments": {}, - "type": "public_MediaType", + "type": "MediaType", "deletable": false, "uniqueness_constraints": { "PK_MediaType": { @@ -2621,9 +2621,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_Playlist", + "name": "Playlist", "arguments": {}, - "type": "public_Playlist", + "type": "Playlist", "deletable": false, "uniqueness_constraints": { "PK_Playlist": { @@ -2635,9 +2635,9 @@ expression: result "foreign_keys": {} }, { - "name": "public_PlaylistTrack", + "name": "PlaylistTrack", "arguments": {}, - "type": "public_PlaylistTrack", + "type": "PlaylistTrack", "deletable": false, "uniqueness_constraints": { "PK_PlaylistTrack": { @@ -2663,9 +2663,9 @@ expression: result } }, { - "name": "public_Track", + "name": "Track", "arguments": {}, - "type": "public_Track", + "type": "Track", "deletable": false, "uniqueness_constraints": { "PK_Track": { @@ -2696,25 +2696,25 @@ expression: result } }, { - "name": "public_geography_columns", + "name": "geography_columns", "arguments": {}, - "type": "public_geography_columns", + "type": "geography_columns", "deletable": false, "uniqueness_constraints": {}, "foreign_keys": {} }, { - "name": "public_geometry_columns", + "name": "geometry_columns", "arguments": {}, - "type": "public_geometry_columns", + "type": "geometry_columns", "deletable": false, "uniqueness_constraints": {}, "foreign_keys": {} }, { - "name": "public_spatial_ref_sys", + "name": "spatial_ref_sys", "arguments": {}, - "type": "public_spatial_ref_sys", + "type": "spatial_ref_sys", "deletable": false, "uniqueness_constraints": { "spatial_ref_sys_pkey": { diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__nested_object_relationships.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__nested_object_relationships.snap index 83c2e649f..3a373cce0 100644 --- a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__nested_object_relationships.snap +++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__nested_object_relationships.snap @@ -7,11 +7,11 @@ expression: result "rows": [ { "track": "Grito De Alerta", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -24,11 +24,11 @@ expression: result }, { "track": "Não Dá Mais Pra Segurar (Explode Coração)", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -41,11 +41,11 @@ expression: result }, { "track": "Começaria Tudo Outra Vez", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -58,11 +58,11 @@ expression: result }, { "track": "O Que É O Que É ?", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" @@ -75,11 +75,11 @@ expression: result }, { "track": "Sangrando", - "public_Album": { + "Album": { "rows": [ { "album": "Meus Momentos", - "public_Artist": { + "Artist": { "rows": [ { "artist": "Gonzaguinha" diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__select_album_object_relationship_to_artist.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__select_album_object_relationship_to_artist.snap index 99fe0e37f..7f2e02a59 100644 --- a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__select_album_object_relationship_to_artist.snap +++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__select_album_object_relationship_to_artist.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aerosmith" @@ -27,7 +27,7 @@ expression: result }, { "Title": "Jagged Little Pill", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alanis Morissette" @@ -37,7 +37,7 @@ expression: result }, { "Title": "Facelift", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Alice In Chains" @@ -47,7 +47,7 @@ expression: result }, { "Title": "Warner 25 Anos", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Antônio Carlos Jobim" diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__very_nested_recursive_relationship.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__very_nested_recursive_relationship.snap index c5b2d9fbd..0cc011ebd 100644 --- a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__very_nested_recursive_relationship.snap +++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__relationships__very_nested_recursive_relationship.snap @@ -11,7 +11,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -19,7 +19,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -29,7 +29,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -45,7 +45,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 1, @@ -53,7 +53,7 @@ expression: result "rows": [ { "0Title": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -63,7 +63,7 @@ expression: result }, { "0Title": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "AC/DC" @@ -86,7 +86,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -94,7 +94,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -104,7 +104,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -120,7 +120,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 2, @@ -128,7 +128,7 @@ expression: result "rows": [ { "0Title": "Balls to the Wall", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -138,7 +138,7 @@ expression: result }, { "0Title": "Restless and Wild", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Accept" @@ -161,7 +161,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0ArtistId": 3, @@ -169,7 +169,7 @@ expression: result "rows": [ { "0Title": "Big Ones", - "public_Artist": { + "Artist": { "rows": [ { "0Name": "Aerosmith" diff --git a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__sorting__select_order_by_artist_name_with_name.snap b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__sorting__select_order_by_artist_name_with_name.snap index ad9d7fba0..4323d3c90 100644 --- a/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__sorting__select_order_by_artist_name_with_name.snap +++ b/crates/tests/databases-tests/src/yugabyte/snapshots/databases_tests__yugabyte__query_tests__sorting__select_order_by_artist_name_with_name.snap @@ -7,7 +7,7 @@ expression: result "rows": [ { "Name": "For Those About To Rock We Salute You", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -17,7 +17,7 @@ expression: result }, { "Name": "Let There Be Rock", - "public_Artist": { + "Artist": { "rows": [ { "Name": "AC/DC" @@ -27,7 +27,7 @@ expression: result }, { "Name": "A Copland Celebration, Vol. I", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Copland & London Symphony Orchestra" @@ -37,7 +37,7 @@ expression: result }, { "Name": "Worlds", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Aaron Goldberg" @@ -47,7 +47,7 @@ expression: result }, { "Name": "The World of Classical Favourites", - "public_Artist": { + "Artist": { "rows": [ { "Name": "Academy of St. Martin in the Fields & Sir Neville Marriner" diff --git a/crates/tests/tests-common/goldenfiles/aggregate_count_albums.json b/crates/tests/tests-common/goldenfiles/aggregate_count_albums.json index 1850dae6b..b4dea1bc0 100644 --- a/crates/tests/tests-common/goldenfiles/aggregate_count_albums.json +++ b/crates/tests/tests-common/goldenfiles/aggregate_count_albums.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "aggregates": { "how_many_albums": { diff --git a/crates/tests/tests-common/goldenfiles/aggregate_count_albums_plus_field.json b/crates/tests/tests-common/goldenfiles/aggregate_count_albums_plus_field.json index 2faff16ae..34b299e8c 100644 --- a/crates/tests/tests-common/goldenfiles/aggregate_count_albums_plus_field.json +++ b/crates/tests/tests-common/goldenfiles/aggregate_count_albums_plus_field.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums.json b/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums.json index 4afb5b0b2..b81d50350 100644 --- a/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums.json +++ b/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -42,8 +42,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums_plus_field.json b/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums_plus_field.json index 2053b170d..41085adf4 100644 --- a/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums_plus_field.json +++ b/crates/tests/tests-common/goldenfiles/aggregate_count_artist_albums_plus_field.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -61,8 +61,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/dup_array_relationship.json b/crates/tests/tests-common/goldenfiles/dup_array_relationship.json index 311bb0e7b..f99bd7172 100644 --- a/crates/tests/tests-common/goldenfiles/dup_array_relationship.json +++ b/crates/tests/tests-common/goldenfiles/dup_array_relationship.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "albums": { @@ -76,8 +76,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/native_queries/select_artist_with_album_by_title_relationship_arguments.json b/crates/tests/tests-common/goldenfiles/native_queries/select_artist_with_album_by_title_relationship_arguments.json index e51b0669d..d4d71420e 100644 --- a/crates/tests/tests-common/goldenfiles/native_queries/select_artist_with_album_by_title_relationship_arguments.json +++ b/crates/tests/tests-common/goldenfiles/native_queries/select_artist_with_album_by_title_relationship_arguments.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -60,7 +60,7 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", + "source_collection_or_type": "Artist", "target_collection": "album_by_title", "arguments": { "id": { diff --git a/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json b/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json index 5d8fe1e42..592f544bc 100644 --- a/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json +++ b/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -76,7 +76,7 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", + "source_collection_or_type": "Artist", "target_collection": "album_by_title", "arguments": { "id": { "type": "literal", "value": 1000 }, diff --git a/crates/tests/tests-common/goldenfiles/nested_array_relationships.json b/crates/tests/tests-common/goldenfiles/nested_array_relationships.json index 205d98fc0..d737af9f8 100644 --- a/crates/tests/tests-common/goldenfiles/nested_array_relationships.json +++ b/crates/tests/tests-common/goldenfiles/nested_array_relationships.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "artist": { @@ -84,8 +84,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} }, "AlbumTracks": { @@ -93,8 +93,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "array", - "source_collection_or_type": "public_Album", - "target_collection": "public_Track", + "source_collection_or_type": "Album", + "target_collection": "Track", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/nested_object_relationships.json b/crates/tests/tests-common/goldenfiles/nested_object_relationships.json index e3ca4eaf0..094849434 100644 --- a/crates/tests/tests-common/goldenfiles/nested_object_relationships.json +++ b/crates/tests/tests-common/goldenfiles/nested_object_relationships.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "track": { @@ -7,7 +7,7 @@ "column": "Name", "arguments": {} }, - "public_Album": { + "Album": { "type": "relationship", "relationship": "TrackToAlbum", "arguments": {}, @@ -18,7 +18,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumToArtist", "arguments": {}, @@ -58,8 +58,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} }, "AlbumToArtist": { @@ -67,8 +67,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_5.json b/crates/tests/tests-common/goldenfiles/select_5.json index 00ce6228f..53ec07f40 100644 --- a/crates/tests/tests-common/goldenfiles/select_5.json +++ b/crates/tests/tests-common/goldenfiles/select_5.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/select_album_object_relationship_to_artist.json b/crates/tests/tests-common/goldenfiles/select_album_object_relationship_to_artist.json index 7a78684bb..fa07d2e9a 100644 --- a/crates/tests/tests-common/goldenfiles/select_album_object_relationship_to_artist.json +++ b/crates/tests/tests-common/goldenfiles/select_album_object_relationship_to_artist.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { @@ -7,7 +7,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumToArtist", "arguments": {}, @@ -44,8 +44,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_artist_array_relationship_to_album.json b/crates/tests/tests-common/goldenfiles/select_artist_array_relationship_to_album.json index 910a592e4..2f143e630 100644 --- a/crates/tests/tests-common/goldenfiles/select_artist_array_relationship_to_album.json +++ b/crates/tests/tests-common/goldenfiles/select_artist_array_relationship_to_album.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -56,8 +56,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_by_pk.json b/crates/tests/tests-common/goldenfiles/select_by_pk.json index 95cf0ca09..3a257a4ed 100644 --- a/crates/tests/tests-common/goldenfiles/select_by_pk.json +++ b/crates/tests/tests-common/goldenfiles/select_by_pk.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/select_int_and_string.json b/crates/tests/tests-common/goldenfiles/select_int_and_string.json index 32a85a35f..e0e37225a 100644 --- a/crates/tests/tests-common/goldenfiles/select_int_and_string.json +++ b/crates/tests/tests-common/goldenfiles/select_int_and_string.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_album_artist_name.json b/crates/tests/tests-common/goldenfiles/select_order_by_album_artist_name.json index 130913b8a..9fa3ae552 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_album_artist_name.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_album_artist_name.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "Name": { @@ -54,8 +54,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} }, "TrackAlbum": { @@ -63,8 +63,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json index e28a12067..00491b6b0 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -37,8 +37,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json index efe4f6c9f..8b8cb92cb 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -39,8 +39,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_name.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_name.json index 9268d75ff..a74cb7079 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_name.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_name.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Name": { @@ -39,8 +39,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_name_with_name.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_name_with_name.json index 865946df8..56337d033 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_name_with_name.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_name_with_name.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Name": { @@ -7,7 +7,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumArtist", "arguments": {}, @@ -60,8 +60,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_name.json b/crates/tests/tests-common/goldenfiles/select_order_by_name.json index cb85927b8..6186c2c86 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_name.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_name.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/select_track_order_by_artist_id_and_album_title.json b/crates/tests/tests-common/goldenfiles/select_track_order_by_artist_id_and_album_title.json index 2b2e45418..3f919075c 100644 --- a/crates/tests/tests-common/goldenfiles/select_track_order_by_artist_id_and_album_title.json +++ b/crates/tests/tests-common/goldenfiles/select_track_order_by_artist_id_and_album_title.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "Name": { @@ -63,8 +63,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self.json index dc752c964..cc1841849 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self_nested_object_relationship.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self_nested_object_relationship.json index 11f7c983a..376abcf1f 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self_nested_object_relationship.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_equals_self_nested_object_relationship.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "track": { @@ -12,7 +12,7 @@ "column": "AlbumId", "arguments": {} }, - "public_Album": { + "Album": { "type": "relationship", "relationship": "TrackToAlbum", "arguments": {}, @@ -23,7 +23,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumToArtist", "arguments": {}, @@ -113,8 +113,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} }, "AlbumToArtist": { @@ -122,8 +122,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than.json index 76313f807..168b6059d 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than_or_equal_to.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than_or_equal_to.json index b6034e5e5..1e3a45e33 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than_or_equal_to.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_greater_than_or_equal_to.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_is_not_null.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_is_not_null.json index 39270e78c..217342f1c 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_is_not_null.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_is_not_null.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than.json index c67a7f32d..916e32a0c 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than_or_equal_to.json b/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than_or_equal_to.json index d4126cb42..c661ee355 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than_or_equal_to.json +++ b/crates/tests/tests-common/goldenfiles/select_where_album_id_less_than_or_equal_to.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_and.json b/crates/tests/tests-common/goldenfiles/select_where_and.json index caab4673d..3680cf0f8 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_and.json +++ b/crates/tests/tests-common/goldenfiles/select_where_and.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { "type": "column", "column": "Title" } }, "where": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_array_relationship.json b/crates/tests/tests-common/goldenfiles/select_where_array_relationship.json index a0007b38a..6bf9a7411 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_array_relationship.json +++ b/crates/tests/tests-common/goldenfiles/select_where_array_relationship.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "title": { @@ -80,8 +80,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album" + "source_collection_or_type": "Artist", + "target_collection": "Album" } } } diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_eq.json b/crates/tests/tests-common/goldenfiles/select_where_name_eq.json index 7005723fa..39599369a 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_eq.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_eq.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_ilike.json b/crates/tests/tests-common/goldenfiles/select_where_name_ilike.json index 88352278f..37e46a708 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_ilike.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_ilike.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_in.json b/crates/tests/tests-common/goldenfiles/select_where_name_in.json index da0723cde..5dc8b0e2b 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_in.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_in.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_iregex.json b/crates/tests/tests-common/goldenfiles/select_where_name_iregex.json index 4b59b720e..809229b3f 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_iregex.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_iregex.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_like.json b/crates/tests/tests-common/goldenfiles/select_where_name_like.json index b82bbf2cd..88c526783 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_like.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_like.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_neq.json b/crates/tests/tests-common/goldenfiles/select_where_name_neq.json index b3e3013de..58ab13c87 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_neq.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_neq.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_nilike.json b/crates/tests/tests-common/goldenfiles/select_where_name_nilike.json index badcb6a79..b5b105446 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_nilike.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_nilike.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_niregex.json b/crates/tests/tests-common/goldenfiles/select_where_name_niregex.json index 231b7f34f..ca5e7db69 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_niregex.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_niregex.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_not_in.json b/crates/tests/tests-common/goldenfiles/select_where_name_not_in.json index eb9308f87..13df432ec 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_not_in.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_not_in.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_not_like.json b/crates/tests/tests-common/goldenfiles/select_where_name_not_like.json index f86bb5c4b..54218d65d 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_not_like.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_not_like.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_nregex.json b/crates/tests/tests-common/goldenfiles/select_where_name_nregex.json index 0aab1628b..5db33c35e 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_nregex.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_nregex.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 10, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_nsimilar.json b/crates/tests/tests-common/goldenfiles/select_where_name_nsimilar.json index 32220e25c..b6aa11a14 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_nsimilar.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_nsimilar.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_regex.json b/crates/tests/tests-common/goldenfiles/select_where_name_regex.json index 31d4c156a..e961c7849 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_regex.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_regex.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_name_similar.json b/crates/tests/tests-common/goldenfiles/select_where_name_similar.json index 554e4d974..a415edab9 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_name_similar.json +++ b/crates/tests/tests-common/goldenfiles/select_where_name_similar.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "limit": 5, "fields": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_or.json b/crates/tests/tests-common/goldenfiles/select_where_or.json index 5accf5ffd..2750597c8 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_or.json +++ b/crates/tests/tests-common/goldenfiles/select_where_or.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { "type": "column", "column": "Title" } }, "where": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_related_exists.json b/crates/tests/tests-common/goldenfiles/select_where_related_exists.json index 64ede2464..e44ec0dbb 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_related_exists.json +++ b/crates/tests/tests-common/goldenfiles/select_where_related_exists.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "title": { @@ -79,8 +79,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album" + "source_collection_or_type": "Artist", + "target_collection": "Album" } } } diff --git a/crates/tests/tests-common/goldenfiles/select_where_unrelated_exists.json b/crates/tests/tests-common/goldenfiles/select_where_unrelated_exists.json index fc619590b..337459e77 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_unrelated_exists.json +++ b/crates/tests/tests-common/goldenfiles/select_where_unrelated_exists.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "title": { @@ -13,7 +13,7 @@ "in_collection": { "type": "unrelated", "arguments": {}, - "collection": "public_Artist" + "collection": "Artist" }, "where": { "type": "and", diff --git a/crates/tests/tests-common/goldenfiles/select_where_variable.json b/crates/tests/tests-common/goldenfiles/select_where_variable.json index cf8c90ceb..b81676afb 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_variable.json +++ b/crates/tests/tests-common/goldenfiles/select_where_variable.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "Title": { diff --git a/crates/tests/tests-common/goldenfiles/select_where_variable_int.json b/crates/tests/tests-common/goldenfiles/select_where_variable_int.json index 75ae4c62d..77fe696dd 100644 --- a/crates/tests/tests-common/goldenfiles/select_where_variable_int.json +++ b/crates/tests/tests-common/goldenfiles/select_where_variable_int.json @@ -1,5 +1,5 @@ { - "collection": "public_Album", + "collection": "Album", "query": { "fields": { "AlbumId": { diff --git a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate.json b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate.json index 8c4d86493..40b3ec740 100644 --- a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate.json +++ b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "Name": { @@ -70,8 +70,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} }, "TrackAlbum": { @@ -79,8 +79,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate_exists.json b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate_exists.json index 6cc472b9a..bec3c055b 100644 --- a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate_exists.json +++ b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_column_with_predicate_exists.json @@ -1,5 +1,5 @@ { - "collection": "public_Track", + "collection": "Track", "query": { "fields": { "Name": { @@ -79,8 +79,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} }, "TrackAlbum": { @@ -88,8 +88,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "object", - "source_collection_or_type": "public_Track", - "target_collection": "public_Album", + "source_collection_or_type": "Track", + "target_collection": "Album", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json b/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json index 0f78dfcd1..eca4144d5 100644 --- a/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json +++ b/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "Name": { @@ -70,8 +70,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} }, "AlbumTracks": { @@ -79,8 +79,8 @@ "AlbumId": "AlbumId" }, "relationship_type": "array", - "source_collection_or_type": "public_Album", - "target_collection": "public_Track", + "source_collection_or_type": "Album", + "target_collection": "Track", "arguments": {} } } diff --git a/crates/tests/tests-common/goldenfiles/very_nested_recursive_relationship.json b/crates/tests/tests-common/goldenfiles/very_nested_recursive_relationship.json index cfe366a2a..3e73f9c7d 100644 --- a/crates/tests/tests-common/goldenfiles/very_nested_recursive_relationship.json +++ b/crates/tests/tests-common/goldenfiles/very_nested_recursive_relationship.json @@ -1,5 +1,5 @@ { - "collection": "public_Artist", + "collection": "Artist", "query": { "fields": { "0Name": { @@ -18,7 +18,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumArtist", "arguments": {}, @@ -41,7 +41,7 @@ "column": "Title", "arguments": {} }, - "public_Artist": { + "Artist": { "type": "relationship", "relationship": "AlbumArtist", "arguments": {}, @@ -112,8 +112,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "array", - "source_collection_or_type": "public_Artist", - "target_collection": "public_Album", + "source_collection_or_type": "Artist", + "target_collection": "Album", "arguments": {} }, "AlbumArtist": { @@ -121,8 +121,8 @@ "ArtistId": "ArtistId" }, "relationship_type": "object", - "source_collection_or_type": "public_Album", - "target_collection": "public_Artist", + "source_collection_or_type": "Album", + "target_collection": "Artist", "arguments": {} } } diff --git a/static/aurora/chinook-deployment-template.json b/static/aurora/chinook-deployment-template.json index 34444a7bd..5ddfe08c1 100644 --- a/static/aurora/chinook-deployment-template.json +++ b/static/aurora/chinook-deployment-template.json @@ -13,7 +13,7 @@ }, "metadata": { "tables": { - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -49,7 +49,7 @@ }, "description": null }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -72,7 +72,7 @@ "foreignRelations": {}, "description": null }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -168,7 +168,7 @@ }, "description": null }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -276,7 +276,7 @@ }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -299,7 +299,7 @@ "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -371,7 +371,7 @@ }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -425,7 +425,7 @@ }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -448,7 +448,7 @@ "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -471,7 +471,7 @@ "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -507,7 +507,7 @@ }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": { diff --git a/static/citus/chinook-deployment.json b/static/citus/chinook-deployment.json index 4ba0300d7..403e25e23 100644 --- a/static/citus/chinook-deployment.json +++ b/static/citus/chinook-deployment.json @@ -7,7 +7,7 @@ }, "metadata": { "tables": { - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -43,7 +43,7 @@ }, "description": "The record of all albums" }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -66,7 +66,7 @@ "foreignRelations": {}, "description": "The record of all artists" }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -162,7 +162,7 @@ }, "description": "The record of all customers" }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -270,7 +270,7 @@ }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -293,7 +293,7 @@ "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -365,7 +365,7 @@ }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -419,7 +419,7 @@ }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -442,7 +442,7 @@ "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -465,7 +465,7 @@ "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -501,7 +501,7 @@ }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": { @@ -585,7 +585,7 @@ }, "description": null }, - "public_citus_tables": { + "citus_tables": { "schemaName": "public", "tableName": "citus_tables", "columns": { diff --git a/static/cockroach/chinook-deployment.json b/static/cockroach/chinook-deployment.json index 1718dd6af..87131758b 100644 --- a/static/cockroach/chinook-deployment.json +++ b/static/cockroach/chinook-deployment.json @@ -7,148 +7,7 @@ }, "metadata": { "tables": { - "pg_extension_geography_columns": { - "schemaName": "pg_extension", - "tableName": "geography_columns", - "columns": { - "coord_dimension": { - "name": "coord_dimension", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "f_geography_column": { - "name": "f_geography_column", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_catalog": { - "name": "f_table_catalog", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_name": { - "name": "f_table_name", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_schema": { - "name": "f_table_schema", - "type": "name", - "nullable": "nullable", - "description": null - }, - "srid": { - "name": "srid", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "type": { - "name": "type", - "type": "text", - "nullable": "nullable", - "description": null - } - }, - "uniquenessConstraints": {}, - "foreignRelations": {}, - "description": null - }, - "pg_extension_geometry_columns": { - "schemaName": "pg_extension", - "tableName": "geometry_columns", - "columns": { - "coord_dimension": { - "name": "coord_dimension", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "f_geometry_column": { - "name": "f_geometry_column", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_catalog": { - "name": "f_table_catalog", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_name": { - "name": "f_table_name", - "type": "name", - "nullable": "nullable", - "description": null - }, - "f_table_schema": { - "name": "f_table_schema", - "type": "name", - "nullable": "nullable", - "description": null - }, - "srid": { - "name": "srid", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "type": { - "name": "type", - "type": "text", - "nullable": "nullable", - "description": null - } - }, - "uniquenessConstraints": {}, - "foreignRelations": {}, - "description": null - }, - "pg_extension_spatial_ref_sys": { - "schemaName": "pg_extension", - "tableName": "spatial_ref_sys", - "columns": { - "auth_name": { - "name": "auth_name", - "type": "varchar", - "nullable": "nullable", - "description": null - }, - "auth_srid": { - "name": "auth_srid", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "proj4text": { - "name": "proj4text", - "type": "varchar", - "nullable": "nullable", - "description": null - }, - "srid": { - "name": "srid", - "type": "int8", - "nullable": "nullable", - "description": null - }, - "srtext": { - "name": "srtext", - "type": "varchar", - "nullable": "nullable", - "description": null - } - }, - "uniquenessConstraints": {}, - "foreignRelations": {}, - "description": null - }, - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -184,7 +43,7 @@ }, "description": null }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -207,7 +66,7 @@ "foreignRelations": {}, "description": null }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -303,7 +162,7 @@ }, "description": null }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -411,7 +270,7 @@ }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -434,7 +293,7 @@ "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -506,7 +365,7 @@ }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -560,7 +419,7 @@ }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -583,7 +442,7 @@ "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -606,7 +465,7 @@ "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -642,7 +501,7 @@ }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": { @@ -725,6 +584,147 @@ } }, "description": null + }, + "pg_extension_geography_columns": { + "schemaName": "pg_extension", + "tableName": "geography_columns", + "columns": { + "coord_dimension": { + "name": "coord_dimension", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "f_geography_column": { + "name": "f_geography_column", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_catalog": { + "name": "f_table_catalog", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_name": { + "name": "f_table_name", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_schema": { + "name": "f_table_schema", + "type": "name", + "nullable": "nullable", + "description": null + }, + "srid": { + "name": "srid", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "type": { + "name": "type", + "type": "text", + "nullable": "nullable", + "description": null + } + }, + "uniquenessConstraints": {}, + "foreignRelations": {}, + "description": null + }, + "pg_extension_geometry_columns": { + "schemaName": "pg_extension", + "tableName": "geometry_columns", + "columns": { + "coord_dimension": { + "name": "coord_dimension", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "f_geometry_column": { + "name": "f_geometry_column", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_catalog": { + "name": "f_table_catalog", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_name": { + "name": "f_table_name", + "type": "name", + "nullable": "nullable", + "description": null + }, + "f_table_schema": { + "name": "f_table_schema", + "type": "name", + "nullable": "nullable", + "description": null + }, + "srid": { + "name": "srid", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "type": { + "name": "type", + "type": "text", + "nullable": "nullable", + "description": null + } + }, + "uniquenessConstraints": {}, + "foreignRelations": {}, + "description": null + }, + "pg_extension_spatial_ref_sys": { + "schemaName": "pg_extension", + "tableName": "spatial_ref_sys", + "columns": { + "auth_name": { + "name": "auth_name", + "type": "varchar", + "nullable": "nullable", + "description": null + }, + "auth_srid": { + "name": "auth_srid", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "proj4text": { + "name": "proj4text", + "type": "varchar", + "nullable": "nullable", + "description": null + }, + "srid": { + "name": "srid", + "type": "int8", + "nullable": "nullable", + "description": null + }, + "srtext": { + "name": "srtext", + "type": "varchar", + "nullable": "nullable", + "description": null + } + }, + "uniquenessConstraints": {}, + "foreignRelations": {}, + "description": null } }, "nativeQueries": { diff --git a/static/postgres/chinook-deployment.json b/static/postgres/chinook-deployment.json index 5f2737ad6..0e557b173 100644 --- a/static/postgres/chinook-deployment.json +++ b/static/postgres/chinook-deployment.json @@ -7,7 +7,7 @@ }, "metadata": { "tables": { - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -43,7 +43,7 @@ }, "description": "The record of all albums" }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -66,7 +66,7 @@ "foreignRelations": {}, "description": "The record of all artists" }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -162,7 +162,7 @@ }, "description": "The record of all customers" }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -270,7 +270,7 @@ }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -293,7 +293,7 @@ "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -365,7 +365,7 @@ }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -419,7 +419,7 @@ }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -442,7 +442,7 @@ "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -465,7 +465,7 @@ "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -501,7 +501,7 @@ }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": { @@ -585,7 +585,7 @@ }, "description": null }, - "public_geography_columns": { + "geography_columns": { "schemaName": "public", "tableName": "geography_columns", "columns": { @@ -636,7 +636,7 @@ "foreignRelations": {}, "description": null }, - "public_geometry_columns": { + "geometry_columns": { "schemaName": "public", "tableName": "geometry_columns", "columns": { @@ -687,7 +687,7 @@ "foreignRelations": {}, "description": null }, - "public_spatial_ref_sys": { + "spatial_ref_sys": { "schemaName": "public", "tableName": "spatial_ref_sys", "columns": { diff --git a/static/yugabyte/chinook-deployment.json b/static/yugabyte/chinook-deployment.json index 603dc21d9..31e98e504 100644 --- a/static/yugabyte/chinook-deployment.json +++ b/static/yugabyte/chinook-deployment.json @@ -7,7 +7,7 @@ }, "metadata": { "tables": { - "public_Album": { + "Album": { "schemaName": "public", "tableName": "Album", "columns": { @@ -43,7 +43,7 @@ }, "description": "The record of all albums" }, - "public_Artist": { + "Artist": { "schemaName": "public", "tableName": "Artist", "columns": { @@ -66,7 +66,7 @@ "foreignRelations": {}, "description": "The record of all artists" }, - "public_Customer": { + "Customer": { "schemaName": "public", "tableName": "Customer", "columns": { @@ -162,7 +162,7 @@ }, "description": "The record of all customers" }, - "public_Employee": { + "Employee": { "schemaName": "public", "tableName": "Employee", "columns": { @@ -270,7 +270,7 @@ }, "description": null }, - "public_Genre": { + "Genre": { "schemaName": "public", "tableName": "Genre", "columns": { @@ -293,7 +293,7 @@ "foreignRelations": {}, "description": null }, - "public_Invoice": { + "Invoice": { "schemaName": "public", "tableName": "Invoice", "columns": { @@ -365,7 +365,7 @@ }, "description": null }, - "public_InvoiceLine": { + "InvoiceLine": { "schemaName": "public", "tableName": "InvoiceLine", "columns": { @@ -419,7 +419,7 @@ }, "description": null }, - "public_MediaType": { + "MediaType": { "schemaName": "public", "tableName": "MediaType", "columns": { @@ -442,7 +442,7 @@ "foreignRelations": {}, "description": null }, - "public_Playlist": { + "Playlist": { "schemaName": "public", "tableName": "Playlist", "columns": { @@ -465,7 +465,7 @@ "foreignRelations": {}, "description": null }, - "public_PlaylistTrack": { + "PlaylistTrack": { "schemaName": "public", "tableName": "PlaylistTrack", "columns": { @@ -501,7 +501,7 @@ }, "description": null }, - "public_Track": { + "Track": { "schemaName": "public", "tableName": "Track", "columns": {