Skip to content

Passing SQLite comments to the generated struct #3766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Passing SQLite comments to the generated struct #3766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec94235
Passing SQLite comments to the generated struct
oxisto Dec 27, 2024
847fd6c
Take only comment inside CREATE query
oxisto Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions internal/engine/sqlite/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,26 +107,54 @@ func (c *cc) convertAttach_stmtContext(n *parser.Attach_stmtContext) ast.Node {
}

func (c *cc) convertCreate_table_stmtContext(n *parser.Create_table_stmtContext) ast.Node {
tokenStream := n.GetParser().GetTokenStream().(*antlr.CommonTokenStream)

stmt := &ast.CreateTableStmt{
Name: parseTableName(n),
IfNotExists: n.EXISTS_() != nil,
Comment: comment(tokenStream, n.OPEN_PAR().GetSymbol()),
}

for _, idef := range n.AllColumn_def() {
if def, ok := idef.(*parser.Column_defContext); ok {
typeName := "any"
if def.Type_name() != nil {
typeName = def.Type_name().GetText()
}

stmt.Cols = append(stmt.Cols, &ast.ColumnDef{
Colname: identifier(def.Column_name().GetText()),
IsNotNull: hasNotNullConstraint(def.AllColumn_constraint()),
TypeName: &ast.TypeName{Name: typeName},
Comment: comment(tokenStream, def.GetStop()),
})

}
}
return stmt
}

// comment returns the comment associated with the given context.
func comment(tokenStream *antlr.CommonTokenStream, from antlr.Token) string {
var (
hiddenTokens []antlr.Token
comment string
)

hiddenTokens = tokenStream.GetHiddenTokensToRight(from.GetTokenIndex()+1, antlr.TokenHiddenChannel)

for _, token := range hiddenTokens {
// Filter for single-line comments
if token.GetTokenType() == parser.SQLiteLexerSINGLE_LINE_COMMENT {
// Remove "--" and leading/trailing whitespaces
comment = strings.TrimSpace(strings.TrimPrefix(token.GetText(), "--"))
return comment
}
}

return ""
}

func (c *cc) convertCreate_virtual_table_stmtContext(n *parser.Create_virtual_table_stmtContext) ast.Node {
switch moduleName := n.Module_name().GetText(); moduleName {
case "fts5":
Expand Down
Loading