mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-15 02:52:55 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

Inline schema method, fix a test

Browse Source
This commit is contained in:
Zach Musgrave
2023-02-15 14:10:57 -08:00
parent 01980e8bdf
commit 55c65093c7
7 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go/libraries/doltcore/sqle/schema_table.go
View File

@@ -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)

6
go/libraries/doltcore/sqle/sqlddl_test.go
View File

@@ -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) {

4
go/libraries/doltcore/sqle/sqldelete_test.go
View File

@@ -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,
},
}

6
go/libraries/doltcore/sqle/sqlinsert_test.go
View File

@@ -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),
},
}

4
go/libraries/doltcore/sqle/sqlreplace_test.go
View File

@@ -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),
},
}

4
go/libraries/doltcore/sqle/sqlselect_test.go
View File

@@ -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),
},
}

4
go/libraries/doltcore/sqle/sqlupdate_test.go
View File

@@ -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),
},
}