Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
dev: writing converter
  • Loading branch information
CNLHC committed Mar 26, 2024
commit 9b53451305cea843f70be8db70a12e2dbdac1f47
4 changes: 2 additions & 2 deletions internal/cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.C
return nil, true
}
if err := c.ParseCatalog(sql.Schema); err != nil {
fmt.Fprintf(stderr, "# package %s\n", name)
fmt.Fprintf(stderr, "# parsing catalog: package %s\n", name)
if parserErr, ok := err.(*multierr.Error); ok {
for _, fileErr := range parserErr.Errs() {
printFileErr(stderr, dir, fileErr)
Expand All @@ -320,7 +320,7 @@ func parse(ctx context.Context, name, dir string, sql config.SQL, combo config.C
debug.Dump(c.Catalog())
}
if err := c.ParseQueries(sql.Queries, parserOpts); err != nil {
fmt.Fprintf(stderr, "# package %s\n", name)
fmt.Fprintf(stderr, "# parsing queries: package %s\n", name)
if parserErr, ok := err.(*multierr.Error); ok {
for _, fileErr := range parserErr.Errs() {
printFileErr(stderr, dir, fileErr)
Expand Down
1 change: 1 addition & 0 deletions internal/compiler/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ func (c *Compiler) Catalog() *catalog.Catalog {
}

func (c *Compiler) ParseCatalog(schema []string) error {

return c.parseCatalog(schema)
}

Expand Down
14 changes: 6 additions & 8 deletions internal/engine/clickhouse/catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ package clickhouse
import "github.com/sqlc-dev/sqlc/internal/sql/catalog"

func NewCatalog() *catalog.Catalog {
def := "main"
return &catalog.Catalog{
def := ""
c := &catalog.Catalog{
DefaultSchema: def,
Schemas: []*catalog.Schema{
// defaultSchema(def),
Schemas: []*catalog.Schema{
&catalog.Schema{Name: ""},
},
Extensions: map[string]struct{}{},
}
}

func newTestCatalog() *catalog.Catalog {
return catalog.New("main")
c.Schemas = append(c.Schemas, getInformationSchema())
return c
}
12 changes: 12 additions & 0 deletions internal/engine/clickhouse/information_schema.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package clickhouse

import "github.com/sqlc-dev/sqlc/internal/sql/catalog"

func getInformationSchema() *catalog.Schema {
s := &catalog.Schema{Name: "information_schema"}
s.Funcs = make([]*catalog.Function, 0)
s.Tables = []*catalog.Table{
//TODO
}
return s
}
Loading