Skip to content
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

Jump to bottom

DO NOT MERGE #7

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

DO NOT MERGE #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2940151
add float32 and float64
Jan 7, 2015
24cee36
updated with boolean type and the proper import in generated schemas
Jan 7, 2015
9111565
added schema qualification and reflection support
Jan 8, 2015
4c86a00
fix null time support
Jan 8, 2015
a8437cc
add set interface support -- yes sometimes it can be helpful
Jan 9, 2015
0ec020e
open Set() in interfaces
Jan 9, 2015
624763a
added substring support
Jan 29, 2015
20ef523
added date support
Jan 29, 2015
0dfe0de
added {nullable,}{date,time,datetime} support
Jan 29, 2015
6973d28
generate time stuff
Jan 29, 2015
54658d9
add numeric support
Jan 29, 2015
f276ff6
added inet support. this may not work.
Jan 29, 2015
4e8276d
forgot some nullable time methods
Jan 29, 2015
3369adb
make inet type compile
Jan 29, 2015
3d35d3a
fix time->datetime
Mar 3, 2015
f2ec7ee
substitute inet with blob
Mar 15, 2015
23c364c
add text variants
Mar 15, 2015
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
2 changes: 1 addition & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/jessevdk/go-flags"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
"github.com/relops/sqlc/sqlc"
"github.com/shutej/sqlc/sqlc"
"log"
"os"
)
Expand Down
27 changes: 25 additions & 2 deletions meta/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,36 @@
package meta

import (
"reflect"
)

type TypeInfo struct {
Prefix string
Literal string
Type reflect.Type
}

var Types = []TypeInfo{
TypeInfo{Prefix: "String", Literal: "string"},
TypeInfo{Prefix: "Bool", Literal: "bool"},
TypeInfo{Prefix: "Date", Literal: "time.Time"}, // TODO(shutej): test
TypeInfo{Prefix: "Datetime", Literal: "time.Time"}, // TODO(shutej): test
TypeInfo{Prefix: "Float32", Literal: "float32"},
TypeInfo{Prefix: "Float64", Literal: "float64"},
TypeInfo{Prefix: "Blob", Literal: "[]byte"}, // TODO(shutej): test
TypeInfo{Prefix: "Int", Literal: "int"},
TypeInfo{Prefix: "Int64", Literal: "int64"},
TypeInfo{Prefix: "Time", Literal: "time.Time"},
TypeInfo{Prefix: "NullBool", Literal: "sql.NullBool"},
TypeInfo{Prefix: "NullDate", Literal: "NullableDate"}, // TODO(shutej): test
TypeInfo{Prefix: "NullDatetime", Literal: "NullableDatetime"}, // TODO(shutej): test
TypeInfo{Prefix: "NullFloat32", Literal: "sql.NullFloat64"}, // TODO(shutej): test
TypeInfo{Prefix: "NullFloat64", Literal: "sql.NullFloat64"},
TypeInfo{Prefix: "NullBlob", Literal: "NullableBlob"}, // TODO(shutej): test
TypeInfo{Prefix: "NullInt", Literal: "sql.NullInt64"}, // TODO(shutej): test
TypeInfo{Prefix: "NullInt64", Literal: "sql.NullInt64"},
TypeInfo{Prefix: "NullString", Literal: "sql.NullString"},
TypeInfo{Prefix: "NullTime", Literal: "NullableTime"}, // TODO(shutej): test
TypeInfo{Prefix: "String", Literal: "string"},
TypeInfo{Prefix: "Time", Literal: "time.Time"}, // TODO(shutej): test
}

type FunctionInfo struct {
Expand All @@ -27,4 +48,6 @@ var Funcs = []FunctionInfo{
FunctionInfo{Name: "Md5", Expr: "MD5(%s)"},
FunctionInfo{Name: "Lower", Expr: "LOWER(%s)"},
FunctionInfo{Name: "Hex", Expr: "HEX(%s)"},
FunctionInfo{Name: "Substr2", Expr: "SUBSTR(%s, %v)"},
FunctionInfo{Name: "Substr3", Expr: "SUBSTR(%s, %v, %v)"},
}
2 changes: 1 addition & 1 deletion sqlc/field_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"bytes"
"fmt"
log "github.com/cihub/seelog"
"github.com/relops/sqlc/meta"
"github.com/shutej/sqlc/meta"
"io/ioutil"
"os"
"strings"
Expand Down
Loading