Added a context to DropTable and CreateTable, and declared a new interface for create table statements, deprecating Alterable (which only supports Create)

zachmu · zachmu · commit 9af52bffde54 · 2019-10-17T11:18:53.000-07:00
Signed-off-by: Zach Musgrave &lt;zach@liquidata.co&gt;
diff --git a/memory/database.go b/memory/database.go
@@ -44,7 +44,18 @@ func (d *Database) Create(name string, schema sql.Schema) error {
 	return nil
 }
 
-func (d *Database) DropTable(name string) error {
+// Create creates a table with the given name and schema
+func (d *Database) CreateTable(ctx *sql.Context, name string, schema sql.Schema) error {
+	_, ok := d.tables[name]
+	if ok {
+		return sql.ErrTableAlreadyExists.New(name)
+	}
+
+	d.tables[name] = NewTable(name, schema)
+	return nil
+}
+
+func (d *Database) DropTable(ctx *sql.Context, name string) error {
 	_, ok := d.tables[name]
 	if !ok {
 		return sql.ErrTableNotFound.New(name)
diff --git a/sql/core.go b/sql/core.go
@@ -230,14 +230,20 @@ type Database interface {
 	Tables() map[string]Table
 }
 
+// DEPRECATED. Use TableCreator and TableDropper.
 // Alterable should be implemented by databases that can handle DDL statements
 type Alterable interface {
 	Create(name string, schema Schema) error
 }
 
-// Droppable should be implemented by databases that can drop tables.
-type Droppable interface {
-	DropTable(name string) error
+// TableCreator should be implemented by databases that can create new tables.
+type TableCreator interface {
+	CreateTable(ctx *Context, name string, schema Schema) error
+}
+
+// TableDropper should be implemented by databases that can drop tables.
+type TableDropper interface {
+	DropTable(ctx *Context, name string) error
 }
 
 // Lockable should be implemented by tables that can be locked and unlocked.
diff --git a/sql/plan/ddl.go b/sql/plan/ddl.go
@@ -59,6 +59,12 @@ func (c *CreateTable) Resolved() bool {
 
 // RowIter implements the Node interface.
 func (c *CreateTable) RowIter(s *sql.Context) (sql.RowIter, error) {
+	creatable, ok := c.db.(sql.TableCreator)
+	if ok {
+		return sql.RowsToRowIter(), creatable.CreateTable(s, c.name, c.schema)
+	}
+
+	// TODO: phase out this interface
 	d, ok := c.db.(sql.Alterable)
 	if !ok {
 		return nil, ErrCreateTable.New(c.db.Name())
@@ -116,7 +122,7 @@ func (d *DropTable) Resolved() bool {
 
 // RowIter implements the Node interface.
 func (d *DropTable) RowIter(s *sql.Context) (sql.RowIter, error) {
-	droppable, ok := d.db.(sql.Droppable)
+	droppable, ok := d.db.(sql.TableDropper)
 	if !ok {
 		return nil, ErrDropTableNotSupported.New(d.db.Name())
 	}
@@ -130,7 +136,7 @@ func (d *DropTable) RowIter(s *sql.Context) (sql.RowIter, error) {
 			}
 			return nil, sql.ErrTableNotFound.New(tableName)
 		}
-		err = droppable.DropTable(tableName)
+		err = droppable.DropTable(s, tableName)
 		if err != nil {
 			break
 		}
