email_me is integer, fixes: General error: 1366 Incorrect integer val…

…ue: '' for column 'email_me' at row 1 https://travis-ci.org/piwik/piwik/jobs/25436325
matomo-org · May 18, 2014 · 6a461e8 · 6a461e8
1 parent 2a0c807
commit 6a461e8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Model.php b/Model.php
@@ -391,7 +391,7 @@ private function completeAlerts($alerts)
         foreach ($alerts as &$alert) {
             $alert['additional_emails'] = json_decode($alert['additional_emails']);
             $alert['phone_numbers']     = json_decode($alert['phone_numbers']);
-            $alert['email_me']          = (bool) $alert['email_me'];
+            $alert['email_me']          = (int) $alert['email_me'];
             $alert['compared_to']       = (int) $alert['compared_to'];
             $alert['id_sites']          = $this->getDefinedSiteIds($alert['idalert']);
         }

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
@@ -463,7 +463,7 @@ public function test_triggerAlert_getTriggeredAlertsForPeriod_ShouldMarkAlertAsT
             'value_old' => 48,
             'additional_emails' => array('test1@example.com', 'test2@example.com'),
             'phone_numbers' => array(),
-            'email_me' => false,
+            'email_me' => 0,
             'compared_to' => 1,
             'id_sites' => array(1, 2)
         );

diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
@@ -210,7 +210,7 @@ private function buildAlert($id, $name, $period = 'week', $idSite = 1, $siteName
             'metric_matched' => $metricMatched,
             'additional_emails' => array('test5@example.com'),
             'phone_numbers' => array('+1234567890', '232'),
-            'email_me' => true,
+            'email_me' => 1,
             'value_new' => '4493.000',
             'value_old' => '228.128',
             'ts_triggered' => time()

diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -193,7 +193,7 @@ public function test_triggerAlert_getTriggeredAlertsForPeriod_ShouldMarkAlertAsT
             'value_old' => 48.519,
             'additional_emails' => array('test1@example.com', 'test2@example.com'),
             'phone_numbers' => array('0123456789'),
-            'email_me' => false,
+            'email_me' => 0,
             'id_sites' => array(1, 2)
         );
 

diff --git a/tests/NotifierTest.php b/tests/NotifierTest.php
@@ -200,7 +200,7 @@ private function buildAlert($id, $name, $period = 'week', $idSite = 1, $siteName
             'metric_matched' => $metricMatched,
             'additional_emails' => array('test5@example.com'),
             'phone_numbers' => array('+1234567890', '232'),
-            'email_me' => true,
+            'email_me' => 1,
             'value_new' => '4493.000',
             'value_old' => '228.128',
             'ts_triggered' => time()