diff --git a/go/libraries/doltcore/sqle/schema_table.go b/go/libraries/doltcore/sqle/schema_table.go index 3067374dc3..de61b25d5c 100644 --- a/go/libraries/doltcore/sqle/schema_table.go +++ b/go/libraries/doltcore/sqle/schema_table.go @@ -64,10 +64,6 @@ var schemasTableCols = schema.NewColCollection( var schemaTableSchema = schema.MustSchemaFromCols(schemasTableCols) -func SchemasTableSchema() schema.Schema { - return schemaTableSchema -} - // GetOrCreateDoltSchemasTable returns the `dolt_schemas` table in `db`, creating it if it does not already exist. func GetOrCreateDoltSchemasTable(ctx *sql.Context, db Database) (retTbl *WritableDoltTable, retErr error) { tbl, found, err := db.GetTableInsensitive(ctx, doltdb.SchemasTableName) diff --git a/go/libraries/doltcore/sqle/sqlddl_test.go b/go/libraries/doltcore/sqle/sqlddl_test.go index dfea5337c0..d5987c3712 100644 --- a/go/libraries/doltcore/sqle/sqlddl_test.go +++ b/go/libraries/doltcore/sqle/sqlddl_test.go @@ -807,15 +807,15 @@ func TestAlterSystemTables(t *testing.T) { err := CreateEmptyTestTable(dEnv, "dolt_docs", doltdb.DocsSchema) require.NoError(t, err) - err = CreateEmptyTestTable(dEnv, doltdb.SchemasTableName, SchemasTableSchema()) + err = CreateEmptyTestTable(dEnv, doltdb.SchemasTableName, schemaTableSchema) require.NoError(t, err) CreateTestTable(t, dEnv, "dolt_docs", doltdb.DocsSchema, "INSERT INTO dolt_docs VALUES ('LICENSE.md','A license')") CreateTestTable(t, dEnv, doltdb.DoltQueryCatalogTableName, dtables.DoltQueryCatalogSchema, "INSERT INTO dolt_query_catalog VALUES ('abc123', 1, 'example', 'select 2+2 from dual', 'description')") - CreateTestTable(t, dEnv, doltdb.SchemasTableName, SchemasTableSchema(), - "INSERT INTO dolt_schemas (type, name, fragment, id) VALUES ('view', 'name', 'create view name as select 2+2 from dual', 1)") + CreateTestTable(t, dEnv, doltdb.SchemasTableName, schemaTableSchema, + "INSERT INTO dolt_schemas (type, name, fragment) VALUES ('view', 'name', 'create view name as select 2+2 from dual')") } t.Run("Create", func(t *testing.T) { diff --git a/go/libraries/doltcore/sqle/sqldelete_test.go b/go/libraries/doltcore/sqle/sqldelete_test.go index 563d878e5e..aa077130fd 100644 --- a/go/libraries/doltcore/sqle/sqldelete_test.go +++ b/go/libraries/doltcore/sqle/sqldelete_test.go @@ -207,12 +207,12 @@ var systemTableDeleteTests = []DeleteTest{ }, { Name: "delete dolt_schemas", - AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, SchemasTableSchema(), + AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, schemaTableSchema, "INSERT INTO dolt_schemas (type, name, fragment, id) VALUES ('view', 'name', 'create view name as select 2+2 from dual', 1)"), DeleteQuery: "delete from dolt_schemas", SelectQuery: "select * from dolt_schemas", ExpectedRows: ToSqlRows(dtables.DoltQueryCatalogSchema), - ExpectedSchema: SchemasTableSchema(), + ExpectedSchema: schemaTableSchema, }, } diff --git a/go/libraries/doltcore/sqle/sqlinsert_test.go b/go/libraries/doltcore/sqle/sqlinsert_test.go index 92a704b8c2..4e3c3d412d 100644 --- a/go/libraries/doltcore/sqle/sqlinsert_test.go +++ b/go/libraries/doltcore/sqle/sqlinsert_test.go @@ -397,13 +397,13 @@ var systemTableInsertTests = []InsertTest{ }, { Name: "insert into dolt_schemas", - AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, SchemasTableSchema(), ""), + AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, schemaTableSchema, ""), InsertQuery: "insert into dolt_schemas (id, type, name, fragment) values (1, 'view', 'name', 'create view name as select 2+2 from dual')", SelectQuery: "select * from dolt_schemas ORDER BY id", - ExpectedRows: ToSqlRows(CompressSchema(SchemasTableSchema()), + ExpectedRows: ToSqlRows(CompressSchema(schemaTableSchema), NewRow(types.String("view"), types.String("name"), types.String("create view name as select 2+2 from dual"), types.Int(1)), ), - ExpectedSchema: CompressSchema(SchemasTableSchema()), + ExpectedSchema: CompressSchema(schemaTableSchema), }, } diff --git a/go/libraries/doltcore/sqle/sqlreplace_test.go b/go/libraries/doltcore/sqle/sqlreplace_test.go index 9b7ef8abe2..fdb7d4b616 100644 --- a/go/libraries/doltcore/sqle/sqlreplace_test.go +++ b/go/libraries/doltcore/sqle/sqlreplace_test.go @@ -272,12 +272,12 @@ var systemTableReplaceTests = []ReplaceTest{ }, { Name: "replace into dolt_schemas", - AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, SchemasTableSchema(), + AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, schemaTableSchema, "INSERT INTO dolt_schemas VALUES ('view', 'name', 'create view name as select 2+2 from dual', 1, NULL)"), ReplaceQuery: "replace into dolt_schemas (id, type, name, fragment) values ('1', 'view', 'name', 'create view name as select 1+1 from dual')", SelectQuery: "select type, name, fragment, id, extra from dolt_schemas", ExpectedRows: []sql.Row{{"view", "name", "create view name as select 1+1 from dual", int64(1), nil}}, - ExpectedSchema: CompressSchema(SchemasTableSchema()), + ExpectedSchema: CompressSchema(schemaTableSchema), }, } diff --git a/go/libraries/doltcore/sqle/sqlselect_test.go b/go/libraries/doltcore/sqle/sqlselect_test.go index 26788a91aa..7408790738 100644 --- a/go/libraries/doltcore/sqle/sqlselect_test.go +++ b/go/libraries/doltcore/sqle/sqlselect_test.go @@ -1298,11 +1298,11 @@ var systemTableSelectTests = []SelectTest{ }, { Name: "select from dolt_schemas", - AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, SchemasTableSchema(), + AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, schemaTableSchema, `INSERT INTO dolt_schemas VALUES ('view', 'name', 'create view name as select 2+2 from dual', 1, NULL)`), Query: "select * from dolt_schemas", ExpectedRows: []sql.Row{{"view", "name", "create view name as select 2+2 from dual", int64(1), nil}}, - ExpectedSchema: CompressSchema(SchemasTableSchema()), + ExpectedSchema: CompressSchema(schemaTableSchema), }, } diff --git a/go/libraries/doltcore/sqle/sqlupdate_test.go b/go/libraries/doltcore/sqle/sqlupdate_test.go index c8ea97902f..25ef8597fc 100644 --- a/go/libraries/doltcore/sqle/sqlupdate_test.go +++ b/go/libraries/doltcore/sqle/sqlupdate_test.go @@ -377,12 +377,12 @@ var systemTableUpdateTests = []UpdateTest{ }, { Name: "update dolt_schemas", - AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, SchemasTableSchema(), + AdditionalSetup: CreateTableFn(doltdb.SchemasTableName, schemaTableSchema, `INSERT INTO dolt_schemas VALUES ('view', 'name', 'create view name as select 2+2 from dual', 1, NULL)`), UpdateQuery: "update dolt_schemas set type = 'not a view'", SelectQuery: "select * from dolt_schemas", ExpectedRows: []sql.Row{{"not a view", "name", "create view name as select 2+2 from dual", int64(1), nil}}, - ExpectedSchema: CompressSchema(SchemasTableSchema()), + ExpectedSchema: CompressSchema(schemaTableSchema), }, }