luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix invisible null constraints in sql_table

Browse source 
fixes #1655
This commit is contained in:
Michał Wieluński 2023-10-12 20:48:27 +02:00
parent 4e73736dd0
commit 448b51c345
No known key found for this signature in database
3 changed files with 365 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
d2compiler/compile.go
View file

@ -443,7 +443,12 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) {
if arr, ok := f.Composite.(*d2ir.Array); ok {
for _, constraint := range arr.Values {
if scalar, ok := constraint.(*d2ir.Scalar); ok {
attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString())
switch scalar.Value.(type) {
case *d2ast.Null:
attrs.Constraint = append(attrs.Constraint, "null")
default:
attrs.Constraint = append(attrs.Constraint, scalar.Value.ScalarString())
}
}
}
}

13
d2compiler/compile_test.go
View file

@ -2199,6 +2199,19 @@ ok: {
tassert.Equal(t, []string{"primary_key", "foreign_key"}, table.Columns[1].Constraint)
},
},
{
name: "sql-null-constraint",
text: `x: {
shape: sql_table
a: int {constraint: null}
b: int {constraint: [null]}
}`,
assertions: func(t *testing.T, g *d2graph.Graph) {
table := g.Objects[0].SQLTable
tassert.Nil(t, table.Columns[0].Constraint)
tassert.Equal(t, []string{"null"}, table.Columns[1].Constraint)
},
},
{
name: "wrong_column_index",
text: `Chinchillas: {

346
testdata/d2compiler/TestCompile/sql-null-constraint.exp.json generated vendored Normal file
View file

@ -0,0 +1,346 @@
{
"graph": {
"name": "",
"isFolderOnly": false,
"ast": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-4:1:83",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-4:1:83",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"primary": {},
"value": {
"map": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:3:3-4:1:83",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,1:2:7-1:18:23",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,1:2:7-1:7:12",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,1:2:7-1:7:12",
"value": [
{
"string": "shape",
"raw_string": "shape"
}
]
}
}
]
},
"primary": {},
"value": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,1:9:14-1:18:23",
"value": [
{
"string": "sql_table",
"raw_string": "sql_table"
}
]
}
}
}
},
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:2:26-2:27:51",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:2:26-2:3:27",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:2:26-2:3:27",
"value": [
{
"string": "a",
"raw_string": "a"
}
]
}
}
]
},
"primary": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:5:29-2:8:32",
"value": [
{
"string": "int",
"raw_string": "int"
}
]
}
},
"value": {
"map": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:9:33-2:27:51",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:10:34-2:26:50",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:10:34-2:20:44",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:10:34-2:20:44",
"value": [
{
"string": "constraint",
"raw_string": "constraint"
}
]
}
}
]
},
"primary": {},
"value": {
"null": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,2:22:46-2:26:50"
}
}
}
}
]
}
}
}
},
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:2:54-3:29:81",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:2:54-3:3:55",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:2:54-3:3:55",
"value": [
{
"string": "b",
"raw_string": "b"
}
]
}
}
]
},
"primary": {
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:5:57-3:8:60",
"value": [
{
"string": "int",
"raw_string": "int"
}
]
}
},
"value": {
"map": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:9:61-3:29:81",
"nodes": [
{
"map_key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:10:62-3:28:80",
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:10:62-3:20:72",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:10:62-3:20:72",
"value": [
{
"string": "constraint",
"raw_string": "constraint"
}
]
}
}
]
},
"primary": {},
"value": {
"array": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:22:74-3:27:79",
"nodes": [
{
"null": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,3:23:75-3:27:79"
}
}
]
}
}
}
}
]
}
}
}
}
]
}
}
}
}
]
},
"root": {
"id": "",
"id_val": "",
"attributes": {
"label": {
"value": ""
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": ""
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
},
"edges": null,
"objects": [
{
"id": "x",
"id_val": "x",
"references": [
{
"key": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-0:1:1",
"path": [
{
"unquoted_string": {
"range": "d2/testdata/d2compiler/TestCompile/sql-null-constraint.d2,0:0:0-0:1:1",
"value": [
{
"string": "x",
"raw_string": "x"
}
]
}
}
]
},
"key_path_index": 0,
"map_key_edge_index": -1
}
],
"sql_table": {
"columns": [
{
"name": {
"label": "a",
"fontSize": 0,
"fontFamily": "",
"language": "",
"color": "",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0
},
"type": {
"label": "int",
"fontSize": 0,
"fontFamily": "",
"language": "",
"color": "",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0
},
"constraint": null,
"reference": ""
},
{
"name": {
"label": "b",
"fontSize": 0,
"fontFamily": "",
"language": "",
"color": "",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0
},
"type": {
"label": "int",
"fontSize": 0,
"fontFamily": "",
"language": "",
"color": "",
"italic": false,
"bold": false,
"underline": false,
"labelWidth": 0,
"labelHeight": 0
},
"constraint": [
"null"
],
"reference": ""
}
]
},
"attributes": {
"label": {
"value": "x"
},
"labelDimensions": {
"width": 0,
"height": 0
},
"style": {},
"near_key": null,
"shape": {
"value": "sql_table"
},
"direction": {
"value": ""
},
"constraint": null
},
"zIndex": 0
}
]
},
"err": null
}