Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
51baa35d
Commit
51baa35d
authored
Aug 01, 2013
by
slene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now object crud is simple
parent
250cbf59
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
90 additions
and
58 deletions
+90
-58
db.go
orm/db.go
+36
-0
orm.go
orm/orm.go
+49
-2
orm_object.go
orm/orm_object.go
+0
-49
types.go
orm/types.go
+5
-7
No files found.
orm/db.go
View file @
51baa35d
...
@@ -559,6 +559,42 @@ func (d *dbBase) InsertStmt(stmt *sql.Stmt, mi *modelInfo, ind reflect.Value) (i
...
@@ -559,6 +559,42 @@ func (d *dbBase) InsertStmt(stmt *sql.Stmt, mi *modelInfo, ind reflect.Value) (i
}
}
}
}
func
(
d
*
dbBase
)
Read
(
q
dbQuerier
,
mi
*
modelInfo
,
ind
reflect
.
Value
)
error
{
pkNames
,
pkValues
,
ok
:=
d
.
existPk
(
mi
,
ind
)
if
ok
==
false
{
return
ErrMissPK
}
pkColumns
:=
strings
.
Join
(
pkNames
,
"` = ? AND `"
)
sels
:=
strings
.
Join
(
mi
.
fields
.
dbcols
,
"`, `"
)
colsNum
:=
len
(
mi
.
fields
.
dbcols
)
query
:=
fmt
.
Sprintf
(
"SELECT `%s` FROM `%s` WHERE `%s` = ?"
,
sels
,
mi
.
table
,
pkColumns
)
refs
:=
make
([]
interface
{},
colsNum
)
for
i
,
_
:=
range
refs
{
var
ref
interface
{}
refs
[
i
]
=
&
ref
}
row
:=
q
.
QueryRow
(
query
,
pkValues
...
)
if
err
:=
row
.
Scan
(
refs
...
);
err
!=
nil
{
return
err
}
else
{
elm
:=
reflect
.
New
(
mi
.
addrField
.
Elem
()
.
Type
())
md
:=
elm
.
Interface
()
.
(
Modeler
)
md
.
Init
(
md
)
mind
:=
reflect
.
Indirect
(
elm
)
d
.
setColsValues
(
mi
,
&
mind
,
mi
.
fields
.
dbcols
,
refs
)
ind
.
Set
(
mind
)
}
return
nil
}
func
(
d
*
dbBase
)
Insert
(
q
dbQuerier
,
mi
*
modelInfo
,
ind
reflect
.
Value
)
(
int64
,
error
)
{
func
(
d
*
dbBase
)
Insert
(
q
dbQuerier
,
mi
*
modelInfo
,
ind
reflect
.
Value
)
(
int64
,
error
)
{
names
,
values
,
err
:=
d
.
collectValues
(
mi
,
ind
,
true
,
true
)
names
,
values
,
err
:=
d
.
collectValues
(
mi
,
ind
,
true
,
true
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
orm/orm.go
View file @
51baa35d
...
@@ -4,6 +4,7 @@ import (
...
@@ -4,6 +4,7 @@ import (
"database/sql"
"database/sql"
"errors"
"errors"
"fmt"
"fmt"
"reflect"
"time"
"time"
)
)
...
@@ -26,15 +27,61 @@ type orm struct {
...
@@ -26,15 +27,61 @@ type orm struct {
isTx
bool
isTx
bool
}
}
func
(
o
*
orm
)
Object
(
md
Modeler
)
ObjectSeter
{
func
(
o
*
orm
)
getMiInd
(
md
Modeler
)
(
mi
*
modelInfo
,
ind
reflect
.
Value
)
{
md
.
Init
(
md
,
true
)
md
.
Init
(
md
,
true
)
name
:=
md
.
GetTableName
()
name
:=
md
.
GetTableName
()
if
mi
,
ok
:=
modelCache
.
get
(
name
);
ok
{
if
mi
,
ok
:=
modelCache
.
get
(
name
);
ok
{
return
newObject
(
o
,
mi
,
md
)
return
mi
,
reflect
.
Indirect
(
reflect
.
ValueOf
(
md
)
)
}
}
panic
(
fmt
.
Sprintf
(
"<orm.Object> table name: `%s` not exists"
,
name
))
panic
(
fmt
.
Sprintf
(
"<orm.Object> table name: `%s` not exists"
,
name
))
}
}
func
(
o
*
orm
)
Read
(
md
Modeler
)
error
{
mi
,
ind
:=
o
.
getMiInd
(
md
)
err
:=
o
.
alias
.
DbBaser
.
Read
(
o
.
db
,
mi
,
ind
)
if
err
!=
nil
{
return
err
}
return
nil
}
func
(
o
*
orm
)
Insert
(
md
Modeler
)
(
int64
,
error
)
{
mi
,
ind
:=
o
.
getMiInd
(
md
)
id
,
err
:=
o
.
alias
.
DbBaser
.
Insert
(
o
.
db
,
mi
,
ind
)
if
err
!=
nil
{
return
id
,
err
}
if
id
>
0
{
if
mi
.
fields
.
auto
!=
nil
{
ind
.
Field
(
mi
.
fields
.
auto
.
fieldIndex
)
.
SetInt
(
id
)
}
}
return
id
,
nil
}
func
(
o
*
orm
)
Update
(
md
Modeler
)
(
int64
,
error
)
{
mi
,
ind
:=
o
.
getMiInd
(
md
)
num
,
err
:=
o
.
alias
.
DbBaser
.
Update
(
o
.
db
,
mi
,
ind
)
if
err
!=
nil
{
return
num
,
err
}
return
num
,
nil
}
func
(
o
*
orm
)
Delete
(
md
Modeler
)
(
int64
,
error
)
{
mi
,
ind
:=
o
.
getMiInd
(
md
)
num
,
err
:=
o
.
alias
.
DbBaser
.
Delete
(
o
.
db
,
mi
,
ind
)
if
err
!=
nil
{
return
num
,
err
}
if
num
>
0
{
if
mi
.
fields
.
auto
!=
nil
{
ind
.
Field
(
mi
.
fields
.
auto
.
fieldIndex
)
.
SetInt
(
0
)
}
}
return
num
,
nil
}
func
(
o
*
orm
)
QueryTable
(
ptrStructOrTableName
interface
{})
QuerySeter
{
func
(
o
*
orm
)
QueryTable
(
ptrStructOrTableName
interface
{})
QuerySeter
{
name
:=
""
name
:=
""
if
table
,
ok
:=
ptrStructOrTableName
.
(
string
);
ok
{
if
table
,
ok
:=
ptrStructOrTableName
.
(
string
);
ok
{
...
...
orm/orm_object.go
View file @
51baa35d
...
@@ -51,52 +51,3 @@ func newInsertSet(orm *orm, mi *modelInfo) (Inserter, error) {
...
@@ -51,52 +51,3 @@ func newInsertSet(orm *orm, mi *modelInfo) (Inserter, error) {
bi
.
stmt
=
st
bi
.
stmt
=
st
return
bi
,
nil
return
bi
,
nil
}
}
type
object
struct
{
ind
reflect
.
Value
mi
*
modelInfo
orm
*
orm
}
func
(
o
*
object
)
Insert
()
(
int64
,
error
)
{
id
,
err
:=
o
.
orm
.
alias
.
DbBaser
.
Insert
(
o
.
orm
.
db
,
o
.
mi
,
o
.
ind
)
if
err
!=
nil
{
return
id
,
err
}
if
id
>
0
{
if
o
.
mi
.
fields
.
auto
!=
nil
{
o
.
ind
.
Field
(
o
.
mi
.
fields
.
auto
.
fieldIndex
)
.
SetInt
(
id
)
}
}
return
id
,
nil
}
func
(
o
*
object
)
Update
()
(
int64
,
error
)
{
num
,
err
:=
o
.
orm
.
alias
.
DbBaser
.
Update
(
o
.
orm
.
db
,
o
.
mi
,
o
.
ind
)
if
err
!=
nil
{
return
num
,
err
}
return
num
,
nil
}
func
(
o
*
object
)
Delete
()
(
int64
,
error
)
{
num
,
err
:=
o
.
orm
.
alias
.
DbBaser
.
Delete
(
o
.
orm
.
db
,
o
.
mi
,
o
.
ind
)
if
err
!=
nil
{
return
num
,
err
}
if
num
>
0
{
if
o
.
mi
.
fields
.
auto
!=
nil
{
o
.
ind
.
Field
(
o
.
mi
.
fields
.
auto
.
fieldIndex
)
.
SetInt
(
0
)
}
}
return
num
,
nil
}
func
newObject
(
orm
*
orm
,
mi
*
modelInfo
,
md
Modeler
)
ObjectSeter
{
o
:=
new
(
object
)
ind
:=
reflect
.
Indirect
(
reflect
.
ValueOf
(
md
))
o
.
ind
=
ind
o
.
mi
=
mi
o
.
orm
=
orm
return
o
}
orm/types.go
View file @
51baa35d
...
@@ -22,7 +22,10 @@ type Modeler interface {
...
@@ -22,7 +22,10 @@ type Modeler interface {
}
}
type
Ormer
interface
{
type
Ormer
interface
{
Object
(
Modeler
)
ObjectSeter
Read
(
Modeler
)
error
Insert
(
Modeler
)
(
int64
,
error
)
Update
(
Modeler
)
(
int64
,
error
)
Delete
(
Modeler
)
(
int64
,
error
)
QueryTable
(
interface
{})
QuerySeter
QueryTable
(
interface
{})
QuerySeter
Using
(
string
)
error
Using
(
string
)
error
Begin
()
error
Begin
()
error
...
@@ -31,12 +34,6 @@ type Ormer interface {
...
@@ -31,12 +34,6 @@ type Ormer interface {
Raw
(
string
,
...
interface
{})
RawSeter
Raw
(
string
,
...
interface
{})
RawSeter
}
}
type
ObjectSeter
interface
{
Insert
()
(
int64
,
error
)
Update
()
(
int64
,
error
)
Delete
()
(
int64
,
error
)
}
type
Inserter
interface
{
type
Inserter
interface
{
Insert
(
Modeler
)
(
int64
,
error
)
Insert
(
Modeler
)
(
int64
,
error
)
Close
()
error
Close
()
error
...
@@ -94,6 +91,7 @@ type dbQuerier interface {
...
@@ -94,6 +91,7 @@ type dbQuerier interface {
}
}
type
dbBaser
interface
{
type
dbBaser
interface
{
Read
(
dbQuerier
,
*
modelInfo
,
reflect
.
Value
)
error
Insert
(
dbQuerier
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
Insert
(
dbQuerier
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
InsertStmt
(
*
sql
.
Stmt
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
InsertStmt
(
*
sql
.
Stmt
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
Update
(
dbQuerier
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
Update
(
dbQuerier
,
*
modelInfo
,
reflect
.
Value
)
(
int64
,
error
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment