Changed the interface for Droppable to not consider the if exists flag

zachmu · zachmu · commit a514766021a0 · 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,9 +44,9 @@ func (d *Database) Create(name string, schema sql.Schema) error {
 	return nil
 }
 
-func (d *Database) DropTable(name string, ifExists bool) error {
+func (d *Database) DropTable(name string) error {
 	_, ok := d.tables[name]
-	if !ok && !ifExists {
+	if !ok {
 		return sql.ErrTableNotFound.New(name)
 	}
 
diff --git a/sql/core.go b/sql/core.go
@@ -237,7 +237,7 @@ type Alterable interface {
 
 // Droppable should be implemented by databases that can drop tables.
 type Droppable interface {
-	DropTable(name string, ifExists bool) error
+	DropTable(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
@@ -123,7 +123,14 @@ func (d *DropTable) RowIter(s *sql.Context) (sql.RowIter, error) {
 
 	var err error
 	for _, tableName := range d.names {
-		err = droppable.DropTable(tableName, d.ifExists)
+		_, ok := d.db.Tables()[tableName]
+		if !ok {
+			if d.ifExists {
+				continue
+			}
+			return nil, sql.ErrTableNotFound.New(tableName)
+		}
+		err = droppable.DropTable(tableName)
 		if err != nil {
 			break
 		}
diff --git a/sql/plan/ddl_test.go b/sql/plan/ddl_test.go
@@ -72,6 +72,13 @@ func TestDropTable(t *testing.T) {
 	d = NewDropTable(db, true, "testTable1")
 	_, err = d.RowIter(sql.NewEmptyContext())
 	require.NoError(err)
+
+	d = NewDropTable(db, true, "testTable1", "testTable2", "testTable3")
+	_, err = d.RowIter(sql.NewEmptyContext())
+	require.NoError(err)
+
+	_, ok = db.Tables()["testTable3"]
+	require.False(ok)
 }
 
 func createTable(t *testing.T, db sql.Database, name string, schema sql.Schema) {

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ func (d *Database) Create(name string, schema sql.Schema) error {`
`44`	`44`	`return nil`
`45`	`45`	`}`
`46`	`46`
`47`		`-func (d *Database) DropTable(name string, ifExists bool) error {`
	`47`	`+func (d *Database) DropTable(name string) error {`
`48`	`48`	`_, ok := d.tables[name]`
`49`		`- if !ok && !ifExists {`
	`49`	`+ if !ok {`
`50`	`50`	`return sql.ErrTableNotFound.New(name)`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ type Alterable interface {`
`237`	`237`
`238`	`238`	`// Droppable should be implemented by databases that can drop tables.`
`239`	`239`	`type Droppable interface {`
`240`		`- DropTable(name string, ifExists bool) error`
	`240`	`+ DropTable(name string) error`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// Lockable should be implemented by tables that can be locked and unlocked.`