Generate schema field names with same case as the Go struct field to prevent keyword collisions

Author: hlubek

example/pgx/repository/mappings_project_gen.go

@@ -21,17 +21,17 @@ func projectBuildFindQuery() builder.SelectBuilder {
 	return SelectJson(projectJson()).
 		From(project).
 		LeftJoin(
-			Select(fn.Count(todo.projectID)).As("count").
-				Select(todo.projectID).
+			Select(fn.Count(todo.ProjectID)).As("count").
+				Select(todo.ProjectID).
 				From(todo).
-				GroupBy(todo.projectID),
-		).As("todo_counts").On(project.id.Eq(N("todo_counts.project_id")))
+				GroupBy(todo.ProjectID),
+		).As("todo_counts").On(project.ID.Eq(N("todo_counts.project_id")))
 }
 
 // FindProjectByID finds a single project by id
 func FindProjectByID(ctx context.Context, executor qrbpgx.Executor, id uuid.UUID) (result model.Project, err error) {
 	q := projectBuildFindQuery().
-		Where(project.id.Eq(Arg(id)))
+		Where(project.ID.Eq(Arg(id)))
 
 	row, err := qrbpgx.Build(q).WithExecutor(executor).QueryRow(ctx)
 	if err != nil {
@@ -43,7 +43,7 @@ func FindProjectByID(ctx context.Context, executor qrbpgx.Executor, id uuid.UUID
 // FindAllProjects finds all projects sorted by title
 func FindAllProjects(ctx context.Context, executor qrbpgx.Executor) (result []model.Project, err error) {
 	q := projectBuildFindQuery().
-		OrderBy(project.title)
+		OrderBy(project.Title)
 
 	rows, err := qrbpgx.Build(q).WithExecutor(executor).Query(ctx)
 	if err != nil {

example/pgx/repository/mappings_todo_gen.go

@@ -20,13 +20,13 @@ func todoBuildFindQuery() builder.SelectBuilder {
 	return qrb.
 		SelectJson(todoJson()).
 		From(todo).
-		LeftJoin(project).On(todo.projectID.Eq(project.id))
+		LeftJoin(project).On(todo.ProjectID.Eq(project.ID))
 }
 
 // FindTodoByID finds a single todo by id
 func FindTodoByID(ctx context.Context, executor qrbpgx.Executor, id uuid.UUID) (result model.Todo, err error) {
 	q := todoBuildFindQuery().
-		Where(todo.id.Eq(qrb.Arg(id)))
+		Where(todo.ID.Eq(qrb.Arg(id)))
 
 	row, err := qrbpgx.Build(q).WithExecutor(executor).QueryRow(ctx)
 	if err != nil {
@@ -38,7 +38,12 @@ func FindTodoByID(ctx context.Context, executor qrbpgx.Executor, id uuid.UUID) (
 // FindAllTodos finds all todos sorted by title
 func FindAllTodos(ctx context.Context, executor qrbpgx.Executor, filter model.TodosFilter) (result []model.Todo, err error) {
 	q := todoBuildFindQuery().
-		OrderBy(todo.completedAt).Desc().NullsFirst()
+		OrderBy(todo.CompletedAt).Desc().NullsFirst().
+		SelectBuilder
+
+	if filter.ProjectID != nil {
+		q = q.Where(todo.ProjectID.Eq(qrb.Arg(filter.ProjectID)))
+	}
 
 	rows, err := qrbpgx.Build(q).WithExecutor(executor).Query(ctx)
 	if err != nil {
@@ -63,7 +68,7 @@ func UpdateTodo(ctx context.Context, executor qrbpgx.Executor, id uuid.UUID, cha
 	q := qrb.
 		Update(todo).
 		SetMap(changeSet.toMap()).
-		Where(todo.id.Eq(qrb.Arg(id)))
+		Where(todo.ID.Eq(qrb.Arg(id)))
 
 	res, err := qrbpgx.Build(q).WithExecutor(executor).Exec(ctx)
 	if err != nil {

example/pgx/repository/repository_project.go

@@ -34,7 +34,7 @@ func Generate(m *StructMapping, goPackage string, goFile string, w io.Writer) (o
 
 	for _, fm := range m.FieldMappings {
 		if fm.WriteColDef != nil {
-			fieldName := firstToUpper(fm.Name)
+			fieldName := fm.Name
 
 			var prepareStmt *Statement
 			if fm.WriteColDef.ToJSON {
@@ -124,22 +124,22 @@ func generateSchemaVar(f *File, m *StructMapping) {
 			if fm.ReadColDef == nil {
 				continue
 			}
-			g.Id(firstToLower(fm.Name)).Qual("github.com/networkteam/qrb/builder", "IdentExp")
+			g.Id(fm.Name).Qual("github.com/networkteam/qrb/builder", "IdentExp")
 		}
 	}).Values(DictFunc(func(d Dict) {
 		if m.TableName != "" {
 			d[Id("Identer")] = Qual("github.com/networkteam/qrb", "N").Call(Lit(m.TableName))
 		}
 		for _, fm := range m.FieldMappings {
 			if fm.ReadColDef != nil {
-				d[Id(firstToLower(fm.Name))] = Qual("github.com/networkteam/qrb", "N").Call(Lit(fm.ReadColDef.Col))
+				d[Id(fm.Name)] = Qual("github.com/networkteam/qrb", "N").Call(Lit(fm.ReadColDef.Col))
 			}
 		}
 	})).Line()
 }
 
 func readColVarName(m *StructMapping, fm FieldMapping) string {
-	return firstToLower(m.MappingTypeName) + "." + firstToLower(fm.Name)
+	return firstToLower(m.MappingTypeName) + "." + fm.Name
 }
 
 func generateDefaultSelectJsonObject(f *File, m *StructMapping) {