Replace spansql with memefish v0.4.0

Author: nktks

cli.go

@@ -8,7 +8,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"cloud.google.com/go/spanner/spansql"
+	"github.com/cloudspannerecosystem/memefish"
+	"github.com/cloudspannerecosystem/memefish/ast"
+	"github.com/cloudspannerecosystem/memefish/token"
 )
 
 const (
@@ -56,6 +58,10 @@ func (cli *cli) run(args []string) int {
 		log.Print(err)
 		return exitCodeError
 	}
+	log.Printf("Parsed %d tables", len(tables))
+	for i, t := range tables {
+		log.Printf("Table %d: %s", i, getTableName(t))
+	}
 	graph, err := NewGraph()
 	if err != nil {
 		log.Print(err)
@@ -67,11 +73,19 @@ func (cli *cli) run(args []string) int {
 		return exitCodeError
 	}
 	s := graph.String()
+	log.Printf("Graph DOT content: %s", s)
 	r := strings.NewReader(s)
 	c := exec.Command("dot", fmt.Sprintf("-T%s", t), "-o", output)
 	c.Stdin = r
-	c.Start()
-	c.Wait()
+	var stderr strings.Builder
+	c.Stderr = &stderr
+	err = c.Run()
+	if err != nil {
+		log.Printf("Error running dot command: %v", err)
+		log.Printf("Stderr: %s", stderr.String())
+		return exitCodeError
+	}
+	log.Printf("Output file created: %s", output)
 
 	return exitCodeOK
 }
@@ -86,19 +100,55 @@ func (cli *cli) read(file string) (string, error) {
 
 }
 
-func parse(sqls string) ([]*spansql.CreateTable, error) {
-	// spansql not allow backquote
-	sqls = strings.Replace(sqls, "`", "", -1)
-	d, err := spansql.ParseDDL("", sqls)
-	if err != nil {
-		return nil, err
-	}
-	tables := []*spansql.CreateTable{}
-	for _, e := range d.List {
-		switch v := e.(type) {
-		case *spansql.CreateTable:
-			tables = append(tables, v)
+func parse(sqls string) ([]*ast.CreateTable, error) {
+	// Log the original SQL for debugging
+	log.Printf("Original SQL: %s", sqls)
+
+	// Split the SQL by semicolons to get individual statements
+	statements := strings.Split(sqls, ";")
+
+	var tables []*ast.CreateTable
+	for _, stmt := range statements {
+		// Skip empty statements
+		stmt = strings.TrimSpace(stmt)
+		if stmt == "" {
+			continue
+		}
+
+		// Log each statement for debugging
+		log.Printf("Parsing statement: %s", stmt)
+
+		// Create a new Parser instance for each statement
+		file := &token.File{
+			Buffer: stmt,
+		}
+		p := &memefish.Parser{
+			Lexer: &memefish.Lexer{File: file},
+		}
+
+		// Parse the statement
+		parsedStmt, err := p.ParseStatement()
+		if err != nil {
+			log.Printf("Error parsing statement: %v", err)
+			continue
+		}
+
+		// If it's a CREATE TABLE statement, add it to our list
+		if createTable, ok := parsedStmt.(*ast.CreateTable); ok {
+			log.Printf("Found CREATE TABLE: %s", getTableName(createTable))
+			tables = append(tables, createTable)
+		} else {
+			log.Printf("Statement is not a CREATE TABLE: %T", parsedStmt)
 		}
 	}
+
 	return tables, nil
 }
+
+// Helper function to get the name from a CreateTable
+func getTableName(t *ast.CreateTable) string {
+	if t.Name != nil && len(t.Name.Idents) > 0 {
+		return t.Name.Idents[len(t.Name.Idents)-1].Name
+	}
+	return ""
+}

go.mod

@@ -1,21 +1,10 @@
 module github.com/nktks/spanner-er
 
-go 1.14
+go 1.23.0
+
+toolchain go1.23.5
 
 require (
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/spanner v1.42.0
 	github.com/awalterschulze/gographviz v0.0.0-20190522210029-fa59802746ab
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
-	github.com/cncf/xds/go v0.0.0-20221128185840-c261a164b73d // indirect
-	github.com/envoyproxy/go-control-plane v0.10.3 // indirect
-	github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.2.1 // indirect
-	golang.org/x/net v0.4.0 // indirect
-	golang.org/x/oauth2 v0.3.0 // indirect
-	google.golang.org/api v0.105.0 // indirect
-	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
+	github.com/cloudspannerecosystem/memefish v0.4.0
 )