Fix strict mode sql issue

This commit is contained in:
Nicolas Le Goff
2015-02-23 16:23:34 +01:00
parent 6b89c123e3
commit 5a55732b46
5 changed files with 9 additions and 12 deletions

View File

@@ -22,7 +22,7 @@ before_script:
- echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini
- yes | pecl install imagick - yes | pecl install imagick
- mysql -e 'create database update39_test;create database ab_test;create database db_test;' - mysql -e 'create database update39_test;create database ab_test;create database db_test;'
- mysql -e 'SET @@global.sql_mode= "";' - mysql -e 'SET @@global.sql_mode= STRICT_ALL_TABLES;'
- mysql -e 'SET @@global.max_allowed_packet= 33554432;' - mysql -e 'SET @@global.max_allowed_packet= 33554432;'
- mysql -e 'SET @@global.wait_timeout= 999999;' - mysql -e 'SET @@global.wait_timeout= 999999;'
- git clone git://github.com/alchemy-fr/Phraseanet-Extension.git - git clone git://github.com/alchemy-fr/Phraseanet-Extension.git

View File

@@ -80,14 +80,14 @@ class ApiApplication
/** /**
* @var string * @var string
* *
* @ORM\Column(name="client_id", type="string", length=32, nullable=false) * @ORM\Column(name="client_id", type="string", length=128, nullable=false)
*/ */
private $clientId; private $clientId;
/** /**
* @var string * @var string
* *
* @ORM\Column(name="client_secret", type="string", length=32, nullable=false) * @ORM\Column(name="client_secret", type="string", length=128, nullable=false)
*/ */
private $clientSecret; private $clientSecret;

View File

@@ -22,7 +22,7 @@ class Token
{ {
/** /**
* @ORM\Id * @ORM\Id
* @ORM\Column(type="string", length=16) * @ORM\Column(type="string", length=128)
*/ */
private $value; private $value;

View File

@@ -996,12 +996,12 @@ class databox_field implements cache_cacheableInterface
} }
$sql = "INSERT INTO metadatas_structure $sql = "INSERT INTO metadatas_structure
(`id`, `name`, `src`, `readonly`, `indexable`, `type`, `tbranch`, (`id`, `name`, `src`, `readonly`, `required`, `indexable`, `type`, `tbranch`,
`thumbtitle`, `multi`, `business`, `aggregable`, `thumbtitle`, `multi`, `business`, `aggregable`,
`report`, `sorter`) `report`, `sorter`, `separator`)
VALUES (null, :name, '', 0, 1, 'string', '', VALUES (null, :name, '', 0, 0, 1, 'string', '',
null, :multi, null, :multi,
0, 0, 1, :sorter)"; 0, 0, 1, :sorter, '')";
$name = self::generateName($name); $name = self::generateName($name);

View File

@@ -1974,18 +1974,15 @@
<name>pwd</name> <name>pwd</name>
<type>char(64)</type> <type>char(64)</type>
<null>YES</null> <null>YES</null>
<extra></extra> <extra></extra>
<default></default> <default></default>
<comment></comment> <comment></comment>
</field> </field>
<field> <field>
<name>viewname</name> <name>viewname</name>
<type>char(128)</type> <type>char(128)</type>
<null></null> <null>YES</null>
<extra></extra> <extra></extra>
<default></default> <default></default>
<comment></comment> <comment></comment>
</field> </field>