Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
Tomáš Trávníček
doctrine-dbal
Commits
25e695f6
Commit
25e695f6
authored
Dec 27, 2013
by
Steve Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add native JSON type declaration to platform
parent
2196da9c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
136 additions
and
2 deletions
+136
-2
AbstractPlatform.php
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
+25
-0
JsonArrayType.php
lib/Doctrine/DBAL/Types/JsonArrayType.php
+2
-2
TypeConversionTest.php
tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php
+2
-0
MockPlatform.php
tests/Doctrine/Tests/DBAL/Mocks/MockPlatform.php
+8
-0
AbstractPlatformTestCase.php
...octrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
+26
-0
JsonArrayTest.php
tests/Doctrine/Tests/DBAL/Types/JsonArrayTest.php
+73
-0
No files found.
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file @
25e695f6
...
...
@@ -268,6 +268,21 @@ abstract class AbstractPlatform
return
$this
->
getVarcharTypeDeclarationSQL
(
$field
);
}
/**
* Returns the SQL snippet to declare a JSON field.
*
* By default this maps directly to a CLOB and only maps to more
* special datatypes when the underlying databases support this datatype.
*
* @param array $field
*
* @return string
*/
public
function
getJsonTypeDeclarationSQL
(
array
$field
)
{
return
$this
->
getClobTypeDeclarationSQL
(
$field
);
}
/**
* @param integer $length
* @param boolean $fixed
...
...
@@ -2874,6 +2889,16 @@ abstract class AbstractPlatform
return
false
;
}
/**
* Does this platform have native JSON type.
*
* @return boolean
*/
public
function
hasNativeJsonType
()
{
return
false
;
}
/**
* @deprecated
* @todo Remove in 3.0
...
...
lib/Doctrine/DBAL/Types/JsonArrayType.php
View file @
25e695f6
...
...
@@ -34,7 +34,7 @@ class JsonArrayType extends Type
*/
public
function
getSQLDeclaration
(
array
$fieldDeclaration
,
AbstractPlatform
$platform
)
{
return
$platform
->
get
Clob
TypeDeclarationSQL
(
$fieldDeclaration
);
return
$platform
->
get
Json
TypeDeclarationSQL
(
$fieldDeclaration
);
}
/**
...
...
@@ -76,6 +76,6 @@ class JsonArrayType extends Type
*/
public
function
requiresSQLCommentHint
(
AbstractPlatform
$platform
)
{
return
true
;
return
!
$platform
->
hasNativeJsonType
()
;
}
}
tests/Doctrine/Tests/DBAL/Functional/TypeConversionTest.php
View file @
25e695f6
...
...
@@ -29,6 +29,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
$table
->
addColumn
(
'test_time'
,
'time'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_text'
,
'text'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_array'
,
'array'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_json_array'
,
'json_array'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_object'
,
'object'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_float'
,
'float'
,
array
(
'notnull'
=>
false
));
$table
->
addColumn
(
'test_decimal'
,
'decimal'
,
array
(
'notnull'
=>
false
,
'scale'
=>
2
,
'precision'
=>
10
));
...
...
@@ -61,6 +62,7 @@ class TypeConversionTest extends \Doctrine\Tests\DbalFunctionalTestCase
array
(
'time'
,
new
\DateTime
(
'10:10:10'
),
'DateTime'
),
array
(
'text'
,
str_repeat
(
'foo '
,
1000
),
'string'
),
array
(
'array'
,
array
(
'foo'
=>
'bar'
),
'array'
),
array
(
'json_array'
,
array
(
'foo'
=>
'bar'
),
'array'
),
array
(
'object'
,
$obj
,
'object'
),
array
(
'float'
,
1.5
,
'float'
),
array
(
'decimal'
,
1.55
,
'string'
),
...
...
tests/Doctrine/Tests/DBAL/Mocks/MockPlatform.php
View file @
25e695f6
...
...
@@ -31,6 +31,14 @@ class MockPlatform extends \Doctrine\DBAL\Platforms\AbstractPlatform
return
'DUMMYCLOB'
;
}
/**
* {@inheritdoc}
*/
public
function
getJsonTypeDeclarationSQL
(
array
$field
)
{
return
'DUMMYJSON'
;
}
/**
* {@inheritdoc}
*/
...
...
tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php
View file @
25e695f6
...
...
@@ -8,6 +8,7 @@ use Doctrine\DBAL\Platforms\AbstractPlatform;
use
Doctrine\DBAL\Schema\ForeignKeyConstraint
;
use
Doctrine\DBAL\Schema\Table
;
use
Doctrine\DBAL\Schema\TableDiff
;
use
Doctrine\DBAL\Types\Type
;
abstract
class
AbstractPlatformTestCase
extends
\Doctrine\Tests\DbalTestCase
{
...
...
@@ -575,4 +576,29 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
{
$this
->
_platform
->
getBinaryTypeDeclarationSQL
(
array
());
}
/**
* @group DBAL-553
*/
public
function
hasNativeJsonType
()
{
$this
->
assertFalse
(
$this
->
_platform
->
hasNativeJsonType
());
}
/**
* @group DBAL-553
*/
public
function
testReturnsJsonTypeDeclarationSQL
()
{
$column
=
array
(
'length'
=>
666
,
'notnull'
=>
true
,
'type'
=>
Type
::
getType
(
'json_array'
),
);
$this
->
assertSame
(
$this
->
_platform
->
getClobTypeDeclarationSQL
(
$column
),
$this
->
_platform
->
getJsonTypeDeclarationSQL
(
$column
)
);
}
}
tests/Doctrine/Tests/DBAL/Types/JsonArrayTest.php
0 → 100644
View file @
25e695f6
<?php
namespace
Doctrine\Tests\DBAL\Types
;
use
Doctrine\DBAL\Types\Type
;
use
Doctrine\Tests\DBAL\Mocks\MockPlatform
;
require_once
__DIR__
.
'/../../TestInit.php'
;
class
JsonArrayTest
extends
\Doctrine\Tests\DbalTestCase
{
/**
* @var \Doctrine\Tests\DBAL\Mocks\MockPlatform
*/
protected
$platform
;
/**
* @var \Doctrine\DBAL\Types\JsonArrayType
*/
protected
$type
;
/**
* {@inheritdoc}
*/
protected
function
setUp
()
{
$this
->
platform
=
new
MockPlatform
();
$this
->
type
=
Type
::
getType
(
'json_array'
);
}
public
function
testReturnsBindingType
()
{
$this
->
assertSame
(
\PDO
::
PARAM_STR
,
$this
->
type
->
getBindingType
());
}
public
function
testReturnsName
()
{
$this
->
assertSame
(
Type
::
JSON_ARRAY
,
$this
->
type
->
getName
());
}
public
function
testReturnsSQLDeclaration
()
{
$this
->
assertSame
(
'DUMMYJSON'
,
$this
->
type
->
getSQLDeclaration
(
array
(),
$this
->
platform
));
}
public
function
testJsonNullConvertsToPHPValue
()
{
$this
->
assertSame
(
array
(),
$this
->
type
->
convertToPHPValue
(
null
,
$this
->
platform
));
}
public
function
testJsonStringConvertsToPHPValue
()
{
$value
=
array
(
'foo'
=>
'bar'
,
'bar'
=>
'foo'
);
$databaseValue
=
json_encode
(
$value
);
$phpValue
=
$this
->
type
->
convertToPHPValue
(
$databaseValue
,
$this
->
platform
);
$this
->
assertEquals
(
$value
,
$phpValue
);
}
public
function
testJsonResourceConvertsToPHPValue
()
{
$value
=
array
(
'foo'
=>
'bar'
,
'bar'
=>
'foo'
);
$databaseValue
=
fopen
(
'data://text/plain;base64,'
.
base64_encode
(
json_encode
(
$value
)),
'r'
);
$phpValue
=
$this
->
type
->
convertToPHPValue
(
$databaseValue
,
$this
->
platform
);
$this
->
assertSame
(
$value
,
$phpValue
);
}
public
function
testRequiresSQLCommentHint
()
{
$this
->
assertTrue
(
$this
->
type
->
requiresSQLCommentHint
(
$this
->
platform
));
}
}
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