Skip to content

Commit a32d5e1

Browse files
ungerikungerik
committed
StructFieldNamer returns FieldFlag bitmask, don't write columns with FieldFlagReadOnly
1 parent 4c92a0c commit a32d5e1

File tree

12 files changed

+152
-47
lines changed

12 files changed

+152
-47
lines changed

‎cmd/gen-db-interface/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
module github.com/domonda/go-sqldb/cmd/gen-db-interface
22

3-
go 1.14
3+
go 1.16
44

55
require (
66
github.com/ungerik/go-astvisit v0.0.0-20191030134654-e9cef48dc381
77
github.com/ungerik/go-fs v0.0.0-20210217101829-a7a4ab03e83c
88
github.com/vburenin/ifacemaker v1.1.0
9+
golang.org/x/tools v0.1.0 // indirect
910
)

‎cmd/gen-db-interface/go.sum

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,34 @@ github.com/ungerik/go-fs v0.0.0-20210217101829-a7a4ab03e83c h1:DVh4+JUlHqS4UwPAD
2121
github.com/ungerik/go-fs v0.0.0-20210217101829-a7a4ab03e83c/go.mod h1:GLCikCNg1ILlfLTS6ZmYc1m9gnPiCffruY8rawwjzEA=
2222
github.com/vburenin/ifacemaker v1.1.0 h1:3ScCGZ+D65Ud9L0x9ofhN0dk5QrfauzMWYfaYsfA+HE=
2323
github.com/vburenin/ifacemaker v1.1.0/go.mod h1:SlS6qpTccQsoK3ln7mBkUxA4agA8wfPr/IFYqBWerPw=
24+
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2425
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
26+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
2527
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
28+
golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
29+
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
2630
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
31+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
32+
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
2733
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
34+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
35+
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2836
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
2937
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3038
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
39+
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
40+
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3141
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
3242
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
3343
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
34-
golang.org/x/tools v0.0.0-20181201035826-d0ca3933b724 h1:eV9myT/I6o1p8salzgZ0f1pz54PEgUf2NkCxEf6t+xs=
3544
golang.org/x/tools v0.0.0-20181201035826-d0ca3933b724/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
45+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
46+
golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
47+
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
48+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
49+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
50+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
51+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
3652
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
3753
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3854
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎cmd/sqldb-dump/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/domonda/go-sqldb/cmd/sqldb-dump
22

3-
go 1.14
3+
go 1.16
44

55
require (
66
github.com/domonda/go-pretty v0.0.0-20210202131827-b4ff5dbd12fd
7-
github.com/domonda/go-sqldb v0.0.0-20210209155119-b2b9cf662c4c
7+
github.com/domonda/go-sqldb v0.0.0-20210218093113-4c92a0c9bd4f
88
)
99

1010
replace github.com/domonda/go-sqldb => ../..

‎cmd/sqldb-dump/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ github.com/domonda/go-types v0.0.0-20200708151211-d76e5982c26f/go.mod h1:cVAD1Oc
4848
github.com/domonda/go-types v0.0.0-20200812124141-0d4514dc5982/go.mod h1:cVAD1OcEuytU4/mE9gA+SbOQWLoSGLbAf/fdOgNBCeo=
4949
github.com/domonda/go-types v0.0.0-20200924083638-39ebc21394cd/go.mod h1:wz+6FtLIKMJf6AmWPqEvrts+/6Orehd2Q2PGSCgIhGA=
5050
github.com/domonda/go-types v0.0.0-20210205100405-94aad03cfa0e/go.mod h1:Gu8lMkGPGIrHeu4hhi8mDlmFecmtCgM+Dk1kuIuv6JI=
51+
github.com/domonda/go-types v0.0.0-20210308171246-14e42fd69187/go.mod h1:Gu8lMkGPGIrHeu4hhi8mDlmFecmtCgM+Dk1kuIuv6JI=
5152
github.com/domonda/go-wraperr v0.0.0-20191218095026-c132bf32bd96/go.mod h1:+StTOV14t8kZSKmDG8CfcXEBKTocUqZ9x8zuJHnXgII=
5253
github.com/domonda/go-wraperr v0.0.0-20200414143540-485fd6d06d5d/go.mod h1:+StTOV14t8kZSKmDG8CfcXEBKTocUqZ9x8zuJHnXgII=
5354
github.com/domonda/golog v0.0.0-20200104211507-b1ff3be34563/go.mod h1:35TUI0fS2sdkd11hmcqCoRrKEJIlWDaP54aROPpAxe8=
@@ -145,6 +146,7 @@ github.com/lib/pq v1.7.0 h1:h93mCPfUSkaul3Ka/VG8uZdmW1uMHDGxzu0NWHuJmHY=
145146
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
146147
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
147148
github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
149+
github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
148150
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
149151
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
150152
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/domonda/go-sqldb
22

3-
go 1.13
3+
go 1.16
44

55
require (
6-
github.com/domonda/go-types v0.0.0-20210205100405-94aad03cfa0e
7-
github.com/lib/pq v1.9.0
6+
github.com/domonda/go-types v0.0.0-20210308171246-14e42fd69187
7+
github.com/lib/pq v1.10.0
88
github.com/stretchr/testify v1.7.0
99
)

‎go.sum

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ github.com/domonda/go-types v0.0.0-20200617112812-98d67e39e1b2/go.mod h1:DzGRijk
3737
github.com/domonda/go-types v0.0.0-20200708151211-d76e5982c26f/go.mod h1:cVAD1OcEuytU4/mE9gA+SbOQWLoSGLbAf/fdOgNBCeo=
3838
github.com/domonda/go-types v0.0.0-20200812124141-0d4514dc5982/go.mod h1:cVAD1OcEuytU4/mE9gA+SbOQWLoSGLbAf/fdOgNBCeo=
3939
github.com/domonda/go-types v0.0.0-20200924083638-39ebc21394cd/go.mod h1:wz+6FtLIKMJf6AmWPqEvrts+/6Orehd2Q2PGSCgIhGA=
40-
github.com/domonda/go-types v0.0.0-20210205100405-94aad03cfa0e h1:MWL+EJVhTE+dAuEBBh4mH4aDXDomEaVGnQyJciExX7o=
41-
github.com/domonda/go-types v0.0.0-20210205100405-94aad03cfa0e/go.mod h1:Gu8lMkGPGIrHeu4hhi8mDlmFecmtCgM+Dk1kuIuv6JI=
40+
github.com/domonda/go-types v0.0.0-20210308171246-14e42fd69187 h1:U6VaIP6Pylvx9Z86Hxsn+CJrzP1emizRkuvP6cfmAjs=
41+
github.com/domonda/go-types v0.0.0-20210308171246-14e42fd69187/go.mod h1:Gu8lMkGPGIrHeu4hhi8mDlmFecmtCgM+Dk1kuIuv6JI=
4242
github.com/domonda/go-wraperr v0.0.0-20191218095026-c132bf32bd96/go.mod h1:+StTOV14t8kZSKmDG8CfcXEBKTocUqZ9x8zuJHnXgII=
4343
github.com/domonda/go-wraperr v0.0.0-20200414143540-485fd6d06d5d/go.mod h1:+StTOV14t8kZSKmDG8CfcXEBKTocUqZ9x8zuJHnXgII=
4444
github.com/domonda/golog v0.0.0-20200104211507-b1ff3be34563/go.mod h1:35TUI0fS2sdkd11hmcqCoRrKEJIlWDaP54aROPpAxe8=
@@ -130,8 +130,9 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL
130130
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
131131
github.com/lib/pq v1.7.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
132132
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
133-
github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
134133
github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
134+
github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E=
135+
github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
135136
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
136137
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
137138
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=

‎impl/insert.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,16 @@ func insertStructValues(table string, rowStruct interface{}, namer sqldb.StructF
134134
return nil, nil, fmt.Errorf("InsertStruct into table %s: expected struct but got %T", table, rowStruct)
135135
}
136136

137-
columns, _, vals = structFields(v, namer, ignoreColumns, restrictToColumns, false)
137+
columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, false)
138+
for i := 0; i < len(columns); i++ {
139+
// Remove readonly column data
140+
if flags[i].IsReadOnly() {
141+
columns = append(columns[:i], columns[i+1:]...)
142+
flags = append(flags[:i], flags[i+1:]...)
143+
vals = append(vals[:i], vals[i+1:]...)
144+
i--
145+
}
146+
}
138147
if len(columns) == 0 {
139148
return nil, nil, fmt.Errorf("InsertStruct into table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
140149
}

‎impl/scanstruct.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,29 +102,29 @@ func getStructFieldPointers(v reflect.Value, namer sqldb.StructFieldNamer, ignor
102102
// the ,pk suffix in their struct field naming tag.
103103
// The same number of pkCol bools will be returend as names, every corresponding bool marking
104104
// if the name had the ,pk suffix in their struct field naming tag.
105-
func structFields(v reflect.Value, namer sqldb.StructFieldNamer, ignoreNames, restrictToNames []string, keepPK bool) (names []string, pkCol []bool, vals []interface{}) {
105+
func structFields(v reflect.Value, namer sqldb.StructFieldNamer, ignoreNames, restrictToNames []string, keepPK bool) (names []string, flags []sqldb.FieldFlag, vals []interface{}) {
106106
for i := 0; i < v.NumField(); i++ {
107107
field := v.Type().Field(i)
108-
name, isPK, ok := namer.StructFieldName(field)
108+
name, flag, ok := namer.StructFieldName(field)
109109
if !ok {
110110
continue
111111
}
112112

113113
if field.Anonymous {
114-
embedNames, embedPKs, embedValues := structFields(v.Field(i), namer, ignoreNames, restrictToNames, keepPK)
114+
embedNames, embedFlags, embedValues := structFields(v.Field(i), namer, ignoreNames, restrictToNames, keepPK)
115115
names = append(names, embedNames...)
116-
pkCol = append(pkCol, embedPKs...)
116+
flags = append(flags, embedFlags...)
117117
vals = append(vals, embedValues...)
118118
continue
119119
}
120120

121-
if validName(name, ignoreNames, restrictToNames) || (isPK && keepPK && validName(name, nil, nil)) {
121+
if validName(name, ignoreNames, restrictToNames) || (flag.IsPrimaryKey() && keepPK && validName(name, nil, nil)) {
122122
names = append(names, name)
123-
pkCol = append(pkCol, isPK)
123+
flags = append(flags, flag)
124124
vals = append(vals, v.Field(i).Interface())
125125
}
126126
}
127-
return names, pkCol, vals
127+
return names, flags, vals
128128
}
129129

130130
// validName returns if a name not empty and not in ignoreNames

‎impl/update.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func UpdateStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
7676
return fmt.Errorf("UpdateStruct of table %s: expected struct but got %T", table, rowStruct)
7777
}
7878

79-
columns, pkCol, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
79+
columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
8080
if len(columns) == 0 {
8181
return fmt.Errorf("UpdateStruct of table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
8282
}
@@ -85,7 +85,7 @@ func UpdateStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
8585
fmt.Fprintf(&b, `UPDATE %s SET `, table)
8686
first := true
8787
for i := range columns {
88-
if pkCol[i] {
88+
if f := flags[i]; f.IsPrimaryKey() || f.IsReadOnly() {
8989
continue
9090
}
9191
if first {
@@ -97,19 +97,19 @@ func UpdateStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
9797
}
9898

9999
b.WriteString(` WHERE `)
100-
first = true
100+
hasPK := false
101101
for i := range columns {
102-
if !pkCol[i] {
102+
if !flags[i].IsPrimaryKey() {
103103
continue
104104
}
105-
if first {
106-
first = false
105+
if !hasPK {
106+
hasPK = true
107107
} else {
108108
b.WriteString(` AND `)
109109
}
110110
fmt.Fprintf(&b, `"%s"=$%d`, columns[i], i+1)
111111
}
112-
if first {
112+
if !hasPK {
113113
return fmt.Errorf("UpdateStruct of table %s: %T has no exported struct fields with ,pk tag value suffix to mark primary key column(s)", table, rowStruct)
114114
}
115115
query := b.String()

‎impl/upsert.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,34 @@ func UpsertStruct(conn sqldb.Connection, table string, rowStruct interface{}, na
2626
return fmt.Errorf("UpsertStruct to table %s: expected struct but got %T", table, rowStruct)
2727
}
2828

29-
columns, pkCol, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
29+
columns, flags, vals := structFields(v, namer, ignoreColumns, restrictToColumns, true)
3030
if len(columns) == 0 {
3131
return fmt.Errorf("UpsertStruct to table %s: %T has no exported struct fields with `db` tag", table, rowStruct)
3232
}
3333

3434
var b strings.Builder
3535
writeInsertQuery(&b, table, columns)
3636
b.WriteString(` ON CONFLICT(`)
37-
first := true
37+
hasPK := false
3838
for i := range columns {
39-
if !pkCol[i] {
39+
if !flags[i].IsPrimaryKey() {
4040
continue
4141
}
42-
if first {
43-
first = false
42+
if !hasPK {
43+
hasPK = true
4444
} else {
4545
b.WriteByte(',')
4646
}
4747
fmt.Fprintf(&b, `"%s"`, columns[i])
4848
}
49-
if first {
49+
if !hasPK {
5050
return fmt.Errorf("UpsertStruct to table %s: %T has no exported struct fields with ,pk tag value suffix to mark primary key column(s)", table, rowStruct)
5151
}
5252

5353
b.WriteString(`) DO UPDATE SET `)
54-
first = true
54+
first := true
5555
for i := range columns {
56-
if pkCol[i] {
56+
if f := flags[i]; f.IsPrimaryKey() || f.IsReadOnly() {
5757
continue
5858
}
5959
if first {

0 commit comments

Comments
 (0)