AllColumns

volatiletech · May 11, 2019 · 7347ee3 · 7347ee3
1 parent 9c0be2c
commit 7347ee3
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 40 deletions.
diff --git a/drivers/sqlboiler-mssql/driver/bindata.go b/drivers/sqlboiler-mssql/driver/bindata.go
diff --git a/drivers/sqlboiler-mssql/driver/override/templates/17_upsert.go.tpl b/drivers/sqlboiler-mssql/driver/override/templates/17_upsert.go.tpl
@@ -71,7 +71,7 @@ func (o *{{$alias.UpSingular}}) Upsert({{if .NoContext}}exec boil.Executor{{else
 
 	if !cached {
 		insert, ret := insertColumns.InsertColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}ColumnsWithDefault,
 			{{$alias.DownSingular}}ColumnsWithoutDefault,
 			nzDefaults,
@@ -90,7 +90,7 @@ func (o *{{$alias.UpSingular}}) Upsert({{if .NoContext}}exec boil.Executor{{else
 		ret = strmangle.SetMerge(ret, {{$alias.DownSingular}}ColumnsWithDefault)
 
 		update := updateColumns.UpdateColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}PrimaryKeyColumns,
 		)
 		update = strmangle.SetComplement(update, {{$alias.DownSingular}}ColumnsWithAuto)

diff --git a/drivers/sqlboiler-mssql/driver/override/templates_test/upsert.go.tpl b/drivers/sqlboiler-mssql/driver/override/templates_test/upsert.go.tpl
@@ -2,7 +2,7 @@
 func test{{$alias.UpPlural}}Upsert(t *testing.T) {
 	t.Parallel()
 
-	if len({{$alias.DownSingular}}ColumnsAll) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
+	if len({{$alias.DownSingular}}AllColumns) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with only primary key columns")
 	}
 

diff --git a/drivers/sqlboiler-mysql/driver/bindata.go b/drivers/sqlboiler-mysql/driver/bindata.go
diff --git a/drivers/sqlboiler-mysql/driver/override/templates/17_upsert.go.tpl b/drivers/sqlboiler-mysql/driver/override/templates/17_upsert.go.tpl
@@ -89,13 +89,13 @@ func (o *{{$alias.UpSingular}}) Upsert({{if .NoContext}}exec boil.Executor{{else
 
 	if !cached {
 		insert, ret := insertColumns.InsertColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}ColumnsWithDefault,
 			{{$alias.DownSingular}}ColumnsWithoutDefault,
 			nzDefaults,
 		)
 		update := updateColumns.UpdateColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}PrimaryKeyColumns,
 		)
 

diff --git a/drivers/sqlboiler-mysql/driver/override/templates_test/upsert.go.tpl b/drivers/sqlboiler-mysql/driver/override/templates_test/upsert.go.tpl
@@ -2,7 +2,7 @@
 func test{{$alias.UpPlural}}Upsert(t *testing.T) {
 	t.Parallel()
 
-	if len({{$alias.DownSingular}}ColumnsAll) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
+	if len({{$alias.DownSingular}}AllColumns) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with only primary key columns")
 	}
 	if len(mySQL{{$alias.UpSingular}}UniqueColumns) == 0 {

diff --git a/drivers/sqlboiler-psql/driver/bindata.go b/drivers/sqlboiler-psql/driver/bindata.go
diff --git a/drivers/sqlboiler-psql/driver/override/templates/17_upsert.go.tpl b/drivers/sqlboiler-psql/driver/override/templates/17_upsert.go.tpl
@@ -82,13 +82,13 @@ func (o *{{$alias.UpSingular}}) Upsert({{if .NoContext}}exec boil.Executor{{else
 
 	if !cached {
 		insert, ret := insertColumns.InsertColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}ColumnsWithDefault,
 			{{$alias.DownSingular}}ColumnsWithoutDefault,
 			nzDefaults,
 		)
 		update := updateColumns.UpdateColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}PrimaryKeyColumns,
 		)
 

diff --git a/drivers/sqlboiler-psql/driver/override/templates_test/upsert.go.tpl b/drivers/sqlboiler-psql/driver/override/templates_test/upsert.go.tpl
@@ -2,7 +2,7 @@
 func test{{$alias.UpPlural}}Upsert(t *testing.T) {
 	t.Parallel()
 
-	if len({{$alias.DownSingular}}ColumnsAll) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
+	if len({{$alias.DownSingular}}AllColumns) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with only primary key columns")
 	}
 

diff --git a/templatebin/bindata.go b/templatebin/bindata.go
diff --git a/templates/00_struct.go.tpl b/templates/00_struct.go.tpl
@@ -19,7 +19,7 @@ type {{$alias.UpSingular}} struct {
 	{{end -}}
 }
 
-var {{$alias.UpSingular}}ColumnsAll = struct {
+var {{$alias.UpSingular}}AllColumns = struct {
 	{{range $column := .Table.Columns -}}
 	{{- $colAlias := $alias.Column $column.Name -}}
 	{{$colAlias}} string

diff --git a/templates/01_types.go.tpl b/templates/01_types.go.tpl
@@ -2,7 +2,7 @@
 {{else -}}
 {{- $alias := .Aliases.Table .Table.Name -}}
 var (
-	{{$alias.DownSingular}}ColumnsAll               = []string{{"{"}}{{.Table.Columns | columnNames | stringMap .StringFuncs.quoteWrap | join ", "}}{{"}"}}
+	{{$alias.DownSingular}}AllColumns               = []string{{"{"}}{{.Table.Columns | columnNames | stringMap .StringFuncs.quoteWrap | join ", "}}{{"}"}}
 	{{if .Dialect.UseAutoColumns -}}
 	{{$alias.DownSingular}}ColumnsWithAuto = []string{{"{"}}{{.Table.Columns | filterColumnsByAuto true | columnNames | stringMap .StringFuncs.quoteWrap | join ","}}{{"}"}}
 	{{end -}}

diff --git a/templates/15_insert.go.tpl b/templates/15_insert.go.tpl
@@ -55,7 +55,7 @@ func (o *{{$alias.UpSingular}}) Insert({{if .NoContext}}exec boil.Executor{{else
 
 	if !cached {
 		wl, returnColumns := columns.InsertColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}ColumnsWithDefault,
 			{{$alias.DownSingular}}ColumnsWithoutDefault,
 			nzDefaults,

diff --git a/templates/16_update.go.tpl b/templates/16_update.go.tpl
@@ -61,7 +61,7 @@ func (o *{{$alias.UpSingular}}) Update({{if .NoContext}}exec boil.Executor{{else
 
 	if !cached {
 		wl := columns.UpdateColumnSet(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}PrimaryKeyColumns,
 		)
 		{{if .Dialect.UseAutoColumns -}}

diff --git a/templates_test/update.go.tpl b/templates_test/update.go.tpl
@@ -5,7 +5,7 @@ func test{{$alias.UpPlural}}Update(t *testing.T) {
 	if 0 == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with no primary key columns")
 	}
-	if len({{$alias.DownSingular}}ColumnsAll) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
+	if len({{$alias.DownSingular}}AllColumns) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with only primary key columns")
 	}
 
@@ -52,7 +52,7 @@ func test{{$alias.UpPlural}}Update(t *testing.T) {
 func test{{$alias.UpPlural}}SliceUpdateAll(t *testing.T) {
 	t.Parallel()
 
-	if len({{$alias.DownSingular}}ColumnsAll) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
+	if len({{$alias.DownSingular}}AllColumns) == len({{$alias.DownSingular}}PrimaryKeyColumns) {
 		t.Skip("Skipping table with only primary key columns")
 	}
 
@@ -85,11 +85,11 @@ func test{{$alias.UpPlural}}SliceUpdateAll(t *testing.T) {
 
 	// Remove Primary keys and unique columns from what we plan to update
 	var fields []string
-	if strmangle.StringSliceMatch({{$alias.DownSingular}}ColumnsAll, {{$alias.DownSingular}}PrimaryKeyColumns) {
-		fields = {{$alias.DownSingular}}ColumnsAll
+	if strmangle.StringSliceMatch({{$alias.DownSingular}}AllColumns, {{$alias.DownSingular}}PrimaryKeyColumns) {
+		fields = {{$alias.DownSingular}}AllColumns
 	} else {
 		fields = strmangle.SetComplement(
-			{{$alias.DownSingular}}ColumnsAll,
+			{{$alias.DownSingular}}AllColumns,
 			{{$alias.DownSingular}}PrimaryKeyColumns,
 		)
 		{{- if .Dialect.UseAutoColumns }}