Renaming Transaction() into NewTransaction().

db.go

@@ -368,7 +368,7 @@ type Database interface {
 // 	}
 //
 // 	var tx db.Tx
-// 	if tx, err = sess.Transaction(); err != nil {
+// 	if tx, err = sess.NewTransaction(); err != nil {
 // 		log.Fatal(err)
 // 	}
 //

internal/sqladapter/collection.go

@@ -107,7 +107,7 @@ func (c *collection) InsertReturning(item interface{}) error {
 
 	if !inTx {
 		// This is only executed if t.Database() was **not** a transaction and if
-		// sess was created with sess.Transaction().
+		// sess was created with sess.NewTransaction().
 		return tx.Commit()
 	}
 	return err
@@ -118,7 +118,7 @@ cancel:
 
 	if !inTx {
 		// This is only executed if t.Database() was **not** a transaction and if
-		// sess was created with sess.Transaction().
+		// sess was created with sess.NewTransaction().
 		tx.Rollback()
 	}
 	return err

internal/sqladapter/testing/adapter.go.tpl

@@ -170,7 +170,7 @@ func TestInsertReturningWithinTransaction(t *testing.T) {
 	err := sess.Collection("artist").Truncate()
 	assert.NoError(t, err)
 
-	tx, err := sess.Transaction()
+	tx, err := sess.NewTransaction()
 	assert.NoError(t, err)
 	defer tx.Close()
 
@@ -858,7 +858,7 @@ func TestTransactionsAndRollback(t *testing.T) {
 	defer sess.Close()
 
 	// Simple transaction that should not fail.
-	tx, err := sess.Transaction()
+	tx, err := sess.NewTransaction()
 	assert.NoError(t, err)
 
 	artist := tx.Collection("artist")
@@ -880,7 +880,7 @@ func TestTransactionsAndRollback(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Use another transaction.
-	tx, err = sess.Transaction()
+	tx, err = sess.NewTransaction()
 
 	artist = tx.Collection("artist")
 
@@ -912,7 +912,7 @@ func TestTransactionsAndRollback(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Attempt to add some rows.
-	tx, err = sess.Transaction()
+	tx, err = sess.NewTransaction()
 	assert.NoError(t, err)
 
 	artist = tx.Collection("artist")
@@ -943,7 +943,7 @@ func TestTransactionsAndRollback(t *testing.T) {
 	assert.NoError(t, err)
 
 	// Attempt to add some rows.
-	tx, err = sess.Transaction()
+	tx, err = sess.NewTransaction()
 	assert.NoError(t, err)
 
 	artist = tx.Collection("artist")
@@ -1087,7 +1087,7 @@ func TestBuilder(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotZero(t, all)
 
-	tx, err := sess.Transaction()
+	tx, err := sess.NewTransaction()
 	assert.NoError(t, err)
 	assert.NotZero(t, tx)
 	defer tx.Close()
@@ -1121,7 +1121,7 @@ func TestExhaustConnectionPool(t *testing.T) {
 			start := time.Now()
 
 			// Requesting a new transaction session.
-			tx, err := sess.Transaction()
+			tx, err := sess.NewTransaction()
 			if err != nil {
 				t.Fatal(err)
 			}

internal/sqladapter/testing/adapter_benchmark.go.tpl

@@ -93,7 +93,7 @@ func BenchmarkUpperInsertTransaction(b *testing.B) {
 	sess := mustOpen()
 	defer sess.Close()
 
-	tx, err := sess.Transaction()
+	tx, err := sess.NewTransaction()
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -125,7 +125,7 @@ func BenchmarkUpperInsertTransactionWithMap(b *testing.B) {
 	sess := mustOpen()
 	defer sess.Close()
 
-	tx, err := sess.Transaction()
+	tx, err := sess.NewTransaction()
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -277,7 +277,7 @@ func BenchmarkUpperCommitManyTransactions(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		var tx Tx
-		if tx, err = sess.Transaction(); err != nil {
+		if tx, err = sess.NewTransaction(); err != nil {
 			b.Fatal(err)
 		}
 
@@ -315,7 +315,7 @@ func BenchmarkUpperRollbackManyTransactions(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		var tx db.Tx
-		if tx, err = sess.Transaction(); err != nil {
+		if tx, err = sess.NewTransaction(); err != nil {
 			b.Fatal(err)
 		}
 
@@ -370,7 +370,7 @@ func BenchmarkSQLInsert(b *testing.B) {
 func BenchmarkDBRInsert(b *testing.B) {
 	var err error
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -425,7 +425,7 @@ func BenchmarkSQLInsertWithArgs(b *testing.B) {
 func BenchmarkDBRInsertWithArgs(b *testing.B) {
 	var err error
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -516,7 +516,7 @@ func BenchmarkSQLPreparedInsertWithArguments(b *testing.B) {
 func BenchmarkDBRPreparedInsertWithArguments(b *testing.B) {
 	var err error
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -583,7 +583,7 @@ func BenchmarkSQLPreparedInsertWithVariableArgs(b *testing.B) {
 func BenchmarkDBRPreparedInsertWithVariableArgs(b *testing.B) {
 	var err error
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -692,7 +692,7 @@ func BenchmarkDBRSelect(b *testing.B) {
 		b.Fatal(err)
 	}
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}
@@ -746,7 +746,7 @@ func BenchmarkDBRPreparedSelect(b *testing.B) {
 		b.Fatal(err)
 	}
 
-	conn, err := dbr.Open(Adapter, settings.String(), nil)
+	conn, err := dbr.Open(sqlDriver, settings.String(), nil)
 	if err != nil {
 		b.Fatal(err)
 	}

mongo/database.go

@@ -88,9 +88,9 @@ func (s *Source) Clone() (db.Database, error) {
 	return clone, nil
 }
 
-// Transaction should support transactions, but it doesn't as MongoDB
+// NewTransaction should support transactions, but it doesn't as MongoDB
 // currently does not support them.
-func (s *Source) Transaction() (db.Tx, error) {
+func (s *Source) NewTransaction() (db.Tx, error) {
 	return nil, db.ErrUnsupported
 }
 

mysql/database.go

@@ -38,7 +38,7 @@ type Database interface {
 	db.Database
 	builder.Builder
 
-	Transaction() (Tx, error)
+	NewTransaction() (Tx, error)
 }
 
 // database is the actual implementation of Database
@@ -88,8 +88,8 @@ func (d *database) Open(connURL db.ConnectionURL) error {
 	return d.open()
 }
 
-// Transaction starts a transaction block.
-func (d *database) Transaction() (Tx, error) {
+// NewTransaction starts a transaction block.
+func (d *database) NewTransaction() (Tx, error) {
 	nTx, err := d.NewLocalTransaction()
 	if err != nil {
 		return nil, err

mysql/mysql.go

@@ -25,8 +25,10 @@ import (
 	"upper.io/db.v2"
 )
 
+const sqlDriver = `mysql`
+
 // Adapter is the public name of the adapter.
-const Adapter = `mysql`
+const Adapter = sqlDriver
 
 func init() {
 	db.Register(Adapter, &database{})

mysql/tx.go

@@ -42,6 +42,6 @@ var (
 	_ = db.Tx(&tx{})
 )
 
-func (t *tx) Transaction() (Tx, error) {
+func (t *tx) NewTransaction() (Tx, error) {
 	return t, db.ErrAlreadyWithinTransaction
 }

postgresql/database.go

@@ -38,7 +38,7 @@ type Database interface {
 	db.Database
 	builder.Builder
 
-	Transaction() (Tx, error)
+	NewTransaction() (Tx, error)
 }
 
 // database is the actual implementation of Database
@@ -88,8 +88,8 @@ func (d *database) Open(connURL db.ConnectionURL) error {
 	return d.open()
 }
 
-// Transaction starts a transaction block.
-func (d *database) Transaction() (Tx, error) {
+// NewTransaction starts a transaction block.
+func (d *database) NewTransaction() (Tx, error) {
 	nTx, err := d.NewLocalTransaction()
 	if err != nil {
 		return nil, err

postgresql/postgresql.go

@@ -25,6 +25,8 @@ import (
 	"upper.io/db.v2"
 )
 
+const sqlDriver = `postgres`
+
 // Adapter is the public name of the adapter.
 const Adapter = `postgresql`
 

postgresql/tx.go

@@ -42,6 +42,6 @@ var (
 	_ = db.Tx(&tx{})
 )
 
-func (t *tx) Transaction() (Tx, error) {
+func (t *tx) NewTransaction() (Tx, error) {
 	return t, db.ErrAlreadyWithinTransaction
 }

ql/database.go

@@ -38,7 +38,7 @@ type Database interface {
 	db.Database
 	builder.Builder
 
-	Transaction() (Tx, error)
+	NewTransaction() (Tx, error)
 }
 
 // database is the actual implementation of Database
@@ -102,8 +102,8 @@ func (d *database) Open(connURL db.ConnectionURL) error {
 	return d.open()
 }
 
-// Transaction starts a transaction block.
-func (d *database) Transaction() (Tx, error) {
+// NewTransaction starts a transaction block.
+func (d *database) NewTransaction() (Tx, error) {
 	nTx, err := d.NewLocalTransaction()
 	if err != nil {
 		return nil, err

ql/ql.go

@@ -25,8 +25,10 @@ import (
 	"upper.io/db.v2"
 )
 
+const sqlDriver = `sqlite`
+
 // Adapter is the public name of the adapter.
-const Adapter = `ql`
+const Adapter = sqlDriver
 
 func init() {
 	db.Register(Adapter, &database{})

ql/tx.go

@@ -42,6 +42,6 @@ var (
 	_ = db.Tx(&tx{})
 )
 
-func (t *tx) Transaction() (Tx, error) {
+func (t *tx) NewTransaction() (Tx, error) {
 	return t, db.ErrAlreadyWithinTransaction
 }

sqlite/database.go

@@ -39,7 +39,7 @@ type Database interface {
 	db.Database
 	builder.Builder
 
-	Transaction() (Tx, error)
+	NewTransaction() (Tx, error)
 }
 
 // database is the actual implementation of Database
@@ -103,8 +103,8 @@ func (d *database) Open(connURL db.ConnectionURL) error {
 	return d.open()
 }
 
-// Transaction starts a transaction block.
-func (d *database) Transaction() (Tx, error) {
+// NewTransaction starts a transaction block.
+func (d *database) NewTransaction() (Tx, error) {
 	nTx, err := d.NewLocalTransaction()
 	if err != nil {
 		return nil, err

sqlite/sqlite.go

@@ -25,8 +25,10 @@ import (
 	"upper.io/db.v2"
 )
 
+const sqlDriver = `sqlite`
+
 // Adapter is the public name of the adapter.
-const Adapter = `sqlite`
+const Adapter = sqlDriver
 
 func init() {
 	db.Register(Adapter, &database{})

sqlite/tx.go

@@ -42,6 +42,6 @@ var (
 	_ = db.Tx(&tx{})
 )
 
-func (t *tx) Transaction() (Tx, error) {
+func (t *tx) NewTransaction() (Tx, error) {
 	return t, db.ErrAlreadyWithinTransaction
 }