From 4219d543df97c4a06c19ec00ca06c7e9a4a1f634 Mon Sep 17 00:00:00 2001 From: ginokent <29125616+ginokent@users.noreply.github.com> Date: Sun, 12 Nov 2023 04:28:38 +0900 Subject: [PATCH] fix: Modify the receiver of the generated code from a pointer receiver to a value receiver --- README.md | 18 +++++++++--------- internal/arcgen/lang/go/generate.go | 18 ++++++------------ internal/arcgen/lang/go/tests/common.golden | 18 +++++++++--------- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 39729b9..6be3b8f 100644 --- a/README.md +++ b/README.md @@ -50,39 +50,39 @@ $ cat /tmp/sample.db.gen.go package sample -func (s *User) TableName() string { +func (s User) TableName() string { return "Users" } -func (s *User) ColumnNames() []string { +func (s User) ColumnNames() []string { return []string{"Id", "Name", "Age"} } -func (s *User) ColumnName_ID() string { +func (s User) ColumnName_ID() string { return "Id" } -func (s *User) ColumnName_Name() string { +func (s User) ColumnName_Name() string { return "Name" } -func (s *User) ColumnName_Age() string { +func (s User) ColumnName_Age() string { return "Age" } -func (s *Group) ColumnNames() []string { +func (s Group) ColumnNames() []string { return []string{"Id", "Name", "Description"} } -func (s *Group) ColumnName_ID() string { +func (s Group) ColumnName_ID() string { return "Id" } -func (s *Group) ColumnName_Name() string { +func (s Group) ColumnName_Name() string { return "Name" } -func (s *Group) ColumnName_Description() string { +func (s Group) ColumnName_Description() string { return "Description" } ``` diff --git a/internal/arcgen/lang/go/generate.go b/internal/arcgen/lang/go/generate.go index 8767e26..c386a34 100644 --- a/internal/arcgen/lang/go/generate.go +++ b/internal/arcgen/lang/go/generate.go @@ -140,10 +140,8 @@ func appendAST(file *ast.File, structName string, tableName string, methodNameTa Name: "s", }, }, - Type: &ast.StarExpr{ - X: &ast.Ident{ - Name: structName, // MEMO: struct name - }, + Type: &ast.Ident{ + Name: structName, // MEMO: struct name }, }, }, @@ -203,10 +201,8 @@ func generateASTColumnMethods(structName string, methodNameColumns string, prefi Name: "s", }, }, - Type: &ast.StarExpr{ - X: &ast.Ident{ - Name: structName, // MEMO: struct name - }, + Type: &ast.Ident{ + Name: structName, // MEMO: struct name }, }, }, @@ -255,10 +251,8 @@ func generateASTColumnMethods(structName string, methodNameColumns string, prefi Name: "s", }, }, - Type: &ast.StarExpr{ - X: &ast.Ident{ - Name: structName, // MEMO: struct name - }, + Type: &ast.Ident{ + Name: structName, // MEMO: struct name }, }, }, diff --git a/internal/arcgen/lang/go/tests/common.golden b/internal/arcgen/lang/go/tests/common.golden index 05a4c23..bb42a4f 100644 --- a/internal/arcgen/lang/go/tests/common.golden +++ b/internal/arcgen/lang/go/tests/common.golden @@ -4,38 +4,38 @@ package main -func (s *User) GetTableName() string { +func (s User) GetTableName() string { return "Users" } -func (s *User) GetColumnNames() []string { +func (s User) GetColumnNames() []string { return []string{"Id", "Name", "Email", "Age"} } -func (s *User) GetColumnName_ID() string { +func (s User) GetColumnName_ID() string { return "Id" } -func (s *User) GetColumnName_Name() string { +func (s User) GetColumnName_Name() string { return "Name" } -func (s *User) GetColumnName_Email() string { +func (s User) GetColumnName_Email() string { return "Email" } -func (s *User) GetColumnName_Age() string { +func (s User) GetColumnName_Age() string { return "Age" } -func (s *Group) GetColumnNames() []string { +func (s Group) GetColumnNames() []string { return []string{"Id", "Name"} } -func (s *Group) GetColumnName_ID() string { +func (s Group) GetColumnName_ID() string { return "Id" } -func (s *Group) GetColumnName_Name() string { +func (s Group) GetColumnName_Name() string { return "Name" }