Override view name in querier

internal/test/sql/mssql_init.sql

@@ -7,6 +7,8 @@ CREATE TABLE [people] (
   [updated_at] datetime2
 );
 
+EXEC('CREATE VIEW [people_copy] AS SELECT * from [people]')
+
 CREATE TABLE [projects] (
   [name] varchar(255) NOT NULL,
   [id] varchar(255) PRIMARY KEY,

internal/test/sql/mysql_init.sql

@@ -11,6 +11,8 @@ CREATE TABLE people (
   PRIMARY KEY (id)
 );
 
+CREATE VIEW people_copy AS SELECT * from people;
+
 CREATE TABLE projects (
   name varchar(255) NOT NULL,
   id varchar(255) NOT NULL,

internal/test/sql/postgres_init.sql

@@ -9,6 +9,8 @@ CREATE TABLE people (
   -- updated_at timestamp without time zone
 );
 
+CREATE VIEW people_copy AS SELECT * from people;
+
 CREATE TABLE projects (
   name varchar NOT NULL,
   id varchar PRIMARY KEY,

internal/test/sql/sqlite3_init.sql

@@ -7,6 +7,8 @@ CREATE TABLE people (
   updated_at datetime
 );
 
+CREATE VIEW people_copy AS SELECT * from people;
+
 CREATE TABLE projects (
   name varchar NOT NULL,
   id varchar NOT NULL PRIMARY KEY,

querier.go

@@ -8,8 +8,9 @@ import (
 
 // Querier performs queries and commands.
 type Querier struct {
-	dbtx DBTX
-	tag  string
+	dbtx     DBTX
+	tag      string
+	viewName string
 	Dialect
 	Logger Logger
 }
@@ -53,9 +54,19 @@ func (q *Querier) WithTag(format string, args ...interface{}) *Querier {
 	return newQ
 }
 
+// WithView returns a copy of Querier with appointed view name.
+func (q *Querier) WithView(viewName string) *Querier {
+	newQ := newQuerier(q.dbtx, q.Dialect, q.Logger)
+	newQ.viewName = viewName
+	return newQ
+}
+
 // QualifiedView returns quoted qualified view name.
 func (q *Querier) QualifiedView(view View) string {
 	v := q.QuoteIdentifier(view.Name())
+	if q.viewName != "" {
+		v = q.QuoteIdentifier(q.viewName)
+	}
 	if view.Schema() != "" {
 		v = q.QuoteIdentifier(view.Schema()) + "." + v
 	}

querier_examples_test.go

@@ -81,6 +81,17 @@ func ExampleQuerier_WithTag() {
 	// Name: `Vicious Baron` (string), ID: `baron` (string), Start: 2014-06-01 00:00:00 +0000 UTC (time.Time), End: 2016-02-21 00:00:00 +0000 UTC (*time.Time)
 }
 
+func ExampleQuerier_WithView() {
+	id := 1
+	person, err := DB.WithView("people_copy").FindByPrimaryKeyFrom(PersonTable, id)
+	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

@@ -120,8 +120,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 +142,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 +155,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 +169,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)
 	}

reform-db/cmd_init_test.go

@@ -38,7 +38,11 @@ func (s *ReformDBSuite) TestInit() {
 
 	fis, err := ioutil.ReadDir(dir)
 	s.Require().NoError(err)
-	s.Require().Len(fis, 4)
+	if s.db.Dialect == sqlite3.Dialect {
+		s.Require().Len(fis, 4) // generate 4 struct files for sqlite3
+	} else {
+		s.Require().Len(fis, 5) // generate 5 struct files for other DBs
+	}
 
 	ff := filepath.Join(dir, "people.go")
 	actual, err := parse.File(ff)