Merge branch 'measurabledatatoken/master' into dev

- Fix whitespace issues all over
- Re-generate all bindata
- Drop the bump to the version number

Author: aarondl

CONTRIBUTING.md

@@ -50,24 +50,38 @@ with the Github code review tools. Then it will be merged into dev, and later go
    ```
 
 1. Write your changes
-1. If you changed template files, run the following command
+1. If you changed template files, run the following command to re-generate the binddata.
 
    ```
    ./boil.sh go-generate all
    ```
 
-1. Generate your models
+1. Generate executable. Run again if you have changed anything in core code or driver code.
+   ```
+   ./boil.sh build all
+   ```
+
+1. Also Move sqlboiler-[driver] built to the bin of gopath if you have changed the driver code.
+
+1. Generate your models from existing tables
 
    ```
    ./boil.sh gen [driver]
    ```
 
+1. You may need to install following package before able to run the tests.
+
+   ```
+   go get -u github.com/volatiletech/null
+   ```
+
 1. Test the output
 
    ```
    ./boil.sh test
    ```
 
+
 # Bugs
 
 Issues should be filed on Github, simply use the template provided and fill in detail. If there's

boil.sh

@@ -17,16 +17,32 @@ build() {
 
     buildPath=github.com/volatiletech/sqlboiler
     case "${driver}" in
-        all)   drivers="psql mysql mssql"; shift ;;
-        psql)  drivers="psql"; shift ;;
-        mysql) drivers="mysql"; shift ;;
-        mssql) drivers="mssql"; shift ;;
-        *) set -o xtrace; go build "$@" "${buildPath}"; set +o xtrace; return ;;
+        all)
+            set -o xtrace
+            go build "${buildPath}"
+            { set +o xtrace; } 2>/dev/null
+            drivers="psql mysql mssql"
+            shift ;;
+        psql)
+            drivers="psql"
+            shift ;;
+        mysql)
+            drivers="mysql"
+            shift ;;
+        mssql)
+            drivers="mssql"
+            shift ;;
+        *)
+            set -o xtrace
+            go build "$@" "${buildPath}"
+            { set +o xtrace; } 2>/dev/null
+            return ;;
     esac
 
     for d in $drivers; do
         set -o xtrace
         go build "$@" ${buildPath}/drivers/sqlboiler-"${d}"
+        { set +o xtrace; } 2>/dev/null
     done
 }
 
@@ -65,8 +81,8 @@ test_user() {
             ;;
         mysql)
             set -o xtrace
-            mysql --host localhost --execute "create user ${DB_USER} identified by '${DB_PASS}';" 
-            mysql --host localhost --execute "grant all privileges on *.* to ${DB_USER};" 
+            mysql --host localhost --execute "create user ${DB_USER} identified by '${DB_PASS}';"
+            mysql --host localhost --execute "grant all privileges on *.* to ${DB_USER};"
             ;;
         mssql)
             set -o xtrace
@@ -150,8 +166,8 @@ driver_test_user() {
             ;;
         mysql)
             set -o xtrace
-            mysql --host localhost --execute "create user ${DRIVER_USER} identified by '${DB_PASS}';" 
-            mysql --host localhost --execute "grant all privileges on ${DRIVER_DB}.* to ${DRIVER_USER};" 
+            mysql --host localhost --execute "create user ${DRIVER_USER} identified by '${DB_PASS}';"
+            mysql --host localhost --execute "grant all privileges on ${DRIVER_DB}.* to ${DRIVER_USER};"
             ;;
         mssql)
             set -o xtrace

drivers/sqlboiler-mssql/driver/bindata.go

@@ -9,6 +9,7 @@ type mssqlTester struct {
 	sslmode    string
 	port       int
 	testDBName string
+	skipSQLCmd bool
 }
 
 func init() {
@@ -28,6 +29,8 @@ func (m *mssqlTester) setup() error {
 	m.pass = viper.GetString("mssql.pass")
 	m.port = viper.GetInt("mssql.port")
 	m.sslmode = viper.GetString("mssql.sslmode")
+	m.testDBName = viper.GetString("mssql.testdbname")
+	m.skipSQLCmd = viper.GetBool("mssql.skipSQLCmd")
 
 	err = vala.BeginValidation().Validate(
 		vala.StringNotEmpty(viper.GetString("mssql.user"), "mssql.user"),
@@ -42,36 +45,40 @@ func (m *mssqlTester) setup() error {
 	}
 
 	// Create a randomized db name.
-	m.testDBName = randomize.StableDBName(m.dbName)
-
-	if err = m.dropTestDB(); err != nil {
-		return err
-	}
-	if err = m.createTestDB(); err != nil {
-		return err
+	if len(p.testDBName) == 0 {
+		p.testDBName = randomize.StableDBName(p.dbName)
 	}
 
-	createCmd := exec.Command("sqlcmd", "-S", m.host, "-U", m.user, "-P", m.pass, "-d", m.testDBName)
+	if !m.skipSQLCmd {
+		if err = m.dropTestDB(); err != nil {
+			return err
+		}
+		if err = m.createTestDB(); err != nil {
+			return err
+		}
 
-	f, err := os.Open("tables_schema.sql")
-	if err != nil {
-		return errors.Wrap(err, "failed to open tables_schema.sql file")
-	}
+		createCmd := exec.Command("sqlcmd", "-S", m.host, "-U", m.user, "-P", m.pass, "-d", m.testDBName)
 
-	defer func() { _ = f.Close() }()
+		f, err := os.Open("tables_schema.sql")
+		if err != nil {
+			return errors.Wrap(err, "failed to open tables_schema.sql file")
+		}
 
-    stderr := &bytes.Buffer{}
-	createCmd.Stdin = newFKeyDestroyer(rgxMSSQLkey, f)
-    createCmd.Stderr = stderr
+		defer func() { _ = f.Close() }()
 
-	if err = createCmd.Start(); err != nil {
-		return errors.Wrap(err, "failed to start sqlcmd command")
-	}
+		stderr := &bytes.Buffer{}
+		createCmd.Stdin = newFKeyDestroyer(rgxMSSQLkey, f)
+		createCmd.Stderr = stderr
 
-	if err = createCmd.Wait(); err != nil {
-		fmt.Println(err)
-		fmt.Println(stderr.String())
-		return errors.Wrap(err, "failed to wait for sqlcmd command")
+		if err = createCmd.Start(); err != nil {
+			return errors.Wrap(err, "failed to start sqlcmd command")
+		}
+
+		if err = createCmd.Wait(); err != nil {
+			fmt.Println(err)
+			fmt.Println(stderr.String())
+			return errors.Wrap(err, "failed to wait for sqlcmd command")
+		}
 	}
 
 	return nil
@@ -114,8 +121,10 @@ func (m *mssqlTester) teardown() error {
 		m.dbConn.Close()
 	}
 
-	if err := m.dropTestDB(); err != nil {
-		return err
+	if !m.skipSQLCmd {
+		if err := m.dropTestDB(); err != nil {
+			return err
+		}
 	}
 
 	return nil