Skip to content

feat: add Unqualified method to return columns without table alias/pr… #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atzedus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add Unqualified method to return columns without table alias/pr… #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Added `Unqualified()` method to generated column structures that returns columns without table alias/prefix. (thanks @atzedus)
- Added `PreloadCount` and `ThenLoadCount` to generate code for preloading and then loading counts for relationships. (thanks @jacobmolby)
- MySQL support for insert queries executing loaders (e.g., `InsertThenLoad`, `InsertThenLoadCount`). (thanks @jacobmolby)
- Added overwritable hooks that are run before the exec or scanning test of generated queries. This allows seeding data before the test runs.
Expand Down
24 changes: 16 additions & 8 deletions gen/templates/models/table/001_types.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,19 @@ type {{$tAlias.DownSingular}}R struct {

{{$.Importer.Import "github.com/stephenafamo/bob/expr"}}
{{$.Importer.Import (printf "github.com/stephenafamo/bob/dialect/%s" $.Dialect)}}
func build{{$tAlias.UpSingular}}Columns(alias string) {{$tAlias.DownSingular}}Columns {
func build{{$tAlias.UpSingular}}Columns(tableName string) {{$tAlias.DownSingular}}Columns {
columnsExpr := expr.NewColumnsExpr(
{{range $column := $table.Columns -}}{{quote $column.Name}},{{end}}
)
if tableName != "" {
columnsExpr = columnsExpr.WithParent(tableName)
}
return {{$tAlias.DownSingular}}Columns{
ColumnsExpr: expr.NewColumnsExpr(
{{range $column := $table.Columns -}}{{quote $column.Name}},{{end}}
).WithParent({{quote $table.Key}}),
tableAlias: alias,
ColumnsExpr: columnsExpr,
tableAlias: tableName,
{{range $column := $table.Columns -}}
{{- $colAlias := $tAlias.Column $column.Name -}}
{{$colAlias}}: {{$.Dialect}}.Quote(alias, {{quote $column.Name}}),
{{$colAlias}}: {{$.Dialect}}.Quote(tableName, {{quote $column.Name}}),
{{end -}}
}
}
Expand All @@ -87,6 +91,10 @@ func (c {{$tAlias.DownSingular}}Columns) Alias() string {
return c.tableAlias
}

func ({{$tAlias.DownSingular}}Columns) AliasedAs(alias string) {{$tAlias.DownSingular}}Columns {
return build{{$tAlias.UpSingular}}Columns(alias)
func ({{$tAlias.DownSingular}}Columns) AliasedAs(tableName string) {{$tAlias.DownSingular}}Columns {
return build{{$tAlias.UpSingular}}Columns(tableName)
}

func (c {{$tAlias.DownSingular}}Columns) Unqualified() {{$tAlias.DownSingular}}Columns {
return build{{$tAlias.UpSingular}}Columns("")
}