Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
7b908aa8
Commit
7b908aa8
authored
Apr 21, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #2853: ActiveRecord did not handle resource-typed columns well
parent
bea8f946
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
ColumnSchema.php
framework/db/ColumnSchema.php
+1
-1
Schema.php
framework/db/Schema.php
+3
-1
No files found.
framework/CHANGELOG.md
View file @
7b908aa8
...
...
@@ -6,6 +6,7 @@ Yii Framework 2 Change Log
-
Bug #2563: Theming is not working if the path map of the theme contains ".." or "." in the paths (qiangxue)
-
Bug #2801: Fixed the issue that GridView gets footer content before data cells content (ElisDN)
-
Bug #2853: ActiveRecord did not handle resource-typed columns well (chris68, qiangxue)
-
Bug #3042:
`yii\widgets\Pjax`
should end application right after it finishes responding to a pjax request (qiangxue)
-
Bug #3066:
`yii\db\mssql\Schema::getTableSchema()`
should return null when the table does not exist (qiangxue)
-
Bug #3091: Fixed inconsistent treatment of
`Widget::run()`
when a widget is used as a container and as a self-contained object (qiangxue)
...
...
framework/db/ColumnSchema.php
View file @
7b908aa8
...
...
@@ -94,7 +94,7 @@ class ColumnSchema extends Object
}
switch
(
$this
->
phpType
)
{
case
'string'
:
return
(
string
)
$value
;
return
is_resource
(
$value
)
?
$value
:
(
string
)
$value
;
case
'integer'
:
return
(
integer
)
$value
;
case
'boolean'
:
...
...
framework/db/Schema.php
View file @
7b908aa8
...
...
@@ -452,11 +452,13 @@ abstract class Schema extends Object
*/
protected
function
getColumnPhpType
(
$column
)
{
static
$typeMap
=
[
// abstract type => php type
static
$typeMap
=
[
// abstract type => php type
'smallint'
=>
'integer'
,
'integer'
=>
'integer'
,
'boolean'
=>
'boolean'
,
'float'
=>
'double'
,
'binary'
=>
'resource'
,
];
if
(
isset
(
$typeMap
[
$column
->
type
]))
{
if
(
$column
->
type
===
'integer'
)
{
...
...
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