From 86e6e59831ca299ce119353882cec927df84a408 Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Fri, 5 Feb 2016 10:30:26 +0000 Subject: [PATCH] Add change --- scripts/build/_sql/CustomerFilters.sql | 9 +++++++++ scripts/build/_sql/EnrichissementIdentifiants.sql | 4 ++++ scripts/jobs/enrichissement.php | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 scripts/build/_sql/CustomerFilters.sql diff --git a/scripts/build/_sql/CustomerFilters.sql b/scripts/build/_sql/CustomerFilters.sql new file mode 100644 index 00000000..6edeeaa2 --- /dev/null +++ b/scripts/build/_sql/CustomerFilters.sql @@ -0,0 +1,9 @@ +CREATE TABLE `customer_filters` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `idClient` int(11) NOT NULL COMMENT 'ID du client', + `idService` int(11) NOT NULL COMMENT 'ID du service', + `filterName` varchar(20) NOT NULL COMMENT 'Nom du filtre', + `filterValue` longtext NOT NULL COMMENT 'Valeurs prédéfinies du filtre', + `dateAdded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='Filtre prédéfinie sur le compte client' \ No newline at end of file diff --git a/scripts/build/_sql/EnrichissementIdentifiants.sql b/scripts/build/_sql/EnrichissementIdentifiants.sql index 2787a1f7..0ae5d158 100644 --- a/scripts/build/_sql/EnrichissementIdentifiants.sql +++ b/scripts/build/_sql/EnrichissementIdentifiants.sql @@ -15,3 +15,7 @@ CREATE TABLE IF NOT EXISTS `enrichissement_identifiants` ( `fichier` varchar(100) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + + +ALTER TABLE `enrichissement_identifiants` ADD `fichierParams` VARCHAR(100) NOT NULL COMMENT 'Paramètres pour le fichier en sortie (type, separator, encoding))' AFTER `fichier`; +ALTER TABLE `enrichissement_identifiants` CHANGE `fichierParams` `fichierParams` VARCHAR(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'Paramètres pour le fichier en sortie (type, separator, encoding))'; \ No newline at end of file diff --git a/scripts/jobs/enrichissement.php b/scripts/jobs/enrichissement.php index 50b1efa5..fc90f629 100644 --- a/scripts/jobs/enrichissement.php +++ b/scripts/jobs/enrichissement.php @@ -179,7 +179,7 @@ foreach ( $dataProfil as $item ) { // --- Construction de la requete SQL if ( array_key_exists('sql', $field) ) { - $columns[] = $field['sql']; + $columns[] = new Zend_Db_Expr($field['sql']); } else { $columns[] = $field['column'].' AS '.$item; }