Merge pull request #8 from Vinovest/mj/update-sqltokenizer

update sqltoken to v0.1.0

Author: mrj0

bind.go

@@ -37,16 +37,19 @@ var rebindConfigs = func() []sqltoken.Config {
 	pg := sqltoken.PostgreSQLConfig()
 	pg.NoticeQuestionMark = true
 	pg.NoticeDollarNumber = false
+	pg.SeparatePunctuation = true
 	configs[DOLLAR] = pg
 
 	ora := sqltoken.OracleConfig()
 	ora.NoticeColonWord = false
 	ora.NoticeQuestionMark = true
+	ora.SeparatePunctuation = true
 	configs[NAMED] = ora
 
 	ssvr := sqltoken.SQLServerConfig()
 	ssvr.NoticeAtWord = false
 	ssvr.NoticeQuestionMark = true
+	ssvr.SeparatePunctuation = true
 	configs[AT] = ssvr
 	return configs
 }()

go.mod

@@ -6,9 +6,7 @@ require (
 	github.com/go-sql-driver/mysql v1.9.0
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-sqlite3 v1.14.16
-	github.com/muir/sqltoken v0.0.5
+	github.com/muir/sqltoken v0.1.0
 )
 
 require filippo.io/edwards25519 v1.1.0 // indirect
-
-replace github.com/muir/sqltoken => github.com/vinovest/sqltoken v0.0.6-sqlx

go.sum

@@ -1,5 +1,7 @@
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/alvaroloes/enumer v1.1.2/go.mod h1:FxrjvuXoDAx9isTJrv4c+T410zFi0DtXIT0m65DJ+Wo=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
@@ -8,11 +10,25 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/muir/sqltoken v0.0.5/go.mod h1:6hPsZxszMpYyNf12og4f4VShFo/Qipz6Of0cn5KGAAU=
+github.com/muir/sqltoken v0.1.0 h1:edosEGsOClOZNfgGQNQSgxR9O6LiVefm2rDRqp2InuI=
+github.com/muir/sqltoken v0.1.0/go.mod h1:lgOIORnKekMsuc/ZwdPOfwz/PtWLPCke43cEbT3uDuY=
+github.com/pascaldekloe/name v0.0.0-20180628100202-0fd16699aae1/go.mod h1:eD5JxqMiuNYyFNmyY9rkJ/slN8y59oEu4Ei7F8OoKWQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/vinovest/sqltoken v0.0.6-sqlx h1:0VgNvs0wZ9y0K5xqsq31BHkUcHP+TPLTnW4JWC4KVKQ=
 github.com/vinovest/sqltoken v0.0.6-sqlx/go.mod h1:lgOIORnKekMsuc/ZwdPOfwz/PtWLPCke43cEbT3uDuY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190524210228-3d17549cdc6b/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

named.go

@@ -293,23 +293,27 @@ var namedParseConfigs = func() []sqltoken.Config {
 	pg.ColonWordIncludesUnicode = true
 	pg.NoticeDollarNumber = false
 	pg.NoticeQuestionMark = true
+	pg.SeparatePunctuation = true
 	configs[DOLLAR] = pg
 
 	ora := sqltoken.OracleConfig()
 	ora.ColonWordIncludesUnicode = true
 	ora.NoticeQuestionMark = true
+	ora.SeparatePunctuation = true
 	configs[NAMED] = ora
 
 	ssvr := sqltoken.SQLServerConfig()
 	ssvr.NoticeColonWord = true
 	ssvr.ColonWordIncludesUnicode = true
 	ssvr.NoticeAtWord = false
+	ssvr.SeparatePunctuation = true
 	configs[AT] = ssvr
 
 	mysql := sqltoken.MySQLConfig()
 	mysql.NoticeColonWord = true
 	mysql.ColonWordIncludesUnicode = true
 	mysql.NoticeQuestionMark = true
+	mysql.SeparatePunctuation = true
 	configs[QUESTION] = mysql
 	configs[UNKNOWN] = mysql
 	return configs