From 8a9ac6953f3298e242b0c016cd626653a42d7e7e Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Sat, 8 May 2021 11:29:10 +0200 Subject: [PATCH] No default sql value on text fields --- galette/install/scripts/mysql.sql | 2 +- galette/install/scripts/upgrade-to-0.95-mysql.sql | 2 +- tests/Galette/Core/tests/units/Password.php | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/galette/install/scripts/mysql.sql b/galette/install/scripts/mysql.sql index 6fe07b0c1..9df82ad35 100644 --- 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 a46059e34..bbfaa5d0a 100644 --- 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 964cf5998..2ffb7db11 100644 --- 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); -- 2.39.2