[#4523] Log SQL errors in xPDOObject::loadCollectionGraph()

modxcms · Nov 29, 2011 · a2a5bcb · a2a5bcb
1 parent f4c95dd
commit a2a5bcb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/xpdo/changelog.txt b/xpdo/changelog.txt
@@ -1,5 +1,6 @@
 This file shows the changes in this release of xPDO.
 
+- [#4523] Log SQL errors in xPDOObject::loadCollectionGraph
 - [#6095] Log errors when xPDOManager::addField/alterField fail
 - [#6098] Fix issue with preg_replace in xPDO::parseBindings() method
 - [#5970] Fix issue with subpackages and derived classes that would cause nonsensical error

diff --git a/xpdo/om/xpdoobject.class.php b/xpdo/om/xpdoobject.class.php
@@ -529,9 +529,14 @@ public static function loadCollectionGraph(xPDO & $xpdo, $className, $graph, $cr
                 $fromCache = !empty($rows);
             }
             if (!$fromCache) {
-                $stmt= $query->prepare();
+                if ($query->prepare()) {
-                if ($stmt && $stmt->execute()) {
+                    if ($query->stmt->execute()) {
-                    $objCollection= $query->hydrateGraph($stmt, $cacheFlag);
+                        $objCollection= $query->hydrateGraph($query->stmt, $cacheFlag);
+                    } else {
+                        $xpdo->log(xPDO::LOG_LEVEL_ERROR, "Error {$query->stmt->errorCode()} executing query: {$query->sql} - " . print_r($query->stmt->errorInfo(), true));
+                    }
+                } else {
+                    $xpdo->log(xPDO::LOG_LEVEL_ERROR, "Error {$xpdo->errorCode()} preparing statement: {$query->sql} - " . print_r($xpdo->errorInfo(), true));
                 }
             } elseif (!empty($rows)) {
                 $objCollection= $query->hydrateGraph($rows, $cacheFlag);