First working tests!!! Simple version of Create Table is working. Looking forward to test Select and implement insert

Author: 1NepuNep1

internal/engine/yql/catalog.go renamed to internal/engine/ydb/catalog.go

@@ -1,4 +1,4 @@
-package yql
+package ydb
 
 import "github.com/sqlc-dev/sqlc/internal/sql/catalog"
 

internal/engine/ydb/catalog_test.go

@@ -0,0 +1,165 @@
+package ydb
+
+import (
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+	"github.com/sqlc-dev/sqlc/internal/sql/catalog"
+)
+
+func TestCreateTable(t *testing.T) {
+	tests := []struct {
+		stmt string
+		s    *catalog.Schema
+	}{
+		{
+			stmt: `CREATE TABLE users (
+				id Uint64,
+				age Int32,
+				score Float,
+				PRIMARY KEY (id)
+			)`,
+			s: &catalog.Schema{
+				Name: "main",
+				Tables: []*catalog.Table{
+					{
+						Rel: &ast.TableName{Name: "users"},
+						Columns: []*catalog.Column{
+							{
+								Name:      "id",
+								Type:      ast.TypeName{Name: "Uint64"},
+								IsNotNull: true,
+							},
+							{
+								Name: "age",
+								Type: ast.TypeName{Name: "Int32"},
+							},
+							{
+								Name: "score",
+								Type: ast.TypeName{Name: "Float"},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			stmt: `CREATE TABLE posts (
+				id Uint64,
+				title Utf8 NOT NULL,
+				content String,
+				metadata Json,
+				PRIMARY KEY (id)
+			)`,
+			s: &catalog.Schema{
+				Name: "main",
+				Tables: []*catalog.Table{
+					{
+						Rel: &ast.TableName{Name: "posts"},
+						Columns: []*catalog.Column{
+							{
+								Name:      "id",
+								Type:      ast.TypeName{Name: "Uint64"},
+								IsNotNull: true,
+							},
+							{
+								Name:      "title",
+								Type:      ast.TypeName{Name: "Utf8"},
+								IsNotNull: true,
+							},
+							{
+								Name: "content",
+								Type: ast.TypeName{Name: "String"},
+							},
+							{
+								Name: "metadata",
+								Type: ast.TypeName{Name: "Json"},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			stmt: `CREATE TABLE orders (
+				id Uuid,
+				amount Decimal(22,9),
+				created_at Uint64,
+				PRIMARY KEY (id)
+			)`,
+			s: &catalog.Schema{
+				Name: "main",
+				Tables: []*catalog.Table{
+					{
+						Rel: &ast.TableName{Name: "orders"},
+						Columns: []*catalog.Column{
+							{
+								Name:      "id",
+								Type:      ast.TypeName{Name: "Uuid"},
+								IsNotNull: true,
+							},
+							{
+								Name: "amount",
+								Type: ast.TypeName{
+									Name: "Decimal",
+									Names: &ast.List{
+										Items: []ast.Node{
+											&ast.Integer{Ival: 22},
+											&ast.Integer{Ival: 9},
+										},
+									},
+								},
+							},
+							{
+								Name: "created_at",
+								Type: ast.TypeName{Name: "Uint64"},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	p := NewParser()
+	for i, tc := range tests {
+		test := tc
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			stmts, err := p.Parse(strings.NewReader(test.stmt))
+			if err != nil {
+				t.Log(test.stmt)
+				t.Fatal(err)
+			}
+
+			c := newTestCatalog()
+			if err := c.Build(stmts); err != nil {
+				t.Log(test.stmt)
+				t.Fatal(err)
+			}
+
+			e := newTestCatalog()
+			if test.s != nil {
+				var replaced bool
+				for i := range e.Schemas {
+					if e.Schemas[i].Name == test.s.Name {
+						e.Schemas[i] = test.s
+						replaced = true
+						break
+					}
+				}
+				if !replaced {
+					e.Schemas = append(e.Schemas, test.s)
+				}
+			}
+
+			if diff := cmp.Diff(e, c, cmpopts.EquateEmpty(), cmpopts.IgnoreUnexported(catalog.Column{})); diff != "" {
+				t.Log(test.stmt)
+				t.Errorf("catalog mismatch:\n%s", diff)
+			}
+		})
+	}
+}

internal/engine/yql/convert.go renamed to internal/engine/ydb/convert.go

@@ -1,4 +1,4 @@
-package yql
+package ydb
 
 import (
 	"log"
@@ -403,7 +403,7 @@ func (c *cc) convertCreate_table_stmtContext(n *parser.Create_table_stmtContext)
 						for _, cname := range conCtx.AllAn_id() {
 							for _, col := range stmt.Cols {
 								if col.Colname == parseAnId(cname) {
-									col.PrimaryKey = true
+									col.IsNotNull = true
 								}
 							}
 						}
@@ -483,7 +483,7 @@ func (c *cc) convertTypeName(n parser.IType_nameContext) *ast.TypeName {
 	if decimal := n.Type_name_decimal(); decimal != nil {
 		if integerOrBinds := decimal.AllInteger_or_bind(); len(integerOrBinds) >= 2 {
 			return &ast.TypeName{
-				Name:    "DECIMAL",
+				Name:    "Decimal",
 				TypeOid: 0,
 				Names: &ast.List{
 					Items: []ast.Node{
@@ -1443,8 +1443,23 @@ func (c *cc) convertLiteralValue(n *parser.Literal_valueContext) ast.Node {
 	}
 }
 
+func (c *cc) convertSqlStmt(n *parser.Sql_stmtContext) ast.Node {
+	if n == nil {
+		return nil
+	}
+	// todo: handle explain
+	if core := n.Sql_stmt_core(); core != nil {
+		return c.convert(core)
+	}
+
+	return nil
+}
+
 func (c *cc) convert(node node) ast.Node {
 	switch n := node.(type) {
+	case *parser.Sql_stmtContext:
+		return c.convertSqlStmt(n)
+
 	case *parser.Sql_stmt_coreContext:
 		return c.convertSqlStmtCore(n)
 

internal/engine/yql/parse.go renamed to internal/engine/ydb/parse.go

@@ -1,4 +1,4 @@
-package yql
+package ydb
 
 import (
 	"errors"

internal/engine/yql/reserved.go renamed to internal/engine/ydb/reserved.go

@@ -1,4 +1,4 @@
-package yql
+package ydb
 
 import "strings"
 

internal/engine/yql/utils.go renamed to internal/engine/ydb/utils.go

@@ -1,4 +1,4 @@
-package yql
+package ydb
 
 import (
 	"strconv"