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
7b542e61
Commit
7b542e61
authored
Aug 02, 2016
by
astaxie
Committed by
GitHub
Aug 02, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1964 from qAison/master
fix fk field null value
parents
3ca68f9e
761b6c12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
db.go
orm/db.go
+6
-1
orm_raw.go
orm/orm_raw.go
+14
-2
No files found.
orm/db.go
View file @
7b542e61
...
...
@@ -1064,12 +1064,17 @@ func (d *dbBase) Count(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condition
tables
.
parseRelated
(
qs
.
related
,
qs
.
relDepth
)
where
,
args
:=
tables
.
getCondSQL
(
cond
,
false
,
tz
)
groupBy
:=
tables
.
getGroupSQL
(
qs
.
groups
)
tables
.
getOrderSQL
(
qs
.
orders
)
join
:=
tables
.
getJoinSQL
()
Q
:=
d
.
ins
.
TableQuote
()
query
:=
fmt
.
Sprintf
(
"SELECT COUNT(*) FROM %s%s%s T0 %s%s"
,
Q
,
mi
.
table
,
Q
,
join
,
where
)
query
:=
fmt
.
Sprintf
(
"SELECT COUNT(*) FROM %s%s%s T0 %s%s%s"
,
Q
,
mi
.
table
,
Q
,
join
,
where
,
groupBy
)
if
groupBy
!=
""
{
query
=
fmt
.
Sprintf
(
"SELECT COUNT(*) FROM (%s) AS T"
,
query
)
}
d
.
ins
.
ReplaceMarks
(
&
query
)
...
...
orm/orm_raw.go
View file @
7b542e61
...
...
@@ -342,7 +342,13 @@ func (o *rawSet) QueryRow(containers ...interface{}) error {
for
_
,
col
:=
range
columns
{
if
fi
:=
sMi
.
fields
.
GetByColumn
(
col
);
fi
!=
nil
{
value
:=
reflect
.
ValueOf
(
columnsMp
[
col
])
.
Elem
()
.
Interface
()
o
.
setFieldValue
(
ind
.
FieldByIndex
(
fi
.
fieldIndex
),
value
)
field
:=
ind
.
FieldByIndex
(
fi
.
fieldIndex
)
if
fi
.
fieldType
&
IsRelField
>
0
{
mf
:=
reflect
.
New
(
fi
.
relModelInfo
.
addrField
.
Elem
()
.
Type
())
field
.
Set
(
mf
)
field
=
mf
.
Elem
()
.
FieldByIndex
(
fi
.
relModelInfo
.
fields
.
pk
.
fieldIndex
)
}
o
.
setFieldValue
(
field
,
value
)
}
}
}
else
{
...
...
@@ -480,7 +486,13 @@ func (o *rawSet) QueryRows(containers ...interface{}) (int64, error) {
for
_
,
col
:=
range
columns
{
if
fi
:=
sMi
.
fields
.
GetByColumn
(
col
);
fi
!=
nil
{
value
:=
reflect
.
ValueOf
(
columnsMp
[
col
])
.
Elem
()
.
Interface
()
o
.
setFieldValue
(
ind
.
FieldByIndex
(
fi
.
fieldIndex
),
value
)
field
:=
ind
.
FieldByIndex
(
fi
.
fieldIndex
)
if
fi
.
fieldType
&
IsRelField
>
0
{
mf
:=
reflect
.
New
(
fi
.
relModelInfo
.
addrField
.
Elem
()
.
Type
())
field
.
Set
(
mf
)
field
=
mf
.
Elem
()
.
FieldByIndex
(
fi
.
relModelInfo
.
fields
.
pk
.
fieldIndex
)
}
o
.
setFieldValue
(
field
,
value
)
}
}
}
else
{
...
...
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