Remove most of parse create table

Author: jakozaur

platform/clickhouse/parserCreateTable.go

@@ -4,7 +4,6 @@ package clickhouse
 
 import (
 	"github.com/QuesmaOrg/quesma/platform/logger"
-	"strings"
 	"unicode"
 )
 
@@ -43,16 +42,6 @@ func parseMaybeAndForget(q string, i int, s string) (int, bool) {
 	return i, false
 }
 
-func parseMaybeAndForgetMultiple(q string, i int, ss []string) (int, bool) {
-	for _, s := range ss {
-		i2, ok := parseMaybeAndForget(q, i, s)
-		if ok {
-			return i2, true
-		}
-	}
-	return i, false
-}
-
 func isGoodIdentChar(r rune) bool {
 	return !unicode.IsSpace(r) && r != ')' && r != '"' && r != '`' && r != ',' && r != '('
 }
@@ -127,82 +116,6 @@ func parseIdentWithBrackets(q string, i int) (int, string) {
 	return -1, ""
 }
 
-func parseColumn(q string, i int) (int, Column) {
-	col := Column{}
-	i = omitWhitespace(q, i)
-	// name
-	quote := `"`
-	i2 := parseExact(q, i, quote)
-	if i2 == -1 {
-		quote = "`"
-		i2 = parseExact(q, i, quote)
-		if i2 == -1 {
-			return -1, col
-		}
-	}
-	i, col.Name = parseIdent(q, i2)
-	if i == -1 {
-		return -1, col
-	}
-	i = parseExact(q, i, quote)
-	// type
-	if i == -1 {
-		return -1, col
-	}
-	i, col.Type = parseNullable(q, i)
-	if i == -1 {
-		return -1, col
-	}
-
-	// NULL | NOT NULL
-	i = omitWhitespace(q, i)
-	i, _ = parseMaybeAndForgetMultiple(q, i, []string{"NULL", "NOT NULL"})
-
-	// DEFAULT | MATERIALIZED | EPHEMERAL | ALIAS expr
-	i = omitWhitespace(q, i)
-	i, ok := parseMaybeAndForgetMultiple(q, i, []string{"DEFAULT", "MATERIALIZED", "EPHEMERAL", "ALIAS"})
-	if ok {
-		i = omitWhitespace(q, i)
-		i = parseExpr(q, i)
-		if i == -1 {
-			return -1, col
-		}
-		i = omitWhitespace(q, i)
-	}
-
-	// CODEC
-	if i+5 < len(q) && q[i:i+5] == "CODEC" {
-		i, col.Codec = parseCodec(q, i)
-		i = omitWhitespace(q, i)
-	}
-
-	// TTL
-	if i+3 < len(q) && q[i:i+3] == "TTL" {
-		i = omitWhitespace(q, i+3)
-		i = parseExpr(q, i)
-		if i == -1 {
-			return -1, col
-		}
-		i = omitWhitespace(q, i)
-	}
-
-	// COMMENT
-	if i+7 < len(q) && q[i:i+7] == "COMMENT" {
-		// TODO should be good enough for now
-		for {
-			i++
-			if q[i] == ',' {
-				break
-			}
-		}
-	}
-
-	if i == -1 || i >= len(q) || (q[i] != ',' && q[i] != ')') {
-		return -1, col
-	}
-	return i, col
-}
-
 func parseType(q string, i int) (int, Type) {
 	i2, name := parseIdent(q, i)
 	if i == -1 {
@@ -288,160 +201,3 @@ func parseMultiValueType(q string, i int) (int, []*Column) {
 		i = omitWhitespace(q, j+1)
 	}
 }
-
-func parseCodec(q string, i int) (int, Codec) {
-	b := i
-	i = parseExact(q, i, "CODEC")
-	if i == -1 {
-		return -1, Codec{}
-	}
-	i = omitWhitespace(q, i)
-	i = parseExact(q, i, "(")
-	bracketsCnt := 1
-	for i < len(q) && bracketsCnt > 0 {
-		if q[i] == '(' {
-			bracketsCnt++
-		} else if q[i] == ')' {
-			bracketsCnt--
-		}
-		i++
-	}
-	if i >= len(q) {
-		return -1, Codec{}
-	}
-	return i, Codec{Name: q[b:i]}
-}
-
-// Kind of hackish, but should work 100% of the time, unless CODEC/TTL/COMMENT
-// can be used in expressions (I'd assume they can't)
-func parseExpr(q string, i int) int {
-	bracketsCnt := 0
-	for i < len(q) {
-		if q[i] == '(' {
-			bracketsCnt++
-		} else if q[i] == ')' {
-			bracketsCnt--
-		}
-		if bracketsCnt < 0 {
-			return i
-		}
-		if bracketsCnt == 0 {
-			if q[i] == ',' {
-				return i
-			}
-			_, ok := parseMaybeAndForgetMultiple(q, i, []string{"CODEC", "TTL", "COMMENT"})
-			if ok {
-				return i
-			}
-			if q[i] == ')' {
-				i2 := omitWhitespace(q, i+1)
-				if parseExact(q, i2, "ENGINE") != -1 {
-					return i
-				}
-			}
-		}
-		i = omitWhitespace(q, i+1)
-	}
-	return -1
-}
-
-// 0 = success,
-// > 0 - fail, char index where failed
-// Tuples can be unnamed. In this case they are not supported yet, as I'm not sure
-// if it's worth adding right now.
-func ParseCreateTable(q string) (*Table, int) {
-	t := Table{}
-
-	// parse header
-	i := parseExact(q, 0, "CREATE TABLE ")
-	if i == -1 {
-		return &t, 1
-	}
-	i, _ = parseMaybeAndForget(q, i, "IF NOT EXISTS ")
-
-	// parse [db.]table_name
-	i = omitWhitespace(q, i)
-	i2 := parseExact(q, i, `"`)
-	quote := i2 != -1
-	if quote {
-		i = i2
-	}
-	i2, ident := parseIdent(q, i) // ident = db name or table name
-	if i2 == -1 {
-		return &t, i
-	}
-	if strings.Contains(ident, ".") { // If it has ".", it means it is DB name
-		split := strings.Split(ident, ".")
-		if len(split) > 1 {
-			t.Name = strings.Join(split[1:], ".")
-		}
-		t.DatabaseName = split[0]
-	} else {
-		t.Name = ident
-	}
-	if quote {
-		i2 = parseExact(q, i2, `"`)
-		if i2 == -1 {
-			return &t, i
-		}
-	}
-
-	// parse [ON CLUSTER cluster_name]
-	i3 := parseExact(q, i2, "ON CLUSTER ")
-	if i3 != -1 {
-		i3 = omitWhitespace(q, i3)
-		i4, _ := parseMaybeAndForget(q, i3, `"`) // cluster name can be quoted, but doesn't have to
-		if i4 != -1 {
-			i3 = i4
-		}
-		i4, ident := parseIdent(q, i3)
-		if i4 == -1 {
-			return &t, i3
-		}
-		t.ClusterName = ident
-		if i4 != -1 {
-			i4, _ = parseMaybeAndForget(q, i4, `"`)
-			if i4 == -1 {
-				return &t, i3
-			}
-		}
-		i2 = i4
-	}
-
-	i3 = parseExact(q, i2, "(")
-	if i3 == -1 {
-		return &t, i2
-	}
-
-	// parse columns
-	t.Cols = make(map[string]*Column)
-	for {
-		i = omitWhitespace(q, i3)
-		if parseExact(q, i, "INDEX") != -1 {
-			return &t, 0
-		}
-		i, col := parseColumn(q, i3)
-		if i == -1 {
-			return &t, i3
-		}
-		t.Cols[col.Name] = &col
-		i2 = omitWhitespace(q, i)
-		if i2 == -1 {
-			return &t, i
-		}
-		if q[i2] == ')' {
-			return &t, 0
-		} else if q[i2] != ',' {
-			return &t, i2
-		} else {
-			i3 = omitWhitespace(q, i2+1)
-			if i3 == -1 {
-				return &t, i2 + 1
-			} else if q[i3] == ')' {
-				return &t, 0
-			} else {
-				i3 = i2 + 1
-			}
-		}
-	}
-}

platform/clickhouse/schema.go

@@ -311,16 +311,6 @@ func NewType(value any, valueOrigin string) (Type, error) {
 	return nil, fmt.Errorf("unsupported type '%T' of value: %v (origin: %s)", value, value, valueOrigin)
 }
 
-func NewTable(createTableQuery string, config *ChTableConfig) (*Table, error) {
-	t, i := ParseCreateTable(createTableQuery)
-	t.Config = config
-	if i == 0 {
-		return t, nil
-	} else {
-		return t, fmt.Errorf("error parsing query at character %d, query: %s", i, createTableQuery)
-	}
-}
-
 // NewEmptyTable is used only in tests
 func NewEmptyTable(tableName string) *Table {
 	return &Table{Name: tableName, Config: NewChTableConfigNoAttrs()}