diff --git a/.travis.yml b/.travis.yml index 90a39dad13..cb25c24b65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_script: - echo "extension=zmq.so" > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/zmq.ini - yes | pecl install imagick - 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.wait_timeout= 999999;' - git clone git://github.com/alchemy-fr/Phraseanet-Extension.git diff --git a/lib/Alchemy/Phrasea/Model/Entities/ApiApplication.php b/lib/Alchemy/Phrasea/Model/Entities/ApiApplication.php index 87904c4224..c32107beab 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/ApiApplication.php +++ b/lib/Alchemy/Phrasea/Model/Entities/ApiApplication.php @@ -80,14 +80,14 @@ class ApiApplication /** * @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; /** * @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; diff --git a/lib/Alchemy/Phrasea/Model/Entities/Token.php b/lib/Alchemy/Phrasea/Model/Entities/Token.php index 62ca7260ef..cb0cd40aee 100644 --- a/lib/Alchemy/Phrasea/Model/Entities/Token.php +++ b/lib/Alchemy/Phrasea/Model/Entities/Token.php @@ -22,7 +22,7 @@ class Token { /** * @ORM\Id - * @ORM\Column(type="string", length=16) + * @ORM\Column(type="string", length=128) */ private $value; diff --git a/lib/classes/databox/field.php b/lib/classes/databox/field.php index c60dec337b..c868f01b54 100644 --- a/lib/classes/databox/field.php +++ b/lib/classes/databox/field.php @@ -996,12 +996,12 @@ class databox_field implements cache_cacheableInterface } $sql = "INSERT INTO metadatas_structure - (`id`, `name`, `src`, `readonly`, `indexable`, `type`, `tbranch`, + (`id`, `name`, `src`, `readonly`, `required`, `indexable`, `type`, `tbranch`, `thumbtitle`, `multi`, `business`, `aggregable`, - `report`, `sorter`) - VALUES (null, :name, '', 0, 1, 'string', '', + `report`, `sorter`, `separator`) + VALUES (null, :name, '', 0, 0, 1, 'string', '', null, :multi, - 0, 0, 1, :sorter)"; + 0, 0, 1, :sorter, '')"; $name = self::generateName($name); diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index f2a36d7f61..ea7cc2e024 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -1974,18 +1974,15 @@ pwd char(64) YES - - viewname char(128) - + YES -