No default sql value on text fields

diff --git a/galette/install/scripts/mysql.sql b/galette/install/scripts/mysql.sql
index 6fe07b0c1c7832a6680ea11a525b32fc365a7cde..9df82ad353fc1580ccc667d49ee1cd1dffac6e53 100644 (file)
--- a/galette/install/scripts/mysql.sql
+++ b/galette/install/scripts/mysql.sql
@@ -14,7 +14,7 @@ CREATE TABLE galette_adherents (
   titre_adh int(10) unsigned default NULL,
   ddn_adh date default '1901-01-01',
   sexe_adh tinyint(1) NOT NULL default '0',
-  adresse_adh text NOT NULL default '',
+  adresse_adh text NOT NULL,
   adresse2_adh varchar(150) default NULL, -- TODO: remove
   cp_adh varchar(10) NOT NULL default '',
   ville_adh varchar(200) NOT NULL default '',

diff --git a/galette/install/scripts/upgrade-to-0.95-mysql.sql b/galette/install/scripts/upgrade-to-0.95-mysql.sql
index a46059e34c9158ac2bdab47dc0e4c68e5bb94955..bbfaa5d0af8e954330077f6c7457c18eec7a12e0 100644 (file)
--- a/galette/install/scripts/upgrade-to-0.95-mysql.sql
+++ b/galette/install/scripts/upgrade-to-0.95-mysql.sql
@@ -2,7 +2,7 @@
 ALTER TABLE galette_adherents CHANGE nom_adh nom_adh varchar(255) NOT NULL default '';
 ALTER TABLE galette_adherents CHANGE prenom_adh prenom_adh varchar(255) NOT NULL default '';
 ALTER TABLE galette_adherents CHANGE pseudo_adh pseudo_adh varchar(255) NOT NULL default '';
-ALTER TABLE galette_adherents CHANGE adresse_adh adresse_adh text NOT NULL default '';
+ALTER TABLE galette_adherents CHANGE adresse_adh adresse_adh text NOT NULL;
 ALTER TABLE galette_adherents CHANGE ville_adh ville_adh varchar(200) NOT NULL default '';
 ALTER TABLE galette_adherents CHANGE pays_adh pays_adh varchar(200) default NULL;
 ALTER TABLE galette_adherents CHANGE tel_adh tel_adh varchar(50) default NULL;

diff --git a/tests/Galette/Core/tests/units/Password.php b/tests/Galette/Core/tests/units/Password.php
index 964cf599846bad285b09c8169082b87af24236de..2ffb7db11573ab546bb82ee36bb57bd0a0ae7836 100644 (file)
--- a/tests/Galette/Core/tests/units/Password.php
+++ b/tests/Galette/Core/tests/units/Password.php
@@ -115,7 +115,8 @@ class Password extends atoum
         $insert->values(
             [
                 'nom_adh'   => 'Test password user',
-                'login_adh' => 'test_password_user'
+                'login_adh' => 'test_password_user',
+                'adresse_adh' => 'The address'
             ]
         );
         $this->zdb->execute($insert);