Override view name in querier

db.go

@@ -41,7 +41,7 @@ func NewDB(db *sql.DB, dialect Dialect, logger Logger) *DB {
 // Logger can be nil.
 func NewDBFromInterface(db DBInterface, dialect Dialect, logger Logger) *DB {
 	return &DB{
-		Querier: newQuerier(context.Background(), db, "", dialect, logger),
+		Querier: newQuerier(context.Background(), db, "", "", dialect, logger),
 		db:      db,
 	}
 }

querier.go

@@ -9,25 +9,27 @@ import (
 
 // Querier performs queries and commands.
 type Querier struct {
-	ctx     context.Context
-	dbtxCtx DBTXContext
-	tag     string
+	ctx               context.Context
+	dbtxCtx           DBTXContext
+	tag               string
+	qualifiedViewName string
 	Dialect
 	Logger Logger
 }
 
-func newQuerier(ctx context.Context, dbtxCtx DBTXContext, tag string, dialect Dialect, logger Logger) *Querier {
+func newQuerier(ctx context.Context, dbtxCtx DBTXContext, tag, qualifiedViewName string, dialect Dialect, logger Logger) *Querier {
 	return &Querier{
-		ctx:     ctx,
-		dbtxCtx: dbtxCtx,
-		tag:     tag,
-		Dialect: dialect,
-		Logger:  logger,
+		ctx:               ctx,
+		dbtxCtx:           dbtxCtx,
+		tag:               tag,
+		qualifiedViewName: qualifiedViewName,
+		Dialect:           dialect,
+		Logger:            logger,
 	}
 }
 
 func (q *Querier) clone() *Querier {
-	return newQuerier(q.ctx, q.dbtxCtx, q.tag, q.Dialect, q.Logger)
+	return newQuerier(q.ctx, q.dbtxCtx, q.tag, q.qualifiedViewName, q.Dialect, q.Logger)
 }
 
 func (q *Querier) logBefore(query string, args []interface{}) {
@@ -66,11 +68,20 @@ func (q *Querier) WithTag(format string, args ...interface{}) *Querier {
 	return newQ
 }
 
-// QualifiedView returns quoted qualified view name.
+// WithQualifiedViewName returns a copy of Querier with set qualified view name.
+// Returned Querier is tied to the same DB or TX.
+// TODO Support INSERT/UPDATE/DELETE. More test.
+func (q *Querier) WithQualifiedViewName(qualifiedViewName string) *Querier {
+	newQ := q.clone()
+	newQ.qualifiedViewName = qualifiedViewName
+	return newQ
+}
+
+// QualifiedView returns quoted qualified view name of given view.
 func (q *Querier) QualifiedView(view View) string {
 	v := q.QuoteIdentifier(view.Name())
-	if view.Schema() != "" {
-		v = q.QuoteIdentifier(view.Schema()) + "." + v
+	if s := view.Schema(); s != "" {
+		v = q.QuoteIdentifier(s) + "." + v
 	}
 	return v
 }

querier_examples_test.go

@@ -85,6 +85,20 @@ func ExampleQuerier_WithContext() {
 	_, _ = DB.WithContext(ctx).SelectAllFrom(ProjectTable, "")
 }
 
+func ExampleQuerier_WithQualifiedViewName() {
+	_, err := DB.WithQualifiedViewName("people_0").FindByPrimaryKeyFrom(PersonTable, 1)
+	if err != reform.ErrNoRows {
+		log.Fatal(err)
+	}
+	person, err := DB.WithQualifiedViewName("people_1").FindByPrimaryKeyFrom(PersonTable, 1)
+	if err != nil {
+		log.Fatal(err)
+	}
+	fmt.Println(person)
+	// Output:
+	// ID: 1 (int32), GroupID: 65534 (*int32), Name: `Denis Mills` (string), Email: <nil> (*string), CreatedAt: 2009-11-10 23:00:00 +0000 UTC (time.Time), UpdatedAt: <nil> (*time.Time)
+}
+
 func ExampleQuerier_SelectRows() {
 	tail := fmt.Sprintf("WHERE created_at < %s ORDER BY id", DB.Placeholder(1))
 	y2010 := time.Date(2010, 1, 1, 0, 0, 0, 0, time.UTC)

querier_selects.go

@@ -42,8 +42,12 @@ func (q *Querier) selectQuery(view View, tail string, limit1 bool) string {
 		query += " TOP 1"
 	}
 
-	return fmt.Sprintf("%s %s FROM %s %s",
-		query, strings.Join(q.QualifiedColumns(view), ", "), q.QualifiedView(view), tail)
+	from := q.QualifiedView(view)
+	if q.qualifiedViewName != "" {
+		from = q.qualifiedViewName + " AS " + from
+	}
+
+	return fmt.Sprintf("%s %s FROM %s %s", query, strings.Join(q.QualifiedColumns(view), ", "), from, tail)
 }
 
 // SelectOneTo queries str's View with tail and args and scans first result to str.
@@ -120,8 +124,8 @@ func (q *Querier) SelectAllFrom(view View, tail string, args ...interface{}) (st
 }
 
 // findTail returns a tail of SELECT query for given view, column and arg.
-func (q *Querier) findTail(view string, column string, arg interface{}, limit1 bool) (tail string, needArg bool) {
-	qi := q.QuoteIdentifier(view) + "." + q.QuoteIdentifier(column)
+func (q *Querier) findTail(view View, column string, arg interface{}, limit1 bool) (tail string, needArg bool) {
+	qi := q.QualifiedView(view) + "." + q.QuoteIdentifier(column)
 	if arg == nil {
 		tail = fmt.Sprintf("WHERE %s IS NULL", qi)
 	} else {
@@ -142,7 +146,7 @@ func (q *Querier) findTail(view string, column string, arg interface{}, limit1 b
 // If there are no rows in result, it returns ErrNoRows. It also may return QueryRow(), Scan()
 // and AfterFinder errors.
 func (q *Querier) FindOneTo(str Struct, column string, arg interface{}) error {
-	tail, needArg := q.findTail(str.View().Name(), column, arg, true)
+	tail, needArg := q.findTail(str.View(), column, arg, true)
 	if needArg {
 		return q.SelectOneTo(str, tail, arg)
 	}
@@ -155,7 +159,7 @@ func (q *Querier) FindOneTo(str Struct, column string, arg interface{}) error {
 // If there are no rows in result, it returns nil, ErrNoRows. It also may return QueryRow(), Scan()
 // and AfterFinder errors.
 func (q *Querier) FindOneFrom(view View, column string, arg interface{}) (Struct, error) {
-	tail, needArg := q.findTail(view.Name(), column, arg, true)
+	tail, needArg := q.findTail(view, column, arg, true)
 	if needArg {
 		return q.SelectOneFrom(view, tail, arg)
 	}
@@ -169,7 +173,7 @@ func (q *Querier) FindOneFrom(view View, column string, arg interface{}) (Struct
 //
 // See SelectRows example for idiomatic usage.
 func (q *Querier) FindRows(view View, column string, arg interface{}) (*sql.Rows, error) {
-	tail, needArg := q.findTail(view.Name(), column, arg, false)
+	tail, needArg := q.findTail(view, column, arg, false)
 	if needArg {
 		return q.SelectRows(view, tail, arg)
 	}

querier_test.go

@@ -23,6 +23,7 @@ import (
 	"gopkg.in/reform.v1/dialects/postgresql"
 	"gopkg.in/reform.v1/dialects/sqlite3"
 	"gopkg.in/reform.v1/dialects/sqlserver"
+	. "gopkg.in/reform.v1/internal/test/models"
 )
 
 type ctxKey string
@@ -161,3 +162,28 @@ func TestExecWithContext(t *testing.T) {
 		t.Fatalf("tx.Rollback: unhandled driver %T. err = %s", dbDriver, err)
 	}
 }
+
+func (s *ReformSuite) TestQualifiedView() {
+	switch s.q.Dialect {
+	case postgresql.Dialect:
+		s.Equal(`"people"`, s.q.QualifiedView(PersonTable))
+		s.Equal(`"people"`, s.q.WithQualifiedViewName("ignored").QualifiedView(PersonTable))
+		s.Equal(`"legacy"."people"`, s.q.QualifiedView(LegacyPersonTable))
+		s.Equal(`"legacy"."people"`, s.q.WithQualifiedViewName("ignored").QualifiedView(LegacyPersonTable))
+
+	case mysql.Dialect:
+		s.Equal("`people`", s.q.QualifiedView(PersonTable))
+		s.Equal("`people`", s.q.WithQualifiedViewName("ignored").QualifiedView(PersonTable))
+
+	case sqlite3.Dialect:
+		s.Equal(`"people"`, s.q.QualifiedView(PersonTable))
+		s.Equal(`"people"`, s.q.WithQualifiedViewName("ignored").QualifiedView(PersonTable))
+
+	case mssql.Dialect, sqlserver.Dialect:
+		s.Equal(`[people]`, s.q.QualifiedView(PersonTable))
+		s.Equal(`[people]`, s.q.WithQualifiedViewName("ignored").QualifiedView(PersonTable))
+
+	default:
+		s.Fail("Unhandled dialect", s.q.Dialect.String())
+	}
+}

reform-db/cmd_init_test.go

@@ -38,7 +38,7 @@ func (s *ReformDBSuite) TestInit() {
 
 	fis, err := ioutil.ReadDir(dir)
 	s.Require().NoError(err)
-	s.Require().Len(fis, 4)
+	s.Require().Len(fis, 7) // 4 tables + views people_0, people_1, people_2
 
 	ff := filepath.Join(dir, "people.go")
 	actual, err := parse.File(ff)

test/sql/mssql_init.sql

@@ -7,6 +7,11 @@ CREATE TABLE [people] (
   [updated_at] datetime2
 );
 
+-- EXEC is workaround for "'CREATE VIEW' must be the first statement in a query batch."
+EXEC('CREATE VIEW [people_0] AS SELECT * FROM [people] WHERE (id % 3) = 0');
+EXEC('CREATE VIEW [people_1] AS SELECT * FROM [people] WHERE (id % 3) = 1');
+EXEC('CREATE VIEW [people_2] AS SELECT * FROM [people] WHERE (id % 3) = 2');
+
 CREATE TABLE [projects] (
   [name] varchar(255) NOT NULL,
   [id] varchar(255) PRIMARY KEY,

test/sql/mysql_init.sql

@@ -11,6 +11,10 @@ CREATE TABLE people (
   PRIMARY KEY (id)
 );
 
+CREATE VIEW people_0 AS SELECT * FROM people WHERE (id % 3) = 0;
+CREATE VIEW people_1 AS SELECT * FROM people WHERE (id % 3) = 1;
+CREATE VIEW people_2 AS SELECT * FROM people WHERE (id % 3) = 2;
+
 CREATE TABLE projects (
   name varchar(255) NOT NULL,
   id varchar(255) NOT NULL,

test/sql/postgres_init.sql

@@ -9,6 +9,10 @@ CREATE TABLE people (
   -- updated_at timestamp without time zone
 );
 
+CREATE VIEW people_0 AS SELECT * FROM people WHERE (id % 3) = 0;
+CREATE VIEW people_1 AS SELECT * FROM people WHERE (id % 3) = 1;
+CREATE VIEW people_2 AS SELECT * FROM people WHERE (id % 3) = 2;
+
 CREATE TABLE projects (
   name varchar NOT NULL,
   id varchar PRIMARY KEY,

test/sql/sqlite3_init.sql

@@ -7,6 +7,10 @@ CREATE TABLE people (
   updated_at datetime
 );
 
+CREATE VIEW people_0 AS SELECT * FROM people WHERE (id % 3) = 0;
+CREATE VIEW people_1 AS SELECT * FROM people WHERE (id % 3) = 1;
+CREATE VIEW people_2 AS SELECT * FROM people WHERE (id % 3) = 2;
+
 CREATE TABLE projects (
   name varchar NOT NULL,
   id varchar NOT NULL PRIMARY KEY,

tx.go

@@ -44,7 +44,7 @@ func NewTXFromInterface(tx TXInterface, dialect Dialect, logger Logger) *TX {
 
 func newTX(ctx context.Context, tx TXInterface, dialect Dialect, logger Logger) *TX {
 	return &TX{
-		Querier: newQuerier(ctx, tx, "", dialect, logger),
+		Querier: newQuerier(ctx, tx, "", "", dialect, logger),
 		tx:      tx,
 	}
 }