Merge pull request #451 from sirmackan/master

go-jet · web-flow · commit 262d866a4ad6 · 2025-02-17T20:10:07.000+01:00
DefaultColumns() helper on Table
diff --git a/generator/metadata/table_meta_data.go b/generator/metadata/table_meta_data.go
@@ -21,3 +21,16 @@ func (t Table) MutableColumns() []Column {
 
 	return ret
 }
+
+// DefaultColumns returns list of columns with default values set for table
+func (t Table) DefaultColumns() []Column {
+	var ret []Column
+
+	for _, column := range t.Columns {
+		if column.HasDefault {
+			ret = append(ret, column)
+		}
+	}
+
+	return ret
+}
diff --git a/generator/mysql/query_set.go b/generator/mysql/query_set.go
@@ -18,7 +18,7 @@ func (m mySqlQuerySet) GetTablesMetaData(db *sql.DB, schemaName string, tableTyp
 SELECT
 		t.table_name as "table.name",
 		col.COLUMN_NAME AS "column.Name",
-		col.COLUMN_DEFAULT IS NOT NULL as "column.HasDefault",
+		col.COLUMN_DEFAULT IS NOT NULL AND t.table_type != 'VIEW' as "column.HasDefault",
 		col.IS_NULLABLE = "YES" AS "column.IsNullable",
 		col.COLUMN_COMMENT AS "column.Comment",
 		COALESCE(pk.IsPrimaryKey, 0) AS "column.IsPrimaryKey",
diff --git a/generator/template/file_templates.go b/generator/template/file_templates.go
diff --git a/generator/template/sql_builder_template.go b/generator/template/sql_builder_template.go
@@ -136,7 +136,7 @@ type TableSQLBuilderColumn struct {
 	Type string
 }
 
-var reservedKeywords = []string{"TableName", "Table", "SchemaName", "Alias", "AllColumns", "MutableColumns"}
+var reservedKeywords = []string{"TableName", "Table", "SchemaName", "Alias", "AllColumns", "MutableColumns", "DefaultColumns"}
 
 func renameIfReserved(name string) string {
 	if slices.Contains(reservedKeywords, name) {
diff --git a/generator/template/sql_builder_template_test.go b/generator/template/sql_builder_template_test.go
@@ -22,6 +22,7 @@ func TestColumnRenameReserved(t *testing.T) {
 		{col: "Alias", want: "Alias_"},
 		{col: "AllColumns", want: "AllColumns_"},
 		{col: "MutableColumns", want: "MutableColumns_"},
+		{col: "DefaultColumns", want: "DefaultColumns_"},
 		{col: "OtherColumn", want: "OtherColumn"},
 	}
 
diff --git a/tests/Makefile b/tests/Makefile
@@ -14,7 +14,7 @@ checkout-latest-testdata: checkout-testdata
 # database with testdata retrieved in previous step.
 # On the first run this action might take couple of minutes. Docker temp data are stored in .docker directory.
 docker-compose-up:
-	docker-compose up
+	docker compose up
 
 init-all:
 	go run ./init/init.go -testsuite all
@@ -74,4 +74,4 @@ jet-gen-cockroach:
 
 # docker-compose-cleanup will stop and remove test containers, volumes, and images.
 cleanup:
-	docker-compose down --volumes
+	docker compose down --volumes
diff --git a/tests/mysql/generator_test.go b/tests/mysql/generator_test.go
@@ -260,6 +260,7 @@ type linkTable struct {
 
 	AllColumns     mysql.ColumnList
 	MutableColumns mysql.ColumnList
+	DefaultColumns mysql.ColumnList
 }
 
 type LinkTable struct {
@@ -303,6 +304,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {
 		DescriptionColumn = mysql.StringColumn("description")
 		allColumns        = mysql.ColumnList{IDColumn, URLColumn, NameColumn, DescriptionColumn}
 		mutableColumns    = mysql.ColumnList{URLColumn, NameColumn, DescriptionColumn}
+		defaultColumns    = mysql.ColumnList{DescriptionColumn}
 	)
 
 	return linkTable{
@@ -316,6 +318,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `)
@@ -375,6 +378,7 @@ type actorTable struct {
 
 	AllColumns     mysql.ColumnList
 	MutableColumns mysql.ColumnList
+	DefaultColumns mysql.ColumnList
 }
 
 type ActorTable struct {
@@ -418,6 +422,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 		LastUpdateColumn = mysql.TimestampColumn("last_update")
 		allColumns       = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}
 		mutableColumns   = mysql.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}
+		defaultColumns   = mysql.ColumnList{LastUpdateColumn}
 	)
 
 	return actorTable{
@@ -431,6 +436,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -516,6 +522,7 @@ type actorInfoTable struct {
 
 	AllColumns     mysql.ColumnList
 	MutableColumns mysql.ColumnList
+	DefaultColumns mysql.ColumnList
 }
 
 type ActorInfoTable struct {
@@ -559,6 +566,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {
 		FilmInfoColumn  = mysql.StringColumn("film_info")
 		allColumns      = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}
 		mutableColumns  = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}
+		defaultColumns  = mysql.ColumnList{}
 	)
 
 	return actorInfoTable{
@@ -572,6 +580,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go
@@ -520,6 +520,7 @@ type actorTable struct {
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
+	DefaultColumns postgres.ColumnList
 }
 
 type ActorTable struct {
@@ -563,6 +564,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 		LastUpdateColumn = postgres.TimestampColumn("last_update")
 		allColumns       = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}
 		mutableColumns   = postgres.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}
+		defaultColumns   = postgres.ColumnList{ActorIDColumn}
 	)
 
 	return actorTable{
@@ -576,6 +578,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -660,6 +663,7 @@ type actorInfoTable struct {
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
+	DefaultColumns postgres.ColumnList
 }
 
 type ActorInfoTable struct {
@@ -703,6 +707,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {
 		FilmInfoColumn  = postgres.StringColumn("film_info")
 		allColumns      = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}
 		mutableColumns  = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}
+		defaultColumns  = postgres.ColumnList{}
 	)
 
 	return actorInfoTable{
@@ -716,6 +721,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -1011,6 +1017,7 @@ type allTypesTable struct {
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
+	DefaultColumns postgres.ColumnList
 }
 
 type AllTypesTable struct {
@@ -1113,6 +1120,7 @@ func newAllTypesTableImpl(schemaName, tableName, alias string) allTypesTable {
 		MoodColumn                 = postgres.StringColumn("mood")
 		allColumns                 = postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn, MoodPtrColumn, MoodColumn}
 		mutableColumns             = postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn, MoodPtrColumn, MoodColumn}
+		defaultColumns             = postgres.ColumnList{SmallIntColumn, IntegerColumn, BigIntColumn, DecimalColumn, NumericColumn, RealColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharColumn, CharColumn, TextColumn, ByteaColumn, TimestampzColumn, TimestampColumn, DateColumn, TimezColumn, TimeColumn, IntervalColumn, BooleanColumn, BitColumn, BitVaryingColumn, TsvectorColumn, UUIDColumn, XMLColumn, JSONColumn, JsonbColumn, IntegerArrayColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayColumn, MoodColumn}
 	)
 
 	return allTypesTable{
@@ -1185,6 +1193,7 @@ func newAllTypesTableImpl(schemaName, tableName, alias string) allTypesTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -1218,6 +1227,7 @@ type sampleRangesTable struct {
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
+	DefaultColumns postgres.ColumnList
 }
 
 type SampleRangesTable struct {
@@ -1263,6 +1273,7 @@ func newSampleRangesTableImpl(schemaName, tableName, alias string) sampleRangesT
 		NumRangeColumn        = postgres.NumericRangeColumn("num_range")
 		allColumns            = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}
 		mutableColumns        = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}
+		defaultColumns        = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}
 	)
 
 	return sampleRangesTable{
@@ -1278,6 +1289,7 @@ func newSampleRangesTableImpl(schemaName, tableName, alias string) sampleRangesT
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -1310,6 +1322,7 @@ type linkTable struct {
 
 	AllColumns     postgres.ColumnList
 	MutableColumns postgres.ColumnList
+	DefaultColumns postgres.ColumnList
 }
 
 type LinkTable struct {
@@ -1353,6 +1366,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {
 		DescriptionColumn = postgres.StringColumn("description")
 		allColumns        = postgres.ColumnList{IDColumn, URLColumn, NameColumn, DescriptionColumn}
 		mutableColumns    = postgres.ColumnList{URLColumn, NameColumn, DescriptionColumn}
+		defaultColumns    = postgres.ColumnList{IDColumn}
 	)
 
 	return linkTable{
@@ -1366,6 +1380,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
diff --git a/tests/sqlite/generator_test.go b/tests/sqlite/generator_test.go
@@ -185,6 +185,7 @@ type actorTable struct {
 
 	AllColumns     sqlite.ColumnList
 	MutableColumns sqlite.ColumnList
+	DefaultColumns sqlite.ColumnList
 }
 
 type ActorTable struct {
@@ -228,6 +229,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 		LastUpdateColumn = sqlite.TimestampColumn("last_update")
 		allColumns       = sqlite.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}
 		mutableColumns   = sqlite.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}
+		defaultColumns   = sqlite.ColumnList{LastUpdateColumn}
 	)
 
 	return actorTable{
@@ -241,6 +243,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `
@@ -307,6 +310,7 @@ type filmListTable struct {
 
 	AllColumns     sqlite.ColumnList
 	MutableColumns sqlite.ColumnList
+	DefaultColumns sqlite.ColumnList
 }
 
 type FilmListTable struct {
@@ -354,6 +358,7 @@ func newFilmListTableImpl(schemaName, tableName, alias string) filmListTable {
 		ActorsColumn      = sqlite.StringColumn("actors")
 		allColumns        = sqlite.ColumnList{FidColumn, TitleColumn, DescriptionColumn, CategoryColumn, PriceColumn, LengthColumn, RatingColumn, ActorsColumn}
 		mutableColumns    = sqlite.ColumnList{FidColumn, TitleColumn, DescriptionColumn, CategoryColumn, PriceColumn, LengthColumn, RatingColumn, ActorsColumn}
+		defaultColumns    = sqlite.ColumnList{}
 	)
 
 	return filmListTable{
@@ -371,6 +376,7 @@ func newFilmListTableImpl(schemaName, tableName, alias string) filmListTable {
 
 		AllColumns:     allColumns,
 		MutableColumns: mutableColumns,
+		DefaultColumns: defaultColumns,
 	}
 }
 `

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ type TableSQLBuilderColumn struct {`
`136`	`136`	`Type string`
`137`	`137`	`}`
`138`	`138`
`139`		`-var reservedKeywords = []string{"TableName", "Table", "SchemaName", "Alias", "AllColumns", "MutableColumns"}`
	`139`	`+var reservedKeywords = []string{"TableName", "Table", "SchemaName", "Alias", "AllColumns", "MutableColumns", "DefaultColumns"}`
`140`	`140`
`141`	`141`	`func renameIfReserved(name string) string {`
`142`	`142`	`if slices.Contains(reservedKeywords, name) {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func TestColumnRenameReserved(t *testing.T) {`
`22`	`22`	`{col: "Alias", want: "Alias_"},`
`23`	`23`	`{col: "AllColumns", want: "AllColumns_"},`
`24`	`24`	`{col: "MutableColumns", want: "MutableColumns_"},`
	`25`	`+ {col: "DefaultColumns", want: "DefaultColumns_"},`
`25`	`26`	`{col: "OtherColumn", want: "OtherColumn"},`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ type linkTable struct {`
`260`	`260`
`261`	`261`	`AllColumns mysql.ColumnList`
`262`	`262`	`MutableColumns mysql.ColumnList`
	`263`	`+ DefaultColumns mysql.ColumnList`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`type LinkTable struct {`
`@@ -303,6 +304,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {`
`303`	`304`	`DescriptionColumn = mysql.StringColumn("description")`
`304`	`305`	`allColumns = mysql.ColumnList{IDColumn, URLColumn, NameColumn, DescriptionColumn}`
`305`	`306`	`mutableColumns = mysql.ColumnList{URLColumn, NameColumn, DescriptionColumn}`
	`307`	`+ defaultColumns = mysql.ColumnList{DescriptionColumn}`
`306`	`308`	`)`
`307`	`309`
`308`	`310`	`return linkTable{`
`@@ -316,6 +318,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {`
`316`	`318`
`317`	`319`	`AllColumns: allColumns,`
`318`	`320`	`MutableColumns: mutableColumns,`
	`321`	`+ DefaultColumns: defaultColumns,`
`319`	`322`	`}`
`320`	`323`	`}`
`321`	`324`	`)
`@@ -375,6 +378,7 @@ type actorTable struct {`
`375`	`378`
`376`	`379`	`AllColumns mysql.ColumnList`
`377`	`380`	`MutableColumns mysql.ColumnList`
	`381`	`+ DefaultColumns mysql.ColumnList`
`378`	`382`	`}`
`379`	`383`
`380`	`384`	`type ActorTable struct {`
`@@ -418,6 +422,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`418`	`422`	`LastUpdateColumn = mysql.TimestampColumn("last_update")`
`419`	`423`	`allColumns = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}`
`420`	`424`	`mutableColumns = mysql.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}`
	`425`	`+ defaultColumns = mysql.ColumnList{LastUpdateColumn}`
`421`	`426`	`)`
`422`	`427`
`423`	`428`	`return actorTable{`
`@@ -431,6 +436,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`431`	`436`
`432`	`437`	`AllColumns: allColumns,`
`433`	`438`	`MutableColumns: mutableColumns,`
	`439`	`+ DefaultColumns: defaultColumns,`
`434`	`440`	`}`
`435`	`441`	`}`
`436`	`442`	`
`@@ -516,6 +522,7 @@ type actorInfoTable struct {`
`516`	`522`
`517`	`523`	`AllColumns mysql.ColumnList`
`518`	`524`	`MutableColumns mysql.ColumnList`
	`525`	`+ DefaultColumns mysql.ColumnList`
`519`	`526`	`}`
`520`	`527`
`521`	`528`	`type ActorInfoTable struct {`
`@@ -559,6 +566,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {`
`559`	`566`	`FilmInfoColumn = mysql.StringColumn("film_info")`
`560`	`567`	`allColumns = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}`
`561`	`568`	`mutableColumns = mysql.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}`
	`569`	`+ defaultColumns = mysql.ColumnList{}`
`562`	`570`	`)`
`563`	`571`
`564`	`572`	`return actorInfoTable{`
`@@ -572,6 +580,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {`
`572`	`580`
`573`	`581`	`AllColumns: allColumns,`
`574`	`582`	`MutableColumns: mutableColumns,`
	`583`	`+ DefaultColumns: defaultColumns,`
`575`	`584`	`}`
`576`	`585`	`}`
`577`	`586`	`
Original file line number	Diff line number	Diff line change
`@@ -520,6 +520,7 @@ type actorTable struct {`
`520`	`520`
`521`	`521`	`AllColumns postgres.ColumnList`
`522`	`522`	`MutableColumns postgres.ColumnList`
	`523`	`+ DefaultColumns postgres.ColumnList`
`523`	`524`	`}`
`524`	`525`
`525`	`526`	`type ActorTable struct {`
`@@ -563,6 +564,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`563`	`564`	`LastUpdateColumn = postgres.TimestampColumn("last_update")`
`564`	`565`	`allColumns = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}`
`565`	`566`	`mutableColumns = postgres.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}`
	`567`	`+ defaultColumns = postgres.ColumnList{ActorIDColumn}`
`566`	`568`	`)`
`567`	`569`
`568`	`570`	`return actorTable{`
`@@ -576,6 +578,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`576`	`578`
`577`	`579`	`AllColumns: allColumns,`
`578`	`580`	`MutableColumns: mutableColumns,`
	`581`	`+ DefaultColumns: defaultColumns,`
`579`	`582`	`}`
`580`	`583`	`}`
`581`	`584`	`
`@@ -660,6 +663,7 @@ type actorInfoTable struct {`
`660`	`663`
`661`	`664`	`AllColumns postgres.ColumnList`
`662`	`665`	`MutableColumns postgres.ColumnList`
	`666`	`+ DefaultColumns postgres.ColumnList`
`663`	`667`	`}`
`664`	`668`
`665`	`669`	`type ActorInfoTable struct {`
`@@ -703,6 +707,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {`
`703`	`707`	`FilmInfoColumn = postgres.StringColumn("film_info")`
`704`	`708`	`allColumns = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}`
`705`	`709`	`mutableColumns = postgres.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, FilmInfoColumn}`
	`710`	`+ defaultColumns = postgres.ColumnList{}`
`706`	`711`	`)`
`707`	`712`
`708`	`713`	`return actorInfoTable{`
`@@ -716,6 +721,7 @@ func newActorInfoTableImpl(schemaName, tableName, alias string) actorInfoTable {`
`716`	`721`
`717`	`722`	`AllColumns: allColumns,`
`718`	`723`	`MutableColumns: mutableColumns,`
	`724`	`+ DefaultColumns: defaultColumns,`
`719`	`725`	`}`
`720`	`726`	`}`
`721`	`727`	`
`@@ -1011,6 +1017,7 @@ type allTypesTable struct {`
`1011`	`1017`
`1012`	`1018`	`AllColumns postgres.ColumnList`
`1013`	`1019`	`MutableColumns postgres.ColumnList`
	`1020`	`+ DefaultColumns postgres.ColumnList`
`1014`	`1021`	`}`
`1015`	`1022`
`1016`	`1023`	`type AllTypesTable struct {`
`@@ -1113,6 +1120,7 @@ func newAllTypesTableImpl(schemaName, tableName, alias string) allTypesTable {`
`1113`	`1120`	`MoodColumn = postgres.StringColumn("mood")`
`1114`	`1121`	allColumns = postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn, MoodPtrColumn, MoodColumn}
`1115`	`1122`	mutableColumns = postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn, MoodPtrColumn, MoodColumn}
	`1123`	+ defaultColumns = postgres.ColumnList{SmallIntColumn, IntegerColumn, BigIntColumn, DecimalColumn, NumericColumn, RealColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharColumn, CharColumn, TextColumn, ByteaColumn, TimestampzColumn, TimestampColumn, DateColumn, TimezColumn, TimeColumn, IntervalColumn, BooleanColumn, BitColumn, BitVaryingColumn, TsvectorColumn, UUIDColumn, XMLColumn, JSONColumn, JsonbColumn, IntegerArrayColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayColumn, MoodColumn}
`1116`	`1124`	`)`
`1117`	`1125`
`1118`	`1126`	`return allTypesTable{`
`@@ -1185,6 +1193,7 @@ func newAllTypesTableImpl(schemaName, tableName, alias string) allTypesTable {`
`1185`	`1193`
`1186`	`1194`	`AllColumns: allColumns,`
`1187`	`1195`	`MutableColumns: mutableColumns,`
	`1196`	`+ DefaultColumns: defaultColumns,`
`1188`	`1197`	`}`
`1189`	`1198`	`}`
`1190`	`1199`	`
`@@ -1218,6 +1227,7 @@ type sampleRangesTable struct {`
`1218`	`1227`
`1219`	`1228`	`AllColumns postgres.ColumnList`
`1220`	`1229`	`MutableColumns postgres.ColumnList`
	`1230`	`+ DefaultColumns postgres.ColumnList`
`1221`	`1231`	`}`
`1222`	`1232`
`1223`	`1233`	`type SampleRangesTable struct {`
`@@ -1263,6 +1273,7 @@ func newSampleRangesTableImpl(schemaName, tableName, alias string) sampleRangesT`
`1263`	`1273`	`NumRangeColumn = postgres.NumericRangeColumn("num_range")`
`1264`	`1274`	`allColumns = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}`
`1265`	`1275`	`mutableColumns = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}`
	`1276`	`+ defaultColumns = postgres.ColumnList{DateRangeColumn, TimestampRangeColumn, TimestampzRangeColumn, Int4RangeColumn, Int8RangeColumn, NumRangeColumn}`
`1266`	`1277`	`)`
`1267`	`1278`
`1268`	`1279`	`return sampleRangesTable{`
`@@ -1278,6 +1289,7 @@ func newSampleRangesTableImpl(schemaName, tableName, alias string) sampleRangesT`
`1278`	`1289`
`1279`	`1290`	`AllColumns: allColumns,`
`1280`	`1291`	`MutableColumns: mutableColumns,`
	`1292`	`+ DefaultColumns: defaultColumns,`
`1281`	`1293`	`}`
`1282`	`1294`	`}`
`1283`	`1295`	`
`@@ -1310,6 +1322,7 @@ type linkTable struct {`
`1310`	`1322`
`1311`	`1323`	`AllColumns postgres.ColumnList`
`1312`	`1324`	`MutableColumns postgres.ColumnList`
	`1325`	`+ DefaultColumns postgres.ColumnList`
`1313`	`1326`	`}`
`1314`	`1327`
`1315`	`1328`	`type LinkTable struct {`
`@@ -1353,6 +1366,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {`
`1353`	`1366`	`DescriptionColumn = postgres.StringColumn("description")`
`1354`	`1367`	`allColumns = postgres.ColumnList{IDColumn, URLColumn, NameColumn, DescriptionColumn}`
`1355`	`1368`	`mutableColumns = postgres.ColumnList{URLColumn, NameColumn, DescriptionColumn}`
	`1369`	`+ defaultColumns = postgres.ColumnList{IDColumn}`
`1356`	`1370`	`)`
`1357`	`1371`
`1358`	`1372`	`return linkTable{`
`@@ -1366,6 +1380,7 @@ func newLinkTableImpl(schemaName, tableName, alias string) linkTable {`
`1366`	`1380`
`1367`	`1381`	`AllColumns: allColumns,`
`1368`	`1382`	`MutableColumns: mutableColumns,`
	`1383`	`+ DefaultColumns: defaultColumns,`
`1369`	`1384`	`}`
`1370`	`1385`	`}`
`1371`	`1386`	`
Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ type actorTable struct {`
`185`	`185`
`186`	`186`	`AllColumns sqlite.ColumnList`
`187`	`187`	`MutableColumns sqlite.ColumnList`
	`188`	`+ DefaultColumns sqlite.ColumnList`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`type ActorTable struct {`
`@@ -228,6 +229,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`228`	`229`	`LastUpdateColumn = sqlite.TimestampColumn("last_update")`
`229`	`230`	`allColumns = sqlite.ColumnList{ActorIDColumn, FirstNameColumn, LastNameColumn, LastUpdateColumn}`
`230`	`231`	`mutableColumns = sqlite.ColumnList{FirstNameColumn, LastNameColumn, LastUpdateColumn}`
	`232`	`+ defaultColumns = sqlite.ColumnList{LastUpdateColumn}`
`231`	`233`	`)`
`232`	`234`
`233`	`235`	`return actorTable{`
`@@ -241,6 +243,7 @@ func newActorTableImpl(schemaName, tableName, alias string) actorTable {`
`241`	`243`
`242`	`244`	`AllColumns: allColumns,`
`243`	`245`	`MutableColumns: mutableColumns,`
	`246`	`+ DefaultColumns: defaultColumns,`
`244`	`247`	`}`
`245`	`248`	`}`
`246`	`249`	`
`@@ -307,6 +310,7 @@ type filmListTable struct {`
`307`	`310`
`308`	`311`	`AllColumns sqlite.ColumnList`
`309`	`312`	`MutableColumns sqlite.ColumnList`
	`313`	`+ DefaultColumns sqlite.ColumnList`
`310`	`314`	`}`
`311`	`315`
`312`	`316`	`type FilmListTable struct {`
`@@ -354,6 +358,7 @@ func newFilmListTableImpl(schemaName, tableName, alias string) filmListTable {`
`354`	`358`	`ActorsColumn = sqlite.StringColumn("actors")`
`355`	`359`	`allColumns = sqlite.ColumnList{FidColumn, TitleColumn, DescriptionColumn, CategoryColumn, PriceColumn, LengthColumn, RatingColumn, ActorsColumn}`
`356`	`360`	`mutableColumns = sqlite.ColumnList{FidColumn, TitleColumn, DescriptionColumn, CategoryColumn, PriceColumn, LengthColumn, RatingColumn, ActorsColumn}`
	`361`	`+ defaultColumns = sqlite.ColumnList{}`
`357`	`362`	`)`
`358`	`363`
`359`	`364`	`return filmListTable{`
`@@ -371,6 +376,7 @@ func newFilmListTableImpl(schemaName, tableName, alias string) filmListTable {`
`371`	`376`
`372`	`377`	`AllColumns: allColumns,`
`373`	`378`	`MutableColumns: mutableColumns,`
	`379`	`+ DefaultColumns: defaultColumns,`
`374`	`380`	`}`
`375`	`381`	`}`
`376`	`382`	`