Make clone() no longer force a new connection. Closes #219.

internal/sqladapter/collection.go

@@ -82,10 +82,10 @@ func (c *collection) InsertReturning(item interface{}) error {
 		// Not within a transaction, let's create one.
 		var err error
 		tx, err = c.p.Database().NewLocalTransaction()
-		defer tx.Close()
 		if err != nil {
 			return err
 		}
+		defer tx.Close()
 	}
 
 	var res db.Result

internal/sqladapter/database.go

@@ -180,16 +180,22 @@ func (d *database) Close() error {
 		d.sessMu.Unlock()
 	}()
 	if d.sess != nil {
-		if d.Transaction() != nil && !d.Transaction().Committed() {
-			d.Transaction().Rollback()
-		}
-		d.cachedCollections.Clear()
-		d.cachedStatements.Clear() // Closes prepared statements as well.
 		if cleaner, ok := d.PartialDatabase.(HasCleanUp); ok {
 			cleaner.CleanUp()
 		}
+		d.cachedCollections.Clear()
+		d.cachedStatements.Clear() // Closes prepared statements as well.
+
+		tx := d.Transaction()
+		if tx == nil {
+			// Not within a transaction.
 			return d.sess.Close()
 		}
+
+		if !tx.Committed() {
+			tx.Rollback()
+		}
+	}
 	return nil
 }
 

mysql/database.go

@@ -130,10 +130,15 @@ func (d *database) clone() (*database, error) {
 		return nil, err
 	}
 
-	if err := clone.open(); err != nil {
+	clone.BaseDatabase = sqladapter.NewBaseDatabase(clone)
+
+	b, err := sqlbuilder.WithSession(clone.BaseDatabase, template)
+	if err != nil {
 		return nil, err
 	}
+	clone.Builder = b
 
+	clone.BaseDatabase.BindSession(d.BaseDatabase.Session())
 	return clone, nil
 }
 

postgresql/database.go

@@ -129,10 +129,15 @@ func (d *database) clone() (*database, error) {
 		return nil, err
 	}
 
-	if err := clone.open(); err != nil {
+	clone.BaseDatabase = sqladapter.NewBaseDatabase(clone)
+
+	b, err := sqlbuilder.WithSession(clone.BaseDatabase, template)
+	if err != nil {
 		return nil, err
 	}
+	clone.Builder = b
 
+	clone.BaseDatabase.BindSession(d.BaseDatabase.Session())
 	return clone, nil
 }