fixup! use proper types in API (fossar#879)

niol · Jun 22, 2017 · 9c04f8c · 9c04f8c
1 parent b1d4321
commit 9c04f8c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/daos/mysql/Statements.php b/daos/mysql/Statements.php
@@ -165,8 +165,12 @@ public function ensureRowTypes(array $rows, array $expectedRowTypes) {
                         case \daos\PARAM_CSV:
                             $value = explode(',', $row[$columnIndex]);
                             break;
+                        default:
+                            $value = null;
+                    }
+                    if ($value !== null) {
+                        $rows[$rowIndex][$columnIndex] = $value;
                     }
-                    $rows[$rowIndex][$columnIndex] = $value;
                 }
             }
         }

diff --git a/daos/pgsql/Statements.php b/daos/pgsql/Statements.php
@@ -98,6 +98,24 @@ public static function csvRowMatches($column, $value) {
      *         expected types
      */
     public function ensureRowTypes(array $rows, array $expectedRowTypes) {
-        return $rows; // pgsql returns correct PHP types
+        foreach ($rows as $rowIndex => $row) {
+            foreach ($expectedRowTypes as $columnIndex => $type) {
+                if (array_key_exists($columnIndex, $row)) {
+                    switch ($type) {
+                        // pgsql returns correct PHP types for INT and BOOL
+                        case \daos\PARAM_CSV:
+                            $value = explode(',', $row[$columnIndex]);
+                            break;
+                        default:
+                            $value = null;
+                    }
+                    if ($value !== null) {
+                        $rows[$rowIndex][$columnIndex] = $value;
+                    }
+                }
+            }
+        }
+
+        return $rows;
     }
 }