Skip to content
This repository was archived by the owner on Apr 19, 2018. It is now read-only.
/ sqlgen Public archive

Implement the ability to rename the tables without contriving your type names, and more! #4

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

Implement the ability to rename the tables without contriving your type names, and more! #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a11bee
Implement the ability to rename the table with an SQLName attribute t…
AmandaCameron Sep 15, 2015
ca8af9a
Merge branch 'master' of github.com:drone/sqlgen
AmandaCameron Sep 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
17 changes: 9 additions & 8 deletions demo/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package demo

//go:generate ../sqlgen -file user.go -type User -pkg demo -o user_sql.go
//go:generate ../sqlgen -file user.go -type LegacyUser -pkg demo -o user_sql.go

type User struct {
ID int64 `sql:"pk: true, auto: true"`
Login string `sql:"unique: user_login"`
Email string `sql:"unique: user_email"`
Avatar string
Active bool
Admin bool
type LegacyUser struct {
SQLName string `sql:"name: users, skip: true"`
ID int64 `sql:"pk: true, auto: true"`
Login string `sql:"unique: login"`
Email string `sql:"unique: email"`
Avatar string
Active bool
Admin bool

// oauth token and secret
token string
Expand Down
244 changes: 122 additions & 122 deletions demo/user_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"database/sql"
)

func ScanUser(row *sql.Row) (*User, error) {
func ScanLegacyUser(row *sql.Row) (*LegacyUser, error) {
var v0 int64
var v1 string
var v2 string
Expand All @@ -32,7 +32,7 @@ func ScanUser(row *sql.Row) (*User, error) {
return nil, err
}

v := &User{}
v := &LegacyUser{}
v.ID = v0
v.Login = v1
v.Email = v2
Expand All @@ -46,9 +46,9 @@ func ScanUser(row *sql.Row) (*User, error) {
return v, nil
}

func ScanUsers(rows *sql.Rows) ([]*User, error) {
func ScanLegacyUsers(rows *sql.Rows) ([]*LegacyUser, error) {
var err error
var vv []*User
var vv []*LegacyUser

var v0 int64
var v1 string
Expand Down Expand Up @@ -76,7 +76,7 @@ func ScanUsers(rows *sql.Rows) ([]*User, error) {
return vv, err
}

v := &User{}
v := &LegacyUser{}
v.ID = v0
v.Login = v1
v.Email = v2
Expand All @@ -92,7 +92,7 @@ func ScanUsers(rows *sql.Rows) ([]*User, error) {
return vv, rows.Err()
}

func SliceUser(v *User) []interface{} {
func SliceLegacyUser(v *LegacyUser) []interface{} {
var v0 int64
var v1 string
var v2 string
Expand Down Expand Up @@ -126,23 +126,23 @@ func SliceUser(v *User) []interface{} {
}
}

func SelectUser(db *sql.DB, query string, args ...interface{}) (*User, error) {
func SelectLegacyUser(db *sql.DB, query string, args ...interface{}) (*LegacyUser, error) {
row := db.QueryRow(query, args...)
return ScanUser(row)
return ScanLegacyUser(row)
}

func SelectUsers(db *sql.DB, query string, args ...interface{}) ([]*User, error) {
func SelectLegacyUsers(db *sql.DB, query string, args ...interface{}) ([]*LegacyUser, error) {
rows, err := db.Query(query, args...)
if err != nil {
return nil, err
}
defer rows.Close()
return ScanUsers(rows)
return ScanLegacyUsers(rows)
}

func InsertUser(db *sql.DB, query string, v *User) error {
func InsertLegacyUser(db *sql.DB, query string, v *LegacyUser) error {

res, err := db.Exec(query, SliceUser(v)[1:]...)
res, err := db.Exec(query, SliceLegacyUser(v)[1:]...)
if err != nil {
return err
}
Expand All @@ -151,66 +151,66 @@ func InsertUser(db *sql.DB, query string, v *User) error {
return err
}

func UpdateUser(db *sql.DB, query string, v *User) error {
func UpdateLegacyUser(db *sql.DB, query string, v *LegacyUser) error {

args := SliceUser(v)[1:]
args := SliceLegacyUser(v)[1:]
args = append(args, v.ID)
_, err := db.Exec(query, args...)
return err
}

const CreateUserStmt = `
CREATE TABLE IF NOT EXISTS users (
user_id INTEGER PRIMARY KEY AUTOINCREMENT
,user_login TEXT
,user_email TEXT
,user_avatar TEXT
,user_active BOOLEAN
,user_admin BOOLEAN
,user_token TEXT
,user_secret TEXT
,user_hash TEXT
id INTEGER PRIMARY KEY AUTOINCREMENT
,login TEXT
,email TEXT
,avatar TEXT
,active BOOLEAN
,admin BOOLEAN
,token TEXT
,secret TEXT
,hash TEXT
);
`

const InsertUserStmt = `
INSERT INTO users (
user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
login
,email
,avatar
,active
,admin
,token
,secret
,hash
) VALUES (?,?,?,?,?,?,?,?)
`

const SelectUserStmt = `
SELECT
user_id
,user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
id
,login
,email
,avatar
,active
,admin
,token
,secret
,hash
FROM users
`

const SelectUserRangeStmt = `
SELECT
user_id
,user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
id
,login
,email
,avatar
,active
,admin
,token
,secret
,hash
FROM users
LIMIT ? OFFSET ?
`
Expand All @@ -222,110 +222,110 @@ FROM users

const SelectUserPkeyStmt = `
SELECT
user_id
,user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
id
,login
,email
,avatar
,active
,admin
,token
,secret
,hash
FROM users
WHERE user_id=?
WHERE id=?
`

const UpdateUserPkeyStmt = `
UPDATE users SET
user_id=?
,user_login=?
,user_email=?
,user_avatar=?
,user_active=?
,user_admin=?
,user_token=?
,user_secret=?
,user_hash=?
WHERE user_id=?
id=?
,login=?
,email=?
,avatar=?
,active=?
,admin=?
,token=?
,secret=?
,hash=?
WHERE id=?
`

const DeleteUserPkeyStmt = `
DELETE FROM users
WHERE user_id=?
WHERE id=?
`

const CreateUserLoginStmt = `
CREATE UNIQUE INDEX IF NOT EXISTS user_login ON users (user_login)
const CreateLoginStmt = `
CREATE UNIQUE INDEX IF NOT EXISTS login ON users (login)
`

const SelectUserLoginStmt = `
const SelectLoginStmt = `
SELECT
user_id
,user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
id
,login
,email
,avatar
,active
,admin
,token
,secret
,hash
FROM users
WHERE user_login=?
WHERE login=?
`

const UpdateUserLoginStmt = `
const UpdateLoginStmt = `
UPDATE users SET
user_id=?
,user_login=?
,user_email=?
,user_avatar=?
,user_active=?
,user_admin=?
,user_token=?
,user_secret=?
,user_hash=?
WHERE user_login=?
id=?
,login=?
,email=?
,avatar=?
,active=?
,admin=?
,token=?
,secret=?
,hash=?
WHERE login=?
`

const DeleteUserLoginStmt = `
const DeleteLoginStmt = `
DELETE FROM users
WHERE user_login=?
WHERE login=?
`

const CreateUserEmailStmt = `
CREATE UNIQUE INDEX IF NOT EXISTS user_email ON users (user_email)
const CreateEmailStmt = `
CREATE UNIQUE INDEX IF NOT EXISTS email ON users (email)
`

const SelectUserEmailStmt = `
const SelectEmailStmt = `
SELECT
user_id
,user_login
,user_email
,user_avatar
,user_active
,user_admin
,user_token
,user_secret
,user_hash
id
,login
,email
,avatar
,active
,admin
,token
,secret
,hash
FROM users
WHERE user_email=?
WHERE email=?
`

const UpdateUserEmailStmt = `
const UpdateEmailStmt = `
UPDATE users SET
user_id=?
,user_login=?
,user_email=?
,user_avatar=?
,user_active=?
,user_admin=?
,user_token=?
,user_secret=?
,user_hash=?
WHERE user_email=?
id=?
,login=?
,email=?
,avatar=?
,active=?
,admin=?
,token=?
,secret=?
,hash=?
WHERE email=?
`

const DeleteUserEmailStmt = `
const DeleteEmailStmt = `
DELETE FROM users
WHERE user_email=?
WHERE email=?
`
Loading