Check iterator error on Drop where applicable

hypnoglow · hypnoglow · commit 5f932c05c8bc · 2020-10-10T23:53:20.000+03:00
diff --git a/database/clickhouse/clickhouse.go b/database/clickhouse/clickhouse.go
@@ -240,6 +240,7 @@ func (ch *ClickHouse) Drop() (err error) {
 			err = multierror.Append(err, errClose)
 		}
 	}()
+
 	for tables.Next() {
 		var table string
 		if err := tables.Scan(&table); err != nil {
@@ -252,6 +253,10 @@ func (ch *ClickHouse) Drop() (err error) {
 			return &database.Error{OrigErr: err, Query: []byte(query)}
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
+
 	return nil
 }
 
diff --git a/database/cockroachdb/cockroachdb.go b/database/cockroachdb/cockroachdb.go
@@ -300,6 +300,9 @@ func (c *CockroachDb) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	if len(tableNames) > 0 {
 		// delete one by one ...
diff --git a/database/firebird/firebird.go b/database/firebird/firebird.go
@@ -193,6 +193,9 @@ func (f *Firebird) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	// delete one by one ...
 	for _, t := range tableNames {
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -401,6 +401,9 @@ func (m *Mysql) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	if len(tableNames) > 0 {
 		// disable checking foreign key constraints until finished
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -345,6 +345,9 @@ func (p *Postgres) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	if len(tableNames) > 0 {
 		// delete one by one ...
diff --git a/database/ql/ql.go b/database/ql/ql.go
@@ -136,6 +136,7 @@ func (m *Ql) Drop() (err error) {
 			err = multierror.Append(err, errClose)
 		}
 	}()
+
 	tableNames := make([]string, 0)
 	for tables.Next() {
 		var tableName string
@@ -148,6 +149,10 @@ func (m *Ql) Drop() (err error) {
 			}
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
+
 	if len(tableNames) > 0 {
 		for _, t := range tableNames {
 			query := "DROP TABLE " + t
diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -284,6 +284,9 @@ func (p *Redshift) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	if len(tableNames) > 0 {
 		// delete one by one ...
diff --git a/database/snowflake/snowflake.go b/database/snowflake/snowflake.go
@@ -318,6 +318,9 @@ func (p *Snowflake) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
 
 	if len(tableNames) > 0 {
 		// delete one by one ...
diff --git a/database/sqlcipher/sqlcipher.go b/database/sqlcipher/sqlcipher.go
@@ -143,6 +143,7 @@ func (m *Sqlite) Drop() (err error) {
 			err = multierror.Append(err, errClose)
 		}
 	}()
+
 	tableNames := make([]string, 0)
 	for tables.Next() {
 		var tableName string
@@ -153,6 +154,10 @@ func (m *Sqlite) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
+
 	if len(tableNames) > 0 {
 		for _, t := range tableNames {
 			query := "DROP TABLE " + t
diff --git a/database/sqlite3/sqlite3.go b/database/sqlite3/sqlite3.go
@@ -143,6 +143,7 @@ func (m *Sqlite) Drop() (err error) {
 			err = multierror.Append(err, errClose)
 		}
 	}()
+
 	tableNames := make([]string, 0)
 	for tables.Next() {
 		var tableName string
@@ -153,6 +154,10 @@ func (m *Sqlite) Drop() (err error) {
 			tableNames = append(tableNames, tableName)
 		}
 	}
+	if err := tables.Err(); err != nil {
+		return &database.Error{OrigErr: err, Query: []byte(query)}
+	}
+
 	if len(tableNames) > 0 {
 		for _, t := range tableNames {
 			query := "DROP TABLE " + t

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ func (ch *ClickHouse) Drop() (err error) {`
`240`	`240`	`err = multierror.Append(err, errClose)`
`241`	`241`	`}`
`242`	`242`	`}()`
	`243`	`+`
`243`	`244`	`for tables.Next() {`
`244`	`245`	`var table string`
`245`	`246`	`if err := tables.Scan(&table); err != nil {`
`@@ -252,6 +253,10 @@ func (ch *ClickHouse) Drop() (err error) {`
`252`	`253`	`return &database.Error{OrigErr: err, Query: []byte(query)}`
`253`	`254`	`}`
`254`	`255`	`}`
	`256`	`+ if err := tables.Err(); err != nil {`
	`257`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`258`	`+ }`
	`259`	`+`
`255`	`260`	`return nil`
`256`	`261`	`}`
`257`	`262`
Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,9 @@ func (c *CockroachDb) Drop() (err error) {`
`300`	`300`	`tableNames = append(tableNames, tableName)`
`301`	`301`	`}`
`302`	`302`	`}`
	`303`	`+ if err := tables.Err(); err != nil {`
	`304`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`305`	`+ }`
`303`	`306`
`304`	`307`	`if len(tableNames) > 0 {`
`305`	`308`	`// delete one by one ...`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,9 @@ func (f *Firebird) Drop() (err error) {`
`193`	`193`	`tableNames = append(tableNames, tableName)`
`194`	`194`	`}`
`195`	`195`	`}`
	`196`	`+ if err := tables.Err(); err != nil {`
	`197`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`198`	`+ }`
`196`	`199`
`197`	`200`	`// delete one by one ...`
`198`	`201`	`for _, t := range tableNames {`
Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,9 @@ func (m *Mysql) Drop() (err error) {`
`401`	`401`	`tableNames = append(tableNames, tableName)`
`402`	`402`	`}`
`403`	`403`	`}`
	`404`	`+ if err := tables.Err(); err != nil {`
	`405`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`406`	`+ }`
`404`	`407`
`405`	`408`	`if len(tableNames) > 0 {`
`406`	`409`	`// disable checking foreign key constraints until finished`
Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,9 @@ func (p *Postgres) Drop() (err error) {`
`345`	`345`	`tableNames = append(tableNames, tableName)`
`346`	`346`	`}`
`347`	`347`	`}`
	`348`	`+ if err := tables.Err(); err != nil {`
	`349`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`350`	`+ }`
`348`	`351`
`349`	`352`	`if len(tableNames) > 0 {`
`350`	`353`	`// delete one by one ...`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ func (m *Ql) Drop() (err error) {`
`136`	`136`	`err = multierror.Append(err, errClose)`
`137`	`137`	`}`
`138`	`138`	`}()`
	`139`	`+`
`139`	`140`	`tableNames := make([]string, 0)`
`140`	`141`	`for tables.Next() {`
`141`	`142`	`var tableName string`
`@@ -148,6 +149,10 @@ func (m *Ql) Drop() (err error) {`
`148`	`149`	`}`
`149`	`150`	`}`
`150`	`151`	`}`
	`152`	`+ if err := tables.Err(); err != nil {`
	`153`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`154`	`+ }`
	`155`	`+`
`151`	`156`	`if len(tableNames) > 0 {`
`152`	`157`	`for _, t := range tableNames {`
`153`	`158`	`query := "DROP TABLE " + t`
Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,9 @@ func (p *Redshift) Drop() (err error) {`
`284`	`284`	`tableNames = append(tableNames, tableName)`
`285`	`285`	`}`
`286`	`286`	`}`
	`287`	`+ if err := tables.Err(); err != nil {`
	`288`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`289`	`+ }`
`287`	`290`
`288`	`291`	`if len(tableNames) > 0 {`
`289`	`292`	`// delete one by one ...`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,9 @@ func (p *Snowflake) Drop() (err error) {`
`318`	`318`	`tableNames = append(tableNames, tableName)`
`319`	`319`	`}`
`320`	`320`	`}`
	`321`	`+ if err := tables.Err(); err != nil {`
	`322`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`323`	`+ }`
`321`	`324`
`322`	`325`	`if len(tableNames) > 0 {`
`323`	`326`	`// delete one by one ...`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ func (m *Sqlite) Drop() (err error) {`
`143`	`143`	`err = multierror.Append(err, errClose)`
`144`	`144`	`}`
`145`	`145`	`}()`
	`146`	`+`
`146`	`147`	`tableNames := make([]string, 0)`
`147`	`148`	`for tables.Next() {`
`148`	`149`	`var tableName string`
`@@ -153,6 +154,10 @@ func (m *Sqlite) Drop() (err error) {`
`153`	`154`	`tableNames = append(tableNames, tableName)`
`154`	`155`	`}`
`155`	`156`	`}`
	`157`	`+ if err := tables.Err(); err != nil {`
	`158`	`+ return &database.Error{OrigErr: err, Query: []byte(query)}`
	`159`	`+ }`
	`160`	`+`
`156`	`161`	`if len(tableNames) > 0 {`
`157`	`162`	`for _, t := range tableNames {`
`158`	`163`	`query := "DROP TABLE " + t`