From 9d294c4f39bcf9c3228a8c888e50f6494dfee7c7 Mon Sep 17 00:00:00 2001
From: pokeeffe-molecula <patrick.okeeffe@molecula.com>
Date: Tue, 4 Apr 2023 18:19:11 -0500
Subject: [PATCH] fixed some rebasing problems

---
 sql3/parser/ast_test.go       | 2 +-
 sql3/planner/opsystemtable.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql3/parser/ast_test.go b/sql3/parser/ast_test.go
index 206d58dfc..236adfb30 100644
--- a/sql3/parser/ast_test.go
+++ b/sql3/parser/ast_test.go
@@ -750,7 +750,7 @@ func TestBulkInsertStatement_String(t *testing.T) {
 				MapExpr: &parser.Ident{Name: "2"}},
 			{Name: &parser.Ident{Name: "decimal"},
 				Type: &parser.Type{Name: &parser.Ident{Name: "DECIMAL"},
-					Scale: &parser.IntegerLit{Value: "2"}},
+					Modifier: &parser.IntegerLit{Value: "2"}},
 				MapExpr: &parser.Ident{Name: "3"}},
 			{Name: &parser.Ident{Name: "timestamp"},
 				Type:    &parser.Type{Name: &parser.Ident{Name: "TIMESTAMP"}},
diff --git a/sql3/planner/opsystemtable.go b/sql3/planner/opsystemtable.go
index ec21f5584..2ac027db8 100644
--- a/sql3/planner/opsystemtable.go
+++ b/sql3/planner/opsystemtable.go
@@ -517,7 +517,7 @@ func generateTableDDL(tbl *dax.Table, newName string) string {
 			buf.WriteString(", ")
 		}
 		fmt.Fprintf(&buf, "%s", col.Name)
-		dataType := fieldSQLDataType(pilosa.FieldToFieldInfo(col))
+		dataType := FieldSQLDataType(pilosa.FieldToFieldInfo(col))
 		fmt.Fprintf(&buf, " %s", dataType.TypeDescription())
 
 		switch dt := dataType.(type) {