fix(db): skip SQL comment lines when parsing schema table names
parseTableNames() regex-scanned every line of schema.sql, comments
included, with 'CREATE TABLE (?:IF NOT EXISTS )?(?:\w+\.)?(\w+)'. A doc
comment containing that phrase in prose - e.g. 'declared in CREATE TABLE
above' - registered a phantom table ('above'), and startup verification
then failed with 'missing tables: above', crash-looping the app
container on every restart.
Skip lines whose trimmed form starts with '--' so comments can never
contribute table names, and add a regression test asserting every parsed
table maps back to a real CREATE TABLE statement.
This commit is contained in:
@@ -77,6 +77,12 @@ func parseTableNames() ([]string, error) {
|
|||||||
tables := make(map[string]bool)
|
tables := make(map[string]bool)
|
||||||
for scanner.Scan() {
|
for scanner.Scan() {
|
||||||
line := scanner.Text()
|
line := scanner.Text()
|
||||||
|
// Skip SQL comments: a doc line like "-- ... declared in CREATE
|
||||||
|
// TABLE above" would otherwise register a phantom table and fail
|
||||||
|
// startup verification.
|
||||||
|
if strings.HasPrefix(strings.TrimSpace(line), "--") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
matches := pattern.FindStringSubmatch(line)
|
matches := pattern.FindStringSubmatch(line)
|
||||||
if len(matches) > 1 {
|
if len(matches) > 1 {
|
||||||
tableName := matches[1]
|
tableName := matches[1]
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package database
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestParseTableNamesIgnoresComments guards against phantom tables parsed out
|
||||||
|
// of SQL comments (e.g. "-- ... declared in CREATE TABLE above" once
|
||||||
|
// registered a table named "above" and crashed startup verification).
|
||||||
|
func TestParseTableNamesIgnoresComments(t *testing.T) {
|
||||||
|
tables, err := parseTableNames()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parseTableNames() error: %v", err)
|
||||||
|
}
|
||||||
|
if len(tables) == 0 {
|
||||||
|
t.Fatal("parseTableNames() returned no tables")
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, name := range tables {
|
||||||
|
// Every parsed table must correspond to a real CREATE TABLE statement
|
||||||
|
// at the start of a (non-comment) line.
|
||||||
|
stmt := regexp.MustCompile(`(?m)^CREATE TABLE (?:IF NOT EXISTS )?(?:\w+\.)?` + regexp.QuoteMeta(name) + `\s`)
|
||||||
|
if !stmt.MatchString(SchemaFile) {
|
||||||
|
t.Errorf("parseTableNames() returned phantom table %q with no matching CREATE TABLE statement", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user