mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-05 00:44:00 -06:00
Code Issues Packages Projects Releases 142 Wiki Activity

moved column checking code to function

Browse Source
This commit is contained in:
James Cor
2022-01-31 16:57:39 -08:00
parent 8adf1a8f1f
commit 2f4947dbb6
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
go/libraries/doltcore/sqle/database.go
View File

@@ -700,6 +700,20 @@ func (db Database) CreateTable(ctx *sql.Context, tableName string, sch sql.Prima
return db.createSqlTable(ctx, tableName, sch)
}
// isUsingSpatialColAsKey is a utility function that checks for any spatial types being used as a primary key
func isUsingSpatialColAsKey(sch schema.Schema) bool {
pkCols := sch.GetPKCols()
cols := pkCols.GetColumns()
for _, c := range cols {
if c.TypeInfo.Equals(typeinfo.PointType) ||
c.TypeInfo.Equals(typeinfo.LinestringType) ||
c.TypeInfo.Equals(typeinfo.PolygonType) {
return true
}
}
return false
}
// Unlike the exported version CreateTable, createSqlTable doesn't enforce any table name checks.
func (db Database) createSqlTable(ctx *sql.Context, tableName string, sch sql.PrimaryKeySchema) error {
root, err := db.GetRoot(ctx)
@@ -724,14 +738,8 @@ func (db Database) createSqlTable(ctx *sql.Context, tableName string, sch sql.Pr
}
// Prevent any tables that use Spatial Types as Primary Key from being created
pkCols := doltSch.GetPKCols()
cols := pkCols.GetColumns()
for _, c := range cols {
if c.TypeInfo.Equals(typeinfo.PointType) ||
c.TypeInfo.Equals(typeinfo.LinestringType) ||
c.TypeInfo.Equals(typeinfo.PolygonType) {
return errors.NewKind("can't use Spatial Types as Primary Key for table %s").New(tableName)
}
if isUsingSpatialColAsKey(doltSch) {
return errors.NewKind("can't use Spatial Types as Primary Key for table %s").New(tableName)
}
return db.createDoltTable(ctx, tableName, root, doltSch)