update readme

[bdrem.git] / src / bdrem / Source / Sql.php

diff --git a/src/bdrem/Source/Sql.php b/src/bdrem/Source/Sql.php
index ef2d3a0af59f670633b5b4557c7fb295a7a9968b..57f9a800b1e0281f4eaa6d91b79ea8e599254d55 100644 (file)
--- a/src/bdrem/Source/Sql.php
+++ b/src/bdrem/Source/Sql.php
@@ -24,45 +24,59 @@ class Source_Sql
     /**
      * @param string $strDate Date the events shall be found for, YYYY-MM-DD
      */
-    public function getEvents($strDate, $nDaysBefore, $nDaysAfter)
+    public function getEvents($strDate, $nDaysPrevious, $nDaysNext)
     {
-        $dbh = new \PDO($this->dsn, $this->user, $this->password);
-        $arDays = $this->getDates($strDate, $nDaysBefore, $nDaysAfter);
+        $dbh = new \PDO(
+            $this->dsn, $this->user, $this->password,
+            array(\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION)
+        );
+        $arDays = $this->getDates($strDate, $nDaysPrevious, $nDaysNext);
         $arEvents = array();
 
         foreach ($this->fields['date'] as $field => $typeName) {
-            $fieldSql = 'CONCAT('
-                . 'EXTRACT(MONTH FROM ' . $field . '),'
-                . '"-",'
-                . 'EXTRACT(DAY FROM ' . $field . ')'
-                . ') = ';
+            if (substr($this->dsn, 0, 5) == 'dblib') {
+                //MS SQL Server does of course cook its own sht
+                $sqlMonth = 'DATEPART(month, ' . $field . ')';
+                $sqlDay = 'DATEPART(day, ' . $field . ')';
+            } else {
+                $sqlMonth = 'EXTRACT(MONTH FROM ' . $field . ')';
+                $sqlDay = 'EXTRACT(DAY FROM ' . $field . ')';
+            }
 
             $parts = array();
-            foreach ($arDays as $day) {
-                $parts[] = $fieldSql . $dbh->quote($day);
+            foreach ($arDays as $month => $days) {
+                $parts[] = '('
+                    . $sqlMonth . ' = ' . $dbh->quote($month, \PDO::PARAM_INT)
+                    . ' AND ' . $sqlDay . ' >= '
+                    . $dbh->quote(min($days), \PDO::PARAM_INT)
+                    . ' AND ' . $sqlDay . ' <= '
+                    . $dbh->quote(max($days), \PDO::PARAM_INT)
+                    . ')';
             }
             $sql = 'SELECT ' . $field . ' AS e_date'
-                . ', ' . $this->fields['name'] . ' AS e_name'
+                . ', ' . implode(', ', (array) $this->fields['name'])
                 . ' FROM ' . $this->table
                 . ' WHERE '
                 . implode(' OR ', $parts);
 
             $res = $dbh->query($sql);
-            if ($res === false) {
-                $errorInfo = $dbh->errorInfo();
-                throw new \Exception(
-                    'SQL error #' . $errorInfo[0]
-                    . ': ' . $errorInfo[1]
-                    . ': ' . $errorInfo[2],
-                    (int) $errorInfo[1]
-                );
-            }
             while ($row = $res->fetchObject()) {
+                $arNameData = array();
+                foreach ((array) $this->fields['name'] as $fieldName) {
+                    $arNameData[] = $row->$fieldName;
+                }
+                $name = call_user_func_array(
+                    'sprintf',
+                    array_merge(
+                        array($this->fields['nameFormat']),
+                        $arNameData
+                    )
+                );
                 $event = new Event(
-                    $row->e_name, $typeName, 
+                    $name, $typeName,
                     str_replace('0000', '????', $row->e_date)
                 );
-                if ($event->isWithin($strDate, $nDaysBefore, $nDaysAfter)) {
+                if ($event->isWithin($strDate, $nDaysPrevious, $nDaysNext)) {
                     $arEvents[] = $event;
                 }
             }
@@ -70,14 +84,17 @@ class Source_Sql
         return $arEvents;
     }
 
-    protected function getDates($strDate, $nDaysBefore, $nDaysAfter)
+    /**
+     * @return array Key is the month, value an array of days
+     */
+    protected function getDates($strDate, $nDaysPrevious, $nDaysNext)
     {
-        $ts = strtotime($strDate) - 86400 * $nDaysBefore;
-        $numDays = $nDaysBefore + $nDaysAfter;
+        $ts = strtotime($strDate) - 86400 * $nDaysPrevious;
+        $numDays = $nDaysPrevious + $nDaysNext;
 
         $arDays = array();
         do {
-            $arDays[] = date('n-j', $ts);
+            $arDays[(int) date('n', $ts)][] = (int) date('j', $ts);
             $ts += 86400;
         } while (--$numDays >= 0);
         return $arDays;