Skip to content

Commit 77de3bc

Browse files
committed
Remove NeedsEdit from Query
1 parent 751b01f commit 77de3bc

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

internal/dinosql/gen.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -666,32 +666,13 @@ func (r Result) GoQueries() []GoQuery {
666666
continue
667667
}
668668

669-
code := query.SQL
670-
671-
// TODO: Will horribly break sometimes
672-
if query.NeedsEdit {
673-
var cols []string
674-
find := "*"
675-
for _, c := range query.Columns {
676-
if c.Scope != "" {
677-
find = c.Scope + ".*"
678-
}
679-
name := c.Name
680-
if c.Scope != "" {
681-
name = c.Scope + "." + name
682-
}
683-
cols = append(cols, name)
684-
}
685-
code = strings.Replace(query.SQL, find, strings.Join(cols, ", "), 1)
686-
}
687-
688669
gq := GoQuery{
689670
Cmd: query.Cmd,
690671
ConstantName: lowerTitle(query.Name),
691672
FieldName: lowerTitle(query.Name) + "Stmt",
692673
MethodName: query.Name,
693674
SourceName: query.Filename,
694-
SQL: code,
675+
SQL: query.SQL,
695676
Comments: query.Comments,
696677
}
697678

internal/dinosql/parser.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ type Query struct {
167167
Comments []string
168168

169169
// XXX: Hack
170-
NeedsEdit bool
171-
Filename string
170+
Filename string
172171
}
173172

174173
type Result struct {

0 commit comments

Comments
 (0)