Skip to content

Commit 016883e

Browse files
committed
rebuild with sqldef v3.7.4
1 parent 0bb6180 commit 016883e

File tree

7 files changed

+263
-187
lines changed

7 files changed

+263
-187
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wasm_exec.js linguist-generated=true

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
.PHONY: wasm
2-
3-
wasm:
1+
sqldef.wasm: go.mod go.sum sqldef-wasm.go
42
GOOS=js GOARCH=wasm go build $(GOFLAGS) -o sqldef.wasm ./sqldef-wasm.go
5-
cp ${GOROOT}/misc/wasm/wasm_exec.js .
3+
cp $$(go env GOROOT)/lib/wasm/wasm_exec.js .
4+
5+
dev: sqldef.wasm
6+
@echo "Starting HTTP server at http://localhost:6543"
7+
@python3 -m http.server 6543
8+
.PHONEY: devk

go.mod

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module github.com/sqldef/sqldef.github.io/v3
2+
3+
go 1.25
4+
5+
toolchain go1.25.5
6+
7+
require github.com/sqldef/sqldef/v3 v3.7.4
8+
9+
require (
10+
github.com/goccy/go-yaml v1.19.0 // indirect
11+
golang.org/x/sync v0.18.0 // indirect
12+
)

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
github.com/goccy/go-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
2+
github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
3+
github.com/sqldef/sqldef/v3 v3.7.2 h1:OrkrU9lk0sN2osRN2cdulC9pTeiqmv4MEQFwg21puIA=
4+
github.com/sqldef/sqldef/v3 v3.7.2/go.mod h1:wUTDOPzCMqwR3sLsoVV4J99D6cpxzu9iy2iAFTu22a8=
5+
github.com/sqldef/sqldef/v3 v3.7.4 h1:BKxfzt1/OUG5Ke4U8bawUleKl9yo5ObhaJlgUa5mmq8=
6+
github.com/sqldef/sqldef/v3 v3.7.4/go.mod h1:yrTNAMDgx+NNL1Iu7X6eOVA3zxJ7vSt3apkdn1RDHAI=
7+
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
8+
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=

sqldef-wasm.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,35 @@
11
// +build js
22
// This is a light wasm wraper around just the DDL conversion stuff
33
package main
4-
4+
55
import (
66
"strings"
77
"syscall/js"
8-
"github.com/k0kubun/sqldef/schema"
8+
"github.com/sqldef/sqldef/v3/database"
9+
"github.com/sqldef/sqldef/v3/parser"
10+
"github.com/sqldef/sqldef/v3/schema"
911
)
1012

1113
func diff(this js.Value, args []js.Value) interface {} {
1214
mode := args[0].String()
1315
desiredDDLs := args[1].String()
1416
currentDDLs := args[2].String()
1517
callback := args[3]
18+
1619
generatorMode := schema.GeneratorModeMysql
20+
parserMode := parser.ParserModeMysql
1721
if (mode == "postgres"){
1822
generatorMode = schema.GeneratorModePostgres
23+
parserMode = parser.ParserModePostgres
1924
}
20-
ddls, err := schema.GenerateIdempotentDDLs(generatorMode, desiredDDLs, currentDDLs)
25+
26+
sqlParser := database.NewParser(parserMode)
27+
config := database.GeneratorConfig{}
28+
defaultSchema := ""
29+
30+
ddls, err := schema.GenerateIdempotentDDLs(generatorMode, sqlParser, desiredDDLs, currentDDLs, config, defaultSchema)
2131
out := strings.Join(ddls, ";\n")
22-
32+
2333
if err != nil {
2434
callback.Invoke(err.Error(), out)
2535
return false
@@ -28,7 +38,7 @@ func diff(this js.Value, args []js.Value) interface {} {
2838
return true
2939
}
3040
}
31-
41+
3242
func main() {
3343
c := make(chan bool)
3444
// I wish this wasn't global!

sqldef.wasm

2.06 MB
Binary file not shown.

0 commit comments

Comments
 (0)