use interface to enable custom Tx types

- Fix #179

.circleci/config.yml

@@ -13,14 +13,14 @@ jobs:
         environment:
           MYSQL_ROOT_PASSWORD: mysqlpassword
 
-      - image: microsoft/mssql-server-linux:ctp1-4
-        environment:
-          ACCEPT_EULA: 'Y'
-          SA_PASSWORD: 'R@@tr@@t1234'
+#     - image: microsoft/mssql-server-linux:ctp2-0
+#       environment:
+#         ACCEPT_EULA: 'Y'
+#         SA_PASSWORD: 'R@@tr@@t1234'
 
     environment:
       GOPATH: /go
-      ROOTPATH: /go/src/github.com/vattle/sqlboiler
+      ROOTPATH: /go/src/github.com/volatiletech/sqlboiler
 
     steps:
       - run:
@@ -72,31 +72,31 @@ jobs:
               sleep 1
             done
 
-      - run:
-          name: Wait for MSSQL
-          command: >
-            for i in `seq 30`; do
-              echo "Waiting for mssql"
-              set +o errexit
-              sqlcmd -H localhost -U sa -P R@@tr@@t1234 -Q "select * from information_schema.tables;" > /dev/null
-              status=$?
-              set -o errexit
-              if [ $status -eq 0 ]; then
-                break
-              fi
-              if [ $i -eq 30 ]; then
-                echo "Failed to wait for mssql"
-                exit 1
-              fi
-              sleep 1
-            done
+#     - run:
+#         name: Wait for MSSQL
+#         command: >
+#           for i in `seq 30`; do
+#             echo "Waiting for mssql"
+#             set +o errexit
+#             sqlcmd -H localhost -U sa -P R@@tr@@t1234 -Q "select * from information_schema.tables;" > /dev/null
+#             status=$?
+#             set -o errexit
+#             if [ $status -eq 0 ]; then
+#               break
+#             fi
+#             if [ $i -eq 30 ]; then
+#               echo "Failed to wait for mssql"
+#               exit 1
+#             fi
+#             sleep 1
+#           done
 
       - run:
           name: Make GOPATH
-          command: mkdir -p /go/src/github.com/vattle/sqlboiler
+          command: mkdir -p /go/src/github.com/volatiletech/sqlboiler
 
       - checkout:
-          path: /go/src/github.com/vattle/sqlboiler
+          path: /go/src/github.com/volatiletech/sqlboiler
 
       - run:
           name: Create PSQL DB
@@ -108,17 +108,17 @@ jobs:
           command: |
             mysql --host localhost --execute 'create database sqlboiler;'
             mysql --host localhost --database sqlboiler < $ROOTPATH/testdata/mysql_test_schema.sql
-      - run:
-          name: Create MSSQL DB
-          command: |
-            sqlcmd -S localhost -U sa -P R@@tr@@t1234 -Q "create database sqlboiler;"
-            sqlcmd -S localhost -U sa -P R@@tr@@t1234 -d sqlboiler -i $ROOTPATH/testdata/mssql_test_schema.sql
+#     - run:
+#         name: Create MSSQL DB
+#         command: |
+#           sqlcmd -S localhost -U sa -P R@@tr@@t1234 -Q "create database sqlboiler;"
+#           sqlcmd -S localhost -U sa -P R@@tr@@t1234 -d sqlboiler -i $ROOTPATH/testdata/mssql_test_schema.sql
 
       - run:
           name: Build SQLBoiler
           command: |
             cd $ROOTPATH; go get -v -t
-            cd $ROOTPATH; go build -v github.com/vattle/sqlboiler
+            cd $ROOTPATH; go build -v github.com/volatiletech/sqlboiler
 
       - run:
           name: 'Configure SQLBoiler: PSQL'
@@ -126,9 +126,9 @@ jobs:
       - run:
           name: 'Configure SQLBoiler: MySQL'
           command: echo -e '[mysql]\nhost="localhost"\nport=3306\nuser="root"\npass="mysqlpassword"\ndbname="sqlboiler"\nsslmode="false"\n' >> $ROOTPATH/sqlboiler.toml
-      - run:
-          name: 'Configure SQLBoiler: MSSQL'
-          command: echo -e '[mssql]\nhost="localhost"\nport=1433\nuser="sa"\npass="R@@tr@@t1234"\ndbname="sqlboiler"\nsslmode="disable"\n' >> $ROOTPATH/sqlboiler.toml
+#     - run:
+#         name: 'Configure SQLBoiler: MSSQL'
+#         command: echo -e '[mssql]\nhost="localhost"\nport=1433\nuser="sa"\npass="R@@tr@@t1234"\ndbname="sqlboiler"\nsslmode="disable"\n' >> $ROOTPATH/sqlboiler.toml
 
       - run:
           name: 'Generate: PSQL'
@@ -136,9 +136,9 @@ jobs:
       - run:
           name: 'Generate: MySQL'
           command: cd $ROOTPATH; ./sqlboiler -o mysql mysql
-      - run:
-          name: 'Generate: MSSQL'
-          command: cd $ROOTPATH; ./sqlboiler -o mssql mssql
+#     - run:
+#         name: 'Generate: MSSQL'
+#         command: cd $ROOTPATH; ./sqlboiler -o mssql mssql
 
       - run:
           name: Download generated and test deps
@@ -150,7 +150,7 @@ jobs:
           name: Run Tests
           command: |
             cd $ROOTPATH
-            cp ./testdata/mssql_test_schema.sql mssql/tables_schema.sql
+            #cp ./testdata/mssql_test_schema.sql mssql/tables_schema.sql
             go test -v -race ./... | tee test_out.txt
 
       - run:
@@ -161,48 +161,3 @@ jobs:
 
       - store_test_results:
           path: test_results
-#test:
-#  pre:
-#    - echo -e "[postgres]\nhost=\"localhost\"\nport=5432\nuser=\"ubuntu\"\ndbname=\"sqlboiler\"\n" > sqlboiler.toml
-#    - createdb -U ubuntu sqlboiler
-#    - psql -U ubuntu sqlboiler < ./testdata/postgres_test_schema.sql
-#
-#    - echo -e "[mysql]\nhost=\"localhost\"\nport=3306\nuser=\"ubuntu\"\ndbname=\"sqlboiler\"\nsslmode=\"false\"\n" >> sqlboiler.toml
-#    - echo "create database sqlboiler;" | mysql -u ubuntu
-#    - mysql -u ubuntu sqlboiler < ./testdata/mysql_test_schema.sql
-#
-#    - echo -e "[mssql]\nhost=\"localhost\"\nport=1433\nuser=\"sa\"\ndbname=\"sqlboiler\"\nsslmode=\"disable\"\n" >> sqlboiler.toml
-#    - docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=R@@tr@@t1234' -p 1433:1433 -d --name mssql microsoft/mssql-server-linux
-#    - sqlcmd -S localhost -U sa -P R@@tr@@t1234 -Q "create database sqlboiler;"
-#    - sqlcmd -S localhost -U sa -P R@@tr@@t1234 -d sqlboiler -i ./testdata/mssql_test_schema.sql
-#
-#    - ./sqlboiler -o postgres postgres
-#    - ./sqlboiler -o mysql    mysql
-#    - ./sqlboiler -o mssql    mssql
-#    - cp ./testdata/mssql_test_schema.sql mssql/tables_schema.sql
-#  override:
-#    - go test -v -race ./... > $CIRCLE_ARTIFACTS/gotest.txt
-#  post:
-#    - cat $CIRCLE_ARTIFACTS/gotest.txt | go-junit-report > $CIRCLE_TEST_REPORTS/junit.xml
-#
-#machine:
-#  environment:
-#    GODIST: go1.7.linux-amd64.tar.gz
-#    PATH: /home/ubuntu/.go_workspace/bin:/usr/local/go/bin:/home/ubuntu/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/mssql-tools/bin
-#  post:
-#    - mkdir -p download
-#    - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
-#    - sudo rm -rf /usr/local/go
-#    - sudo tar -C /usr/local -xzf download/$GODIST
-#
-#dependencies:
-#  pre:
-#    - mkdir -p /home/ubuntu/.go_workspace/src/github.com/jstemmer
-#    - go get -u github.com/jstemmer/go-junit-report
-#
-#    - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-#    - curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
-#    - sudo apt-get update; sudo apt-get install mssql-tools unixodbc-dev
-#    - docker pull microsoft/mssql-server-linux
-#  cache_directories:
-#    - ~/download

LICENSE

@@ -1,18 +1,18 @@
-Copyright (c) 2016 The SQLBoiler Authors. All rights reserved.
+Copyright (c) 2017 Volatile Technologies Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Vattle nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following disclaimer
+  in the documentation and/or other materials provided with the
+  distribution.
+* Neither the name of Vattle or Volatile Technologies Inc. nor the
+  names of its contributors may be used to endorse or promote products
+  derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

README.md

@@ -1,12 +1,12 @@
-![sqlboiler logo](http://i.imgur.com/NJtCT7y.png)
+![sqlboiler logo](http://i.imgur.com/ilkv0r9.png)
 
-[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/vattle/sqlboiler/blob/master/LICENSE)
-[![GoDoc](https://godoc.org/github.com/vattle/sqlboiler?status.svg)](https://godoc.org/github.com/vattle/sqlboiler)
+[![License](https://img.shields.io/badge/license-BSD-blue.svg)](https://github.com/volatiletech/sqlboiler/blob/master/LICENSE)
+[![GoDoc](https://godoc.org/github.com/volatiletech/sqlboiler?status.svg)](https://godoc.org/github.com/volatiletech/sqlboiler)
 [![Mail](https://img.shields.io/badge/mail%20list-sqlboiler-lightgrey.svg)](https://groups.google.com/a/volatile.tech/forum/#!forum/sqlboiler)
 [![Mail-Annc](https://img.shields.io/badge/mail%20list-sqlboiler--announce-lightgrey.svg)](https://groups.google.com/a/volatile.tech/forum/#!forum/sqlboiler-announce)
 [![Slack](https://img.shields.io/badge/slack-%23general-lightgrey.svg)](https://sqlboiler.from-the.cloud)
-[![CircleCI](https://circleci.com/gh/vattle/sqlboiler.svg?style=shield)](https://circleci.com/gh/vattle/sqlboiler)
-[![Go Report Card](https://goreportcard.com/badge/vattle/sqlboiler)](http://goreportcard.com/report/vattle/sqlboiler)
+[![CircleCI](https://circleci.com/gh/volatiletech/sqlboiler.svg?style=shield)](https://circleci.com/gh/volatiletech/sqlboiler)
+[![Go Report Card](https://goreportcard.com/badge/volatiletech/sqlboiler)](http://goreportcard.com/report/volatiletech/sqlboiler)
 
 SQLBoiler is a tool to generate a Go ORM tailored to your database schema.
 
@@ -76,6 +76,7 @@ Table of Contents
       * [Reload](#reload)
       * [Exists](#exists)
       * [Enums](#enums)
+      * [Constants](#constants)
     * [FAQ](#faq)
         * [Won't compiling models for a huge database be very slow?](#wont-compiling-models-for-a-huge-database-be-very-slow)
         * [Missing imports for generated package](#missing-imports-for-generated-package)
@@ -122,7 +123,7 @@ For a comprehensive list of available operations and examples please see [Featur
 ```go
 import (
   // Import this so we don't have to use qm.Limit etc.
-  . "github.com/vattle/sqlboiler/queries/qm"
+  . "github.com/volatiletech/sqlboiler/queries/qm"
 )
 
 // Open handle to database like normal
@@ -214,12 +215,12 @@ fmt.Println(len(users.R.FavoriteMovies))
 #### Download
 
 ```shell
-go get -u -t github.com/vattle/sqlboiler
+go get -u -t github.com/volatiletech/sqlboiler
 ```
 
 #### Configuration
 
-Create a configuration file. Because the project uses [viper](github.com/spf13/viper), TOML, JSON and YAML
+Create a configuration file. Because the project uses [viper](https://github.com/spf13/viper), TOML, JSON and YAML
 are all supported. Environment variables are also able to be used.
 We will assume TOML for the rest of the documentation.
 
@@ -295,7 +296,7 @@ generate models for, we can invoke the sqlboiler command line utility.
 
 ```text
 SQL Boiler generates a Go ORM from template files, tailored to your database schema.
-Complete documentation is available at http://github.com/vattle/sqlboiler
+Complete documentation is available at http://github.com/volatiletech/sqlboiler
 
 Usage:
   sqlboiler [flags] <driver>
@@ -625,7 +626,7 @@ when performing query building. Here is a list of all of your generated query mo
 
 ```go
 // Dot import so we can access query mods directly instead of prefixing with "qm."
-import . "github.com/vattle/sqlboiler/queries/qm"
+import . "github.com/volatiletech/sqlboiler/queries/qm"
 
 // Use a raw query against a generated struct (Pilot in this example)
 // If this query mod exists in your call, it will override the others.
@@ -736,7 +737,7 @@ in combination with your own custom, non-generated model.
 
 ### Binding
 
-For a comprehensive ruleset for `Bind()` you can refer to our [godoc](https://godoc.org/github.com/vattle/sqlboiler/queries#Bind).
+For a comprehensive ruleset for `Bind()` you can refer to our [godoc](https://godoc.org/github.com/volatiletech/sqlboiler/queries#Bind).
 
 The `Bind()` [Finisher](#finisher) allows the results of a query built with
 the [Raw SQL](#raw-query) method or the [Query Builder](#query-building) methods to be bound
@@ -956,15 +957,16 @@ it with the `AddModelHook` method. Here is an example of a before insert hook:
 
 ```go
 // Define my hook function
-func myHook(exec boil.Executor, p *Pilot) {
+func myHook(exec boil.Executor, p *Pilot) error {
   // Do stuff
+  return nil
 }
 
 // Register my before insert hook for pilots
 models.AddPilotHook(boil.BeforeInsertHook, myHook)
 ```
 
-Your `ModelHook` will always be defined as `func(boil.Executor, *Model)`
+Your `ModelHook` will always be defined as `func(boil.Executor, *Model) error`
 
 ### Transactions
 
@@ -989,7 +991,7 @@ tx.Rollback()
 ```
 
 It's also worth noting that there's a way to take advantage of `boil.SetDB()`
-by using the [boil.Begin()](https://godoc.org/github.com/vattle/sqlboiler/boil#Begin) function.
+by using the [boil.Begin()](https://godoc.org/github.com/volatiletech/sqlboiler/boil#Begin) function.
 This opens a transaction using the globally stored database.
 
 ### Debug Logging
@@ -1025,10 +1027,10 @@ Find is used to find a single row by primary key:
 
 ```go
 // Retrieve pilot with all columns filled
-pilot, err := models.PilotFind(db, 1)
+pilot, err := models.FindPilot(db, 1)
 
 // Retrieve a subset of column values
-jet, err := models.JetFind(db, 1, "name", "color")
+jet, err := models.FindJet(db, 1, "name", "color")
 ```
 
 ### Insert
@@ -1191,7 +1193,7 @@ exists, err := models.Pilots(db, Where("id=?", 5)).Exists()
 If your MySQL or Postgres tables use enums we will generate constants that hold their values
 that you can use in your queries. For example:
 
-```
+```sql
 CREATE TYPE workday AS ENUM('monday', 'tuesday', 'wednesday', 'thursday', 'friday');
 
 CREATE TABLE event_one (
@@ -1223,6 +1225,41 @@ still be able to use your generated library, and it will still work as expected,
 to get the tests to pass in this event is to either use a parsable enum value or use a regular column
 instead of an enum.
 
+### Constants
+
+The models package will also contain some structs that contain all of the table and column
+names harvested from the database at generation time.
+
+For table names they're generated under `models.TableNames`:
+
+```go
+// Generated code from models package
+var TableNames = struct {
+	Messages  string
+	Purchases string
+}{
+	Messages:  "messages",
+	Purchases: "purchases",
+}
+
+// Usage example:
+fmt.Println(models.TableNames.Messages)
+```
+
+```go
+// Generated code from models package
+var MessageColumns = struct {
+	ID         string
+	PurchaseID string
+}{
+	ID:         "id",
+	PurchaseID: "purchase_id",
+}
+
+// Usage example:
+fmt.Println(models.MessageColumns.ID)
+```
+
 ## FAQ
 
 #### Won't compiling models for a huge database be very slow?
@@ -1261,12 +1298,12 @@ You *must* use a DSN flag in MySQL connections, see: [Requirements](#requirement
 
 #### Where is the homepage?
 
-The homepage for the [SQLBoiler](https://github.com/vattle/sqlboiler) [Golang ORM](https://github.com/vattle/sqlboiler)
-generator is located at: https://github.com/vattle/sqlboiler
+The homepage for the [SQLBoiler](https://github.com/volatiletech/sqlboiler) [Golang ORM](https://github.com/volatiletech/sqlboiler)
+generator is located at: https://github.com/volatiletech/sqlboiler
 
 ## Benchmarks
 
-If you'd like to run the benchmarks yourself check out our [boilbench](https://github.com/vattle/boilbench) repo.
+If you'd like to run the benchmarks yourself check out our [boilbench](https://github.com/volatiletech/boilbench) repo.
 
 ```bash
 go test -bench . -benchmem

bdb/column.go

@@ -3,7 +3,7 @@ package bdb
 import (
 	"strings"
 
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // Column holds information about a database column.

bdb/drivers/mock.go

@@ -1,8 +1,8 @@
 package drivers
 
 import (
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // MockDriver is a mock implementation of the bdb driver Interface

bdb/drivers/mssql.go

@@ -8,7 +8,7 @@ import (
 
 	_ "github.com/denisenkom/go-mssqldb"
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb"
 )
 
 // MSSQLDriver holds the database connection string and a handle

bdb/drivers/mysql.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb"
 )
 
 // TinyintAsBool is a global that is set from main.go if a user specifies
@@ -306,7 +306,7 @@ func (m *MySQLDriver) TranslateColumnType(c bdb.Column) bdb.Column {
 			if unsigned {
 				c.Type = "null.Uint64"
 			} else {
-				c.Type = "null.Uint64"
+				c.Type = "null.Int64"
 			}
 		case "float":
 			c.Type = "null.Float32"

bdb/drivers/postgres.go

@@ -10,8 +10,8 @@ import (
 
 	_ "github.com/lib/pq"
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // PostgresDriver holds the database connection string and a handle

bdb/interface.go

@@ -1,7 +1,11 @@
 // Package bdb supplies the sql(b)oiler (d)ata(b)ase abstractions.
 package bdb
 
-import "github.com/pkg/errors"
+import (
+	"sort"
+
+	"github.com/pkg/errors"
+)
 
 // Interface for a database driver. Functionality required to support a specific
 // database type (eg, MySQL, Postgres etc.)
@@ -45,6 +49,8 @@ func Tables(db Interface, schema string, whitelist, blacklist []string) ([]Table
 		return nil, errors.Wrap(err, "unable to get table names")
 	}
 
+	sort.Strings(names)
+
 	var tables []Table
 	for _, name := range names {
 		t := Table{

bdb/interface_test.go

@@ -3,7 +3,7 @@ package bdb
 import (
 	"testing"
 
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 type testMockDriver struct{}
@@ -124,6 +124,14 @@ func TestTables(t *testing.T) {
 		t.Errorf("Expected len 7, got: %d\n", len(tables))
 	}
 
+	prev := ""
+	for i := range tables {
+		if prev >= tables[i].Name {
+			t.Error("tables are not sorted")
+		}
+		prev = tables[i].Name
+	}
+
 	pilots := GetTable(tables, "pilots")
 	if len(pilots.Columns) != 2 {
 		t.Error()

boil/db.go

@@ -19,6 +19,11 @@ type Transactor interface {
 
 // Beginner begins transactions.
 type Beginner interface {
+	Begin() (Transactor, error)
+}
+
+// SQLBeginner begins transactions (non-interface return type)
+type SQLBeginner interface {
 	Begin() (*sql.Tx, error)
 }
 
@@ -26,8 +31,12 @@ type Beginner interface {
 func Begin() (Transactor, error) {
 	creator, ok := currentDB.(Beginner)
 	if !ok {
+		creator2, ok2 := currentDB.(SQLBeginner)
+		if !ok2 {
 			panic("database does not support transactions")
 		}
+		return creator2.Begin()
+	}
 
 	return creator.Begin()
 }

boilingcore/boilingcore.go

@@ -13,10 +13,10 @@ import (
 	"text/template"
 
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/bdb/drivers"
-	"github.com/vattle/sqlboiler/queries"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb/drivers"
+	"github.com/volatiletech/sqlboiler/queries"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 const (
@@ -267,7 +267,7 @@ func (s *State) processReplacements() error {
 	return nil
 }
 
-var basePackage = "github.com/vattle/sqlboiler"
+var basePackage = "github.com/volatiletech/sqlboiler"
 
 func getBasePath(baseDirConfig string) (string, error) {
 	if len(baseDirConfig) > 0 {

boilingcore/imports.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/vattle/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb"
 )
 
 // imports defines the optional standard imports and
@@ -171,25 +171,25 @@ func newImporter() importer {
 		},
 		thirdParty: importList{
 			`"github.com/pkg/errors"`,
-			`"github.com/vattle/sqlboiler/boil"`,
-			`"github.com/vattle/sqlboiler/queries"`,
-			`"github.com/vattle/sqlboiler/queries/qm"`,
-			`"github.com/vattle/sqlboiler/strmangle"`,
+			`"github.com/volatiletech/sqlboiler/boil"`,
+			`"github.com/volatiletech/sqlboiler/queries"`,
+			`"github.com/volatiletech/sqlboiler/queries/qm"`,
+			`"github.com/volatiletech/sqlboiler/strmangle"`,
 		},
 	}
 
 	imp.Singleton = mapImports{
 		"boil_queries": {
 			thirdParty: importList{
-				`"github.com/vattle/sqlboiler/boil"`,
-				`"github.com/vattle/sqlboiler/queries"`,
-				`"github.com/vattle/sqlboiler/queries/qm"`,
+				`"github.com/volatiletech/sqlboiler/boil"`,
+				`"github.com/volatiletech/sqlboiler/queries"`,
+				`"github.com/volatiletech/sqlboiler/queries/qm"`,
 			},
 		},
 		"boil_types": {
 			thirdParty: importList{
 				`"github.com/pkg/errors"`,
-				`"github.com/vattle/sqlboiler/strmangle"`,
+				`"github.com/volatiletech/sqlboiler/strmangle"`,
 			},
 		},
 	}
@@ -201,9 +201,9 @@ func newImporter() importer {
 			`"testing"`,
 		},
 		thirdParty: importList{
-			`"github.com/vattle/sqlboiler/boil"`,
-			`"github.com/vattle/sqlboiler/randomize"`,
-			`"github.com/vattle/sqlboiler/strmangle"`,
+			`"github.com/volatiletech/sqlboiler/boil"`,
+			`"github.com/volatiletech/sqlboiler/randomize"`,
+			`"github.com/volatiletech/sqlboiler/strmangle"`,
 		},
 	}
 
@@ -223,7 +223,7 @@ func newImporter() importer {
 				`"github.com/kat-co/vala"`,
 				`"github.com/pkg/errors"`,
 				`"github.com/spf13/viper"`,
-				`"github.com/vattle/sqlboiler/boil"`,
+				`"github.com/volatiletech/sqlboiler/boil"`,
 			},
 		},
 		"boil_queries_test": {
@@ -236,7 +236,7 @@ func newImporter() importer {
 				`"regexp"`,
 			},
 			thirdParty: importList{
-				`"github.com/vattle/sqlboiler/boil"`,
+				`"github.com/volatiletech/sqlboiler/boil"`,
 			},
 		},
 		"boil_suites_test": {
@@ -261,8 +261,8 @@ func newImporter() importer {
 			thirdParty: importList{
 				`"github.com/pkg/errors"`,
 				`"github.com/spf13/viper"`,
-				`"github.com/vattle/sqlboiler/bdb/drivers"`,
-				`"github.com/vattle/sqlboiler/randomize"`,
+				`"github.com/volatiletech/sqlboiler/bdb/drivers"`,
+				`"github.com/volatiletech/sqlboiler/randomize"`,
 				`_ "github.com/lib/pq"`,
 			},
 		},
@@ -280,8 +280,8 @@ func newImporter() importer {
 			thirdParty: importList{
 				`"github.com/pkg/errors"`,
 				`"github.com/spf13/viper"`,
-				`"github.com/vattle/sqlboiler/bdb/drivers"`,
-				`"github.com/vattle/sqlboiler/randomize"`,
+				`"github.com/volatiletech/sqlboiler/bdb/drivers"`,
+				`"github.com/volatiletech/sqlboiler/randomize"`,
 				`_ "github.com/go-sql-driver/mysql"`,
 			},
 		},
@@ -297,8 +297,8 @@ func newImporter() importer {
 			thirdParty: importList{
 				`"github.com/pkg/errors"`,
 				`"github.com/spf13/viper"`,
-				`"github.com/vattle/sqlboiler/bdb/drivers"`,
-				`"github.com/vattle/sqlboiler/randomize"`,
+				`"github.com/volatiletech/sqlboiler/bdb/drivers"`,
+				`"github.com/volatiletech/sqlboiler/randomize"`,
 				`_ "github.com/denisenkom/go-mssqldb"`,
 			},
 		},
@@ -309,79 +309,79 @@ func newImporter() importer {
 	// TranslateColumnType to see the type assignments.
 	imp.BasedOnType = mapImports{
 		"null.Float32": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Float64": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Int": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Int8": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Int16": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Int32": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Int64": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Uint": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Uint8": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Uint16": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Uint32": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Uint64": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.String": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Bool": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Time": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.JSON": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"null.Bytes": {
-			thirdParty: importList{`"gopkg.in/nullbio/null.v6"`},
+			thirdParty: importList{`"gopkg.in/volatiletech/null.v6"`},
 		},
 		"time.Time": {
 			standard: importList{`"time"`},
 		},
 		"types.JSON": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.BytesArray": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.Int64Array": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.Float64Array": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.BoolArray": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.StringArray": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 		"types.Hstore": {
-			thirdParty: importList{`"github.com/vattle/sqlboiler/types"`},
+			thirdParty: importList{`"github.com/volatiletech/sqlboiler/types"`},
 		},
 	}
 

boilingcore/imports_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb"
 )
 
 func TestImportsSort(t *testing.T) {
@@ -234,7 +234,7 @@ func TestCombineTypeImports(t *testing.T) {
 			`"fmt"`,
 		},
 		thirdParty: importList{
-			`"github.com/vattle/sqlboiler/boil"`,
+			`"github.com/volatiletech/sqlboiler/boil"`,
 		},
 	}
 
@@ -245,8 +245,8 @@ func TestCombineTypeImports(t *testing.T) {
 			`"time"`,
 		},
 		thirdParty: importList{
-			`"github.com/vattle/sqlboiler/boil"`,
-			`"gopkg.in/nullbio/null.v6"`,
+			`"github.com/volatiletech/sqlboiler/boil"`,
+			`"gopkg.in/volatiletech/null.v6"`,
 		},
 	}
 
@@ -280,8 +280,8 @@ func TestCombineTypeImports(t *testing.T) {
 			`"time"`,
 		},
 		thirdParty: importList{
-			`"github.com/vattle/sqlboiler/boil"`,
-			`"gopkg.in/nullbio/null.v6"`,
+			`"github.com/volatiletech/sqlboiler/boil"`,
+			`"gopkg.in/volatiletech/null.v6"`,
 		},
 	}
 
@@ -297,11 +297,11 @@ func TestCombineImports(t *testing.T) {
 
 	a := imports{
 		standard:   importList{"fmt"},
-		thirdParty: importList{"github.com/vattle/sqlboiler", "gopkg.in/nullbio/null.v6"},
+		thirdParty: importList{"github.com/volatiletech/sqlboiler", "gopkg.in/volatiletech/null.v6"},
 	}
 	b := imports{
 		standard:   importList{"os"},
-		thirdParty: importList{"github.com/vattle/sqlboiler"},
+		thirdParty: importList{"github.com/volatiletech/sqlboiler"},
 	}
 
 	c := combineImports(a, b)
@@ -309,8 +309,8 @@ func TestCombineImports(t *testing.T) {
 	if c.standard[0] != "fmt" && c.standard[1] != "os" {
 		t.Errorf("Wanted: fmt, os got: %#v", c.standard)
 	}
-	if c.thirdParty[0] != "github.com/vattle/sqlboiler" && c.thirdParty[1] != "gopkg.in/nullbio/null.v6" {
-		t.Errorf("Wanted: github.com/vattle/sqlboiler, gopkg.in/nullbio/null.v6 got: %#v", c.thirdParty)
+	if c.thirdParty[0] != "github.com/volatiletech/sqlboiler" && c.thirdParty[1] != "gopkg.in/volatiletech/null.v6" {
+		t.Errorf("Wanted: github.com/volatiletech/sqlboiler, gopkg.in/volatiletech/null.v6 got: %#v", c.thirdParty)
 	}
 }
 

boilingcore/output.go

@@ -14,7 +14,7 @@ import (
 	"github.com/pkg/errors"
 )
 
-var noEditDisclaimer = []byte(`// This file is generated by SQLBoiler (https://github.com/vattle/sqlboiler)
+var noEditDisclaimer = []byte(`// This file is generated by SQLBoiler (https://github.com/volatiletech/sqlboiler)
 // and is meant to be re-generated in place and/or deleted at any time.
 // DO NOT EDIT
 

boilingcore/templates.go

@@ -9,9 +9,9 @@ import (
 	"text/template"
 
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/queries"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/queries"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // templateData for sqlboiler templates

boilingcore/text_helpers.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // TxtToOne contains text that will be used by templates for a one-to-many or

boilingcore/text_helpers_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/vattle/sqlboiler/bdb"
-	"github.com/vattle/sqlboiler/bdb/drivers"
+	"github.com/volatiletech/sqlboiler/bdb"
+	"github.com/volatiletech/sqlboiler/bdb/drivers"
 )
 
 func TestTxtsFromOne(t *testing.T) {

main.go

@@ -10,11 +10,11 @@ import (
 	"github.com/kat-co/vala"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/vattle/sqlboiler/bdb/drivers"
-	"github.com/vattle/sqlboiler/boilingcore"
+	"github.com/volatiletech/sqlboiler/bdb/drivers"
+	"github.com/volatiletech/sqlboiler/boilingcore"
 )
 
-const sqlBoilerVersion = "2.3.0"
+const sqlBoilerVersion = "2.5.1"
 
 var (
 	cmdState  *boilingcore.State
@@ -62,7 +62,7 @@ func main() {
 		Use:   "sqlboiler [flags] <driver>",
 		Short: "SQL Boiler generates an ORM tailored to your database schema.",
 		Long: "SQL Boiler generates a Go ORM from template files, tailored to your database schema.\n" +
-			`Complete documentation is available at http://github.com/vattle/sqlboiler`,
+			`Complete documentation is available at http://github.com/volatiletech/sqlboiler`,
 		Example:       `sqlboiler postgres`,
 		PreRunE:       preRun,
 		RunE:          run,

queries/eager_load.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/boil"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/boil"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 type loadRelationshipState struct {
@@ -206,9 +206,16 @@ func (l loadRelationshipState) loadRelationshipsRecurse(depth int, obj reflect.V
 	}
 
 	bkind := kindStruct
-	if reflect.Indirect(loadedObject).Kind() != reflect.Struct {
+	if derefed := reflect.Indirect(loadedObject); derefed.Kind() != reflect.Struct {
 		bkind = kindPtrSliceStruct
-		loadedObject = loadedObject.Addr()
+
+		// Convert away any helper slice types
+		// elemType is *elem (from []*elem or helperSliceType)
+		// sliceType is *[]*elem
+		elemType := derefed.Type().Elem()
+		sliceType := reflect.PtrTo(reflect.SliceOf(elemType))
+
+		loadedObject = loadedObject.Addr().Convert(sliceType)
 	}
 	return l.loadRelationships(depth+1, loadedObject.Interface(), bkind)
 }
@@ -241,6 +248,9 @@ func collectLoaded(key string, loadingFrom reflect.Value) (reflect.Value, bindKi
 	if loadedType.Elem().Kind() == reflect.Struct {
 		bkind = kindStruct
 		loadedType = reflect.SliceOf(loadedType)
+	} else {
+		// Ensure that we get rid of all the helper "XSlice" types
+		loadedType = reflect.SliceOf(loadedType.Elem())
 	}
 
 	collection := reflect.MakeSlice(loadedType, 0, 0)

queries/eager_load_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/vattle/sqlboiler/boil"
+	"github.com/volatiletech/sqlboiler/boil"
 )
 
 var testEagerCounters struct {

queries/helpers.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 // NonZeroDefaultSet returns the fields included in the

queries/helpers_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	null "gopkg.in/nullbio/null.v6"
+	null "gopkg.in/volatiletech/null.v6"
 )
 
 type testObj struct {

queries/qm/query_mods.go

@@ -1,6 +1,6 @@
 package qm
 
-import "github.com/vattle/sqlboiler/queries"
+import "github.com/volatiletech/sqlboiler/queries"
 
 // QueryMod to modify the query object
 type QueryMod func(q *queries.Query)

queries/query.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/vattle/sqlboiler/boil"
+	"github.com/volatiletech/sqlboiler/boil"
 )
 
 // joinKind is the type of join
@@ -188,6 +188,11 @@ func SetSelect(q *Query, sel []string) {
 	q.selectCols = sel
 }
 
+// GetSelect from the query
+func GetSelect(q *Query) []string {
+	return q.selectCols
+}
+
 // SetCount on the query.
 func SetCount(q *Query) {
 	q.count = true

queries/query_builders.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 var (

queries/reflect.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
-	"github.com/vattle/sqlboiler/boil"
-	"github.com/vattle/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/boil"
+	"github.com/volatiletech/sqlboiler/strmangle"
 )
 
 var (

randomize/randomize.go

@@ -14,12 +14,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	null "gopkg.in/nullbio/null.v6"
+	null "gopkg.in/volatiletech/null.v6"
 
 	"github.com/pkg/errors"
 	"github.com/satori/go.uuid"
-	"github.com/vattle/sqlboiler/strmangle"
-	"github.com/vattle/sqlboiler/types"
+	"github.com/volatiletech/sqlboiler/strmangle"
+	"github.com/volatiletech/sqlboiler/types"
 )
 
 var (
@@ -159,18 +159,17 @@ func randDate(s *Seed) time.Time {
 // If canBeNull is true:
 //  The value has the possibility of being null or non-zero at random.
 func randomizeField(s *Seed, field reflect.Value, fieldType string, canBeNull bool) error {
-
 	kind := field.Kind()
 	typ := field.Type()
 
 	if strings.HasPrefix(fieldType, "enum") {
-		enum, err := randEnumValue(fieldType)
+		enum, err := randEnumValue(s, fieldType)
 		if err != nil {
 			return err
 		}
 
 		if kind == reflect.Struct {
-			val := null.NewString(enum, rand.Intn(1) == 0)
+			val := null.NewString(enum, s.nextInt()%2 == 0)
 			field.Set(reflect.ValueOf(val))
 		} else {
 			field.Set(reflect.ValueOf(enum))
@@ -623,11 +622,11 @@ func getVariableRandValue(s *Seed, kind reflect.Kind, typ reflect.Type) interfac
 	return nil
 }
 
-func randEnumValue(enum string) (string, error) {
+func randEnumValue(s *Seed, enum string) (string, error) {
 	vals := strmangle.ParseEnumVals(enum)
 	if vals == nil || len(vals) == 0 {
 		return "", fmt.Errorf("unable to parse enum string: %s", enum)
 	}
 
-	return vals[rand.Intn(len(vals)-1)], nil
+	return vals[s.nextInt()%len(vals)], nil
 }

randomize/randomize_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	null "gopkg.in/nullbio/null.v6"
+	null "gopkg.in/volatiletech/null.v6"
 )
 
 func TestRandomizeStruct(t *testing.T) {
@@ -148,24 +148,36 @@ func TestRandomizeField(t *testing.T) {
 func TestRandEnumValue(t *testing.T) {
 	t.Parallel()
 
+	s := NewSeed()
+
 	enum1 := "enum.workday('monday','tuesday')"
 	enum2 := "enum('monday','tuesday')"
+	enum3 := "enum('monday')"
 
-	r1, err := randEnumValue(enum1)
+	r1, err := randEnumValue(s, enum1)
 	if err != nil {
 		t.Error(err)
 	}
 
 	if r1 != "monday" && r1 != "tuesday" {
-		t.Errorf("Expected monday or tueday, got: %q", r1)
+		t.Errorf("Expected monday or tuesday, got: %q", r1)
 	}
 
-	r2, err := randEnumValue(enum2)
+	r2, err := randEnumValue(s, enum2)
 	if err != nil {
 		t.Error(err)
 	}
 
 	if r2 != "monday" && r2 != "tuesday" {
-		t.Errorf("Expected monday or tueday, got: %q", r2)
+		t.Errorf("Expected monday or tuesday, got: %q", r2)
+	}
+
+	r3, err := randEnumValue(s, enum3)
+	if err != nil {
+		t.Error(err)
+	}
+
+	if r3 != "monday" {
+		t.Errorf("Expected monday got: %q", r3)
 	}
 }

strmangle/inflect.go

@@ -1,6 +1,6 @@
 package strmangle
 
-import "github.com/nullbio/inflect"
+import "github.com/volatiletech/inflect"
 
 var boilRuleset *inflect.Ruleset
 
@@ -193,6 +193,7 @@ func newBoilRuleset() *inflect.Ruleset {
 	rs.AddSingularExact("is", "is", true)
 	rs.AddSingularExact("us", "us", true)
 	rs.AddSingularExact("as", "as", true)
+	rs.AddSingularExact("areas", "area", true)
 	rs.AddPluralExact("a", "a", true)
 	rs.AddPluralExact("i", "i", true)
 	rs.AddPluralExact("is", "is", true)

strmangle/strmangle.go

@@ -93,7 +93,7 @@ func SchemaTable(lq, rq string, driver string, schema string, table string) stri
 	return fmt.Sprintf(`%s%s%s`, lq, table, rq)
 }
 
-// IdentQuote attempts to quote simple identifiers in SQL tatements
+// IdentQuote attempts to quote simple identifiers in SQL statements
 func IdentQuote(lq byte, rq byte, s string) string {
 	if strings.ToLower(s) == "null" || s == "?" {
 		return s

strmangle/strmangle_test.go

@@ -139,6 +139,7 @@ func TestSingular(t *testing.T) {
 		{"hello_people", "hello_person"},
 		{"hello_person", "hello_person"},
 		{"friends", "friend"},
+		{"areas", "area"},
 		{"hello_there_people", "hello_there_person"},
 	}
 
@@ -159,6 +160,7 @@ func TestPlural(t *testing.T) {
 		{"hello_person", "hello_people"},
 		{"friend", "friends"},
 		{"friends", "friends"},
+		{"area", "areas"},
 		{"hello_there_person", "hello_there_people"},
 	}
 

templates/00_struct.tpl

@@ -17,6 +17,16 @@ type {{$modelName}} struct {
 	{{end -}}
 }
 
+var {{$modelName}}Columns = struct {
+	{{range $column := .Table.Columns -}}
+	{{titleCase $column.Name}} string
+	{{end -}}
+}{
+	{{range $column := .Table.Columns -}}
+	{{titleCase $column.Name}}: "{{$column.Name}}",
+	{{end -}}
+}
+
 {{- if .Table.IsJoinTable -}}
 {{- else}}
 // {{$modelNameCamel}}R is where relationships are stored.

templates/06_relationship_to_many.tpl

@@ -15,27 +15,30 @@ func (o *{{$txt.LocalTable.NameGo}}) {{$txt.Function.Name}}G(mods ...qm.QueryMod
 // {{$txt.Function.Name}} retrieves all the {{.ForeignTable | singular}}'s {{$txt.ForeignTable.NameHumanReadable}} with an executor
 {{- if not (eq $txt.Function.Name $txt.ForeignTable.NamePluralGo)}} via {{.ForeignColumn}} column{{- end}}.
 func (o *{{$txt.LocalTable.NameGo}}) {{$txt.Function.Name}}(exec boil.Executor, mods ...qm.QueryMod) {{$varNameSingular}}Query {
-	queryMods := []qm.QueryMod{
-		qm.Select("{{id 0 | $dot.Quotes}}.*"),
-	}
-
+	var queryMods []qm.QueryMod
 	if len(mods) != 0 {
 		queryMods = append(queryMods, mods...)
 	}
 
 		{{if .ToJoinTable -}}
 	queryMods = append(queryMods,
-		qm.InnerJoin("{{.JoinTable | $dot.SchemaTable}} as {{id 1 | $dot.Quotes}} on {{id 0 | $dot.Quotes}}.{{.ForeignColumn | $dot.Quotes}} = {{id 1 | $dot.Quotes}}.{{.JoinForeignColumn | $dot.Quotes}}"),
-		qm.Where("{{id 1 | $dot.Quotes}}.{{.JoinLocalColumn | $dot.Quotes}}=?", o.{{$txt.LocalTable.ColumnNameGo}}),
+		{{$schemaJoinTable := .JoinTable | $.SchemaTable -}}
+		qm.InnerJoin("{{$schemaJoinTable}} on {{$schemaForeignTable}}.{{.ForeignColumn | $dot.Quotes}} = {{$schemaJoinTable}}.{{.JoinForeignColumn | $dot.Quotes}}"),
+		qm.Where("{{$schemaJoinTable}}.{{.JoinLocalColumn | $dot.Quotes}}=?", o.{{$txt.LocalTable.ColumnNameGo}}),
 	)
 		{{else -}}
 	queryMods = append(queryMods,
-		qm.Where("{{id 0 | $dot.Quotes}}.{{.ForeignColumn | $dot.Quotes}}=?", o.{{$txt.LocalTable.ColumnNameGo}}),
+		qm.Where("{{$schemaForeignTable}}.{{.ForeignColumn | $dot.Quotes}}=?", o.{{$txt.LocalTable.ColumnNameGo}}),
 	)
 		{{end}}
 
 	query := {{$txt.ForeignTable.NamePluralGo}}(exec, queryMods...)
-	queries.SetFrom(query.Query, "{{$schemaForeignTable}} as {{id 0 | $dot.Quotes}}")
+	queries.SetFrom(query.Query, "{{$schemaForeignTable}}")
+
+	if len(queries.GetSelect(query.Query)) == 0 {
+		queries.SetSelect(query.Query, []string{"{{$schemaForeignTable}}.*"})
+	}
+
 	return query
 }
 

templates/singleton/boil_table_names.tpl

@@ -0,0 +1,9 @@
+var TableNames = struct {
+	{{range $table := .Tables -}}
+	{{titleCase $table.Name}} string
+	{{end -}}
+}{
+	{{range $table := .Tables -}}
+	{{titleCase $table.Name}}: "{{$table.Name}}",
+	{{end -}}
+}

templates_test/relationship_to_one.tpl

@@ -13,10 +13,10 @@ func test{{$txt.LocalTable.NameGo}}ToOne{{$txt.ForeignTable.NameGo}}Using{{$txt.
 	var foreign {{$txt.ForeignTable.NameGo}}
 
 	seed := randomize.NewSeed()
-	if err := randomize.Struct(seed, &local, {{$varNameSingular}}DBTypes, true, {{$varNameSingular}}ColumnsWithDefault...); err != nil {
+	if err := randomize.Struct(seed, &local, {{$varNameSingular}}DBTypes, {{if .Nullable}}true{{else}}false{{end}}, {{$varNameSingular}}ColumnsWithDefault...); err != nil {
 		t.Errorf("Unable to randomize {{$txt.LocalTable.NameGo}} struct: %s", err)
 	}
-	if err := randomize.Struct(seed, &foreign, {{$foreignVarNameSingular}}DBTypes, true, {{$foreignVarNameSingular}}ColumnsWithDefault...); err != nil {
+	if err := randomize.Struct(seed, &foreign, {{$foreignVarNameSingular}}DBTypes, {{if .ForeignColumnNullable}}true{{else}}false{{end}}, {{$foreignVarNameSingular}}ColumnsWithDefault...); err != nil {
 		t.Errorf("Unable to randomize {{$txt.ForeignTable.NameGo}} struct: %s", err)
 	}