Skip to content

Commit e8ca086

Browse files
jkomynojkomyno
committed
fix(schema-engine): postgres 16 snapshots
1 parent b29052e commit e8ca086

1 file changed

Lines changed: 145 additions & 59 deletions

File tree

‎schema-engine/sql-schema-describer/tests/describers/postgres_describer_tests.rs‎

Lines changed: 145 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2597,24 +2597,40 @@ fn multiple_schemas_are_described(api: TestApi) {
25972597
0,
25982598
),
25992599
name: "Table_0",
2600+
properties: BitFlags<TableProperties> {
2601+
bits: 0b0,
2602+
},
2603+
description: None,
26002604
},
26012605
Table {
26022606
namespace_id: NamespaceId(
26032607
0,
26042608
),
26052609
name: "Table_1",
2610+
properties: BitFlags<TableProperties> {
2611+
bits: 0b0,
2612+
},
2613+
description: None,
26062614
},
26072615
Table {
26082616
namespace_id: NamespaceId(
26092617
1,
26102618
),
26112619
name: "Table_2",
2620+
properties: BitFlags<TableProperties> {
2621+
bits: 0b0,
2622+
},
2623+
description: None,
26122624
},
26132625
Table {
26142626
namespace_id: NamespaceId(
26152627
1,
26162628
),
26172629
name: "Table_3",
2630+
properties: BitFlags<TableProperties> {
2631+
bits: 0b0,
2632+
},
2633+
description: None,
26182634
},
26192635
],
26202636
enums: [
@@ -2623,21 +2639,31 @@ fn multiple_schemas_are_described(api: TestApi) {
26232639
0,
26242640
),
26252641
name: "Type_0",
2626-
values: [
2627-
"happy",
2628-
],
2642+
description: None,
26292643
},
26302644
Enum {
26312645
namespace_id: NamespaceId(
26322646
1,
26332647
),
26342648
name: "Type_1",
2635-
values: [
2636-
"happy",
2637-
],
2649+
description: None,
26382650
},
26392651
],
2640-
columns: [
2652+
enum_variants: [
2653+
EnumVariant {
2654+
enum_id: EnumId(
2655+
0,
2656+
),
2657+
variant_name: "happy",
2658+
},
2659+
EnumVariant {
2660+
enum_id: EnumId(
2661+
1,
2662+
),
2663+
variant_name: "happy",
2664+
},
2665+
],
2666+
table_columns: [
26412667
(
26422668
TableId(
26432669
0,
@@ -2649,18 +2675,11 @@ fn multiple_schemas_are_described(api: TestApi) {
26492675
family: Int,
26502676
arity: Required,
26512677
native_type: Some(
2652-
String("Integer"),
2678+
NativeTypeInstance(..),
26532679
),
26542680
},
2655-
default: Some(
2656-
DefaultValue {
2657-
kind: Sequence(
2658-
"Table_0_id_0_seq",
2659-
),
2660-
constraint_name: None,
2661-
},
2662-
),
26632681
auto_increment: true,
2682+
description: None,
26642683
},
26652684
),
26662685
(
@@ -2674,18 +2693,11 @@ fn multiple_schemas_are_described(api: TestApi) {
26742693
family: Int,
26752694
arity: Required,
26762695
native_type: Some(
2677-
String("Integer"),
2696+
NativeTypeInstance(..),
26782697
),
26792698
},
2680-
default: Some(
2681-
DefaultValue {
2682-
kind: Sequence(
2683-
"Table_1_id_1_seq",
2684-
),
2685-
constraint_name: None,
2686-
},
2687-
),
26882699
auto_increment: true,
2700+
description: None,
26892701
},
26902702
),
26912703
(
@@ -2699,11 +2711,11 @@ fn multiple_schemas_are_described(api: TestApi) {
26992711
family: Int,
27002712
arity: Nullable,
27012713
native_type: Some(
2702-
String("Integer"),
2714+
NativeTypeInstance(..),
27032715
),
27042716
},
2705-
default: None,
27062717
auto_increment: false,
2718+
description: None,
27072719
},
27082720
),
27092721
(
@@ -2717,18 +2729,11 @@ fn multiple_schemas_are_described(api: TestApi) {
27172729
family: Int,
27182730
arity: Required,
27192731
native_type: Some(
2720-
String("Integer"),
2732+
NativeTypeInstance(..),
27212733
),
27222734
},
2723-
default: Some(
2724-
DefaultValue {
2725-
kind: Sequence(
2726-
"Table_2_id_2_seq",
2727-
),
2728-
constraint_name: None,
2729-
},
2730-
),
27312735
auto_increment: true,
2736+
description: None,
27322737
},
27332738
),
27342739
(
@@ -2742,18 +2747,11 @@ fn multiple_schemas_are_described(api: TestApi) {
27422747
family: Int,
27432748
arity: Required,
27442749
native_type: Some(
2745-
String("Integer"),
2750+
NativeTypeInstance(..),
27462751
),
27472752
},
2748-
default: Some(
2749-
DefaultValue {
2750-
kind: Sequence(
2751-
"Table_3_id_3_seq",
2752-
),
2753-
constraint_name: None,
2754-
},
2755-
),
27562753
auto_increment: true,
2754+
description: None,
27572755
},
27582756
),
27592757
(
@@ -2767,11 +2765,11 @@ fn multiple_schemas_are_described(api: TestApi) {
27672765
family: Int,
27682766
arity: Nullable,
27692767
native_type: Some(
2770-
String("Integer"),
2768+
NativeTypeInstance(..),
27712769
),
27722770
},
2773-
default: None,
27742771
auto_increment: false,
2772+
description: None,
27752773
},
27762774
),
27772775
],
@@ -2803,26 +2801,73 @@ fn multiple_schemas_are_described(api: TestApi) {
28032801
on_update_action: NoAction,
28042802
},
28052803
],
2804+
table_default_values: [
2805+
(
2806+
TableColumnId(
2807+
0,
2808+
),
2809+
DefaultValue {
2810+
kind: Sequence(
2811+
"Table_0_id_0_seq",
2812+
),
2813+
constraint_name: None,
2814+
},
2815+
),
2816+
(
2817+
TableColumnId(
2818+
1,
2819+
),
2820+
DefaultValue {
2821+
kind: Sequence(
2822+
"Table_1_id_1_seq",
2823+
),
2824+
constraint_name: None,
2825+
},
2826+
),
2827+
(
2828+
TableColumnId(
2829+
3,
2830+
),
2831+
DefaultValue {
2832+
kind: Sequence(
2833+
"Table_2_id_2_seq",
2834+
),
2835+
constraint_name: None,
2836+
},
2837+
),
2838+
(
2839+
TableColumnId(
2840+
4,
2841+
),
2842+
DefaultValue {
2843+
kind: Sequence(
2844+
"Table_3_id_3_seq",
2845+
),
2846+
constraint_name: None,
2847+
},
2848+
),
2849+
],
2850+
view_default_values: [],
28062851
foreign_key_columns: [
28072852
ForeignKeyColumn {
28082853
foreign_key_id: ForeignKeyId(
28092854
0,
28102855
),
2811-
constrained_column: ColumnId(
2856+
constrained_column: TableColumnId(
28122857
2,
28132858
),
2814-
referenced_column: ColumnId(
2859+
referenced_column: TableColumnId(
28152860
0,
28162861
),
28172862
},
28182863
ForeignKeyColumn {
28192864
foreign_key_id: ForeignKeyId(
28202865
1,
28212866
),
2822-
constrained_column: ColumnId(
2867+
constrained_column: TableColumnId(
28232868
5,
28242869
),
2825-
referenced_column: ColumnId(
2870+
referenced_column: TableColumnId(
28262871
3,
28272872
),
28282873
},
@@ -2876,7 +2921,7 @@ fn multiple_schemas_are_described(api: TestApi) {
28762921
index_id: IndexId(
28772922
0,
28782923
),
2879-
column_id: ColumnId(
2924+
column_id: TableColumnId(
28802925
0,
28812926
),
28822927
sort_order: Some(
@@ -2888,7 +2933,7 @@ fn multiple_schemas_are_described(api: TestApi) {
28882933
index_id: IndexId(
28892934
1,
28902935
),
2891-
column_id: ColumnId(
2936+
column_id: TableColumnId(
28922937
2,
28932938
),
28942939
sort_order: Some(
@@ -2900,7 +2945,7 @@ fn multiple_schemas_are_described(api: TestApi) {
29002945
index_id: IndexId(
29012946
2,
29022947
),
2903-
column_id: ColumnId(
2948+
column_id: TableColumnId(
29042949
1,
29052950
),
29062951
sort_order: Some(
@@ -2912,7 +2957,7 @@ fn multiple_schemas_are_described(api: TestApi) {
29122957
index_id: IndexId(
29132958
3,
29142959
),
2915-
column_id: ColumnId(
2960+
column_id: TableColumnId(
29162961
3,
29172962
),
29182963
sort_order: Some(
@@ -2924,7 +2969,7 @@ fn multiple_schemas_are_described(api: TestApi) {
29242969
index_id: IndexId(
29252970
4,
29262971
),
2927-
column_id: ColumnId(
2972+
column_id: TableColumnId(
29282973
5,
29292974
),
29302975
sort_order: Some(
@@ -2936,7 +2981,7 @@ fn multiple_schemas_are_described(api: TestApi) {
29362981
index_id: IndexId(
29372982
5,
29382983
),
2939-
column_id: ColumnId(
2984+
column_id: TableColumnId(
29402985
4,
29412986
),
29422987
sort_order: Some(
@@ -2945,26 +2990,67 @@ fn multiple_schemas_are_described(api: TestApi) {
29452990
length: None,
29462991
},
29472992
],
2993+
check_constraints: [],
29482994
views: [
29492995
View {
29502996
namespace_id: NamespaceId(
29512997
0,
29522998
),
29532999
name: "View_0",
29543000
definition: Some(
2955-
" SELECT 0;",
3001+
" SELECT 0 AS \"?column?\";",
29563002
),
3003+
description: None,
29573004
},
29583005
View {
29593006
namespace_id: NamespaceId(
29603007
1,
29613008
),
29623009
name: "View_1",
29633010
definition: Some(
2964-
" SELECT 1;",
3011+
" SELECT 1 AS \"?column?\";",
29653012
),
3013+
description: None,
29663014
},
29673015
],
3016+
view_columns: [
3017+
(
3018+
ViewId(
3019+
0,
3020+
),
3021+
Column {
3022+
name: "?column?",
3023+
tpe: ColumnType {
3024+
full_data_type: "int4",
3025+
family: Int,
3026+
arity: Nullable,
3027+
native_type: Some(
3028+
NativeTypeInstance(..),
3029+
),
3030+
},
3031+
auto_increment: false,
3032+
description: None,
3033+
},
3034+
),
3035+
(
3036+
ViewId(
3037+
1,
3038+
),
3039+
Column {
3040+
name: "?column?",
3041+
tpe: ColumnType {
3042+
full_data_type: "int4",
3043+
family: Int,
3044+
arity: Nullable,
3045+
native_type: Some(
3046+
NativeTypeInstance(..),
3047+
),
3048+
},
3049+
auto_increment: false,
3050+
description: None,
3051+
},
3052+
),
3053+
],
29683054
procedures: [
29693055
Procedure {
29703056
namespace_id: NamespaceId(

0 commit comments

Comments
 (0)