Skip to content
This repository was archived by the owner on Jul 15, 2021. It is now read-only.

Commit f9b1ed4

Browse files
nwronskinwronski
committed
Update existing specs to match latest changes.
1 parent ad6c62e commit f9b1ed4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+809
-785
lines changed

‎test/json/aliases/basic-aliases.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@
3131
"alias": "wherekeyword"
3232
}
3333
],
34-
"from": [
35-
{
36-
"type": "identifier",
37-
"variant": "table",
38-
"name": "bananas",
39-
"alias": "b"
40-
}
41-
]
34+
"from": {
35+
"type": "identifier",
36+
"variant": "table",
37+
"name": "bananas",
38+
"alias": "b"
39+
}
4240
}
4341
]
4442
}

‎test/json/aliases/uncommon-aliases.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
},
1414
{
1515
"type": "function",
16-
"name": "count",
17-
"args": [
18-
{
19-
"type": "identifier",
20-
"variant": "star",
21-
"name": "*"
22-
}
23-
],
16+
"name": {
17+
"type": "identifier",
18+
"variant": "function",
19+
"name": "count"
20+
},
21+
"args": {
22+
"type": "identifier",
23+
"variant": "star",
24+
"name": "*"
25+
},
2426
"alias": "pants"
2527
}
2628
],
27-
"from": [
28-
{
29-
"type": "identifier",
30-
"variant": "table",
31-
"name": "hats",
32-
"alias": "hat"
33-
}
34-
]
29+
"from": {
30+
"type": "identifier",
31+
"variant": "table",
32+
"name": "hats",
33+
"alias": "hat"
34+
}
3535
}
3636
]
3737
}

‎test/json/comments/basic-comments.json‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
"name": "movie_id"
2424
}
2525
],
26-
"from": [
27-
{
28-
"type": "identifier",
29-
"variant": "table",
30-
"name": "rooms",
31-
"alias": "hat"
32-
}
33-
],
26+
"from": {
27+
"type": "identifier",
28+
"variant": "table",
29+
"name": "rooms",
30+
"alias": "hat"
31+
},
3432
"where": [
3533
{
3634
"type": "expression",
@@ -60,13 +58,11 @@
6058
"value": "2"
6159
}
6260
],
63-
"from": [
64-
{
65-
"type": "identifier",
66-
"variant": "table",
67-
"name": "hats"
68-
}
69-
]
61+
"from": {
62+
"type": "identifier",
63+
"variant": "table",
64+
"name": "hats"
65+
}
7066
}
7167
]
7268
}

‎test/json/create-table/basic-create-table.json‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"datatype": {
2626
"type": "datatype",
2727
"variant": "int",
28-
"affinity": "integer",
29-
"args": []
28+
"affinity": "integer"
3029
}
3130
},
3231
{
@@ -38,13 +37,17 @@
3837
"type": "datatype",
3938
"variant": "varchar",
4039
"affinity": "text",
41-
"args": [
42-
{
43-
"type": "literal",
44-
"variant": "decimal",
45-
"value": "50"
46-
}
47-
]
40+
"args": {
41+
"type": "expression",
42+
"variant": "list",
43+
"expression": [
44+
{
45+
"type": "literal",
46+
"variant": "decimal",
47+
"value": "50"
48+
}
49+
]
50+
}
4851
}
4952
},
5053
{
@@ -56,13 +59,17 @@
5659
"type": "datatype",
5760
"variant": "varchar",
5861
"affinity": "text",
59-
"args": [
60-
{
61-
"type": "literal",
62-
"variant": "decimal",
63-
"value": "15"
64-
}
65-
]
62+
"args": {
63+
"type": "expression",
64+
"variant": "list",
65+
"expression": [
66+
{
67+
"type": "literal",
68+
"variant": "decimal",
69+
"value": "15"
70+
}
71+
]
72+
}
6673
}
6774
},
6875
{
@@ -73,8 +80,7 @@
7380
"datatype": {
7481
"type": "datatype",
7582
"variant": "int",
76-
"affinity": "integer",
77-
"args": []
83+
"affinity": "integer"
7884
}
7985
}
8086
]

‎test/json/create-table/create-check-1.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"datatype": {
2626
"type": "datatype",
2727
"variant": "int",
28-
"affinity": "integer",
29-
"args": []
28+
"affinity": "integer"
3029
}
3130
},
3231
{
@@ -47,13 +46,17 @@
4746
"type": "datatype",
4847
"variant": "varchar",
4948
"affinity": "text",
50-
"args": [
51-
{
52-
"type": "literal",
53-
"variant": "decimal",
54-
"value": "50"
55-
}
56-
]
49+
"args": {
50+
"type": "expression",
51+
"variant": "list",
52+
"expression": [
53+
{
54+
"type": "literal",
55+
"variant": "decimal",
56+
"value": "50"
57+
}
58+
]
59+
}
5760
}
5861
},
5962
{
@@ -85,8 +88,7 @@
8588
"datatype": {
8689
"type": "datatype",
8790
"variant": "int",
88-
"affinity": "integer",
89-
"args": []
91+
"affinity": "integer"
9092
}
9193
},
9294
{
@@ -118,8 +120,7 @@
118120
"datatype": {
119121
"type": "datatype",
120122
"variant": "int",
121-
"affinity": "integer",
122-
"args": []
123+
"affinity": "integer"
123124
}
124125
}
125126
]

‎test/json/create-table/create-check-2.json‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"datatype": {
2626
"type": "datatype",
2727
"variant": "int",
28-
"affinity": "integer",
29-
"args": []
28+
"affinity": "integer"
3029
}
3130
},
3231
{
@@ -47,13 +46,17 @@
4746
"type": "datatype",
4847
"variant": "varchar",
4948
"affinity": "text",
50-
"args": [
51-
{
52-
"type": "literal",
53-
"variant": "decimal",
54-
"value": "50"
55-
}
56-
]
49+
"args": {
50+
"type": "expression",
51+
"variant": "list",
52+
"expression": [
53+
{
54+
"type": "literal",
55+
"variant": "decimal",
56+
"value": "50"
57+
}
58+
]
59+
}
5760
}
5861
},
5962
{
@@ -64,8 +67,7 @@
6467
"datatype": {
6568
"type": "datatype",
6669
"variant": "int",
67-
"affinity": "integer",
68-
"args": []
70+
"affinity": "integer"
6971
}
7072
},
7173
{
@@ -76,8 +78,7 @@
7678
"datatype": {
7779
"type": "datatype",
7880
"variant": "int",
79-
"affinity": "integer",
80-
"args": []
81+
"affinity": "integer"
8182
}
8283
},
8384
{

‎test/json/create-table/create-foreign-key-1.json‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"datatype": {
2626
"type": "datatype",
2727
"variant": "int",
28-
"affinity": "integer",
29-
"args": []
28+
"affinity": "integer"
3029
}
3130
},
3231
{
@@ -37,8 +36,7 @@
3736
"datatype": {
3837
"type": "datatype",
3938
"variant": "int",
40-
"affinity": "integer",
41-
"args": []
39+
"affinity": "integer"
4240
}
4341
},
4442
{
@@ -54,8 +52,7 @@
5452
"datatype": {
5553
"type": "datatype",
5654
"variant": "int",
57-
"affinity": "integer",
58-
"args": []
55+
"affinity": "integer"
5956
}
6057
},
6158
{
@@ -65,8 +62,6 @@
6562
{
6663
"type": "constraint",
6764
"variant": "foreign key",
68-
"action": null,
69-
"defer": null,
7065
"references": {
7166
"type": "identifier",
7267
"variant": "table",

‎test/json/create-table/create-foreign-key-2.json‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"datatype": {
2626
"type": "datatype",
2727
"variant": "int",
28-
"affinity": "integer",
29-
"args": []
28+
"affinity": "integer"
3029
}
3130
},
3231
{
@@ -37,8 +36,7 @@
3736
"datatype": {
3837
"type": "datatype",
3938
"variant": "int",
40-
"affinity": "integer",
41-
"args": []
39+
"affinity": "integer"
4240
}
4341
},
4442
{
@@ -53,8 +51,6 @@
5351
{
5452
"variant": "foreign key",
5553
"type": "constraint",
56-
"action": null,
57-
"defer": null,
5854
"references": {
5955
"type": "identifier",
6056
"variant": "expression",
@@ -73,8 +69,7 @@
7369
"datatype": {
7470
"type": "datatype",
7571
"variant": "int",
76-
"affinity": "integer",
77-
"args": []
72+
"affinity": "integer"
7873
}
7974
}
8075
]

‎test/json/create-table/create-primary-key-1.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
"datatype": {
2121
"type": "datatype",
2222
"variant": "int",
23-
"affinity": "integer",
24-
"args": []
23+
"affinity": "integer"
2524
}
2625
},
2726
{
@@ -32,8 +31,7 @@
3231
"datatype": {
3332
"type": "datatype",
3433
"variant": "int",
35-
"affinity": "integer",
36-
"args": []
34+
"affinity": "integer"
3735
}
3836
},
3937
{
@@ -49,8 +47,7 @@
4947
"datatype": {
5048
"type": "datatype",
5149
"variant": "int",
52-
"affinity": "integer",
53-
"args": []
50+
"affinity": "integer"
5451
}
5552
},
5653
{

0 commit comments

Comments
 (0)