Avoid warnings on empty transformed resultset

carscx · May 18, 2016 · 2b30959 · 2b30959
1 parent f2954de
commit 2b30959
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/api.php b/api.php
@@ -1535,23 +1535,25 @@ public function __construct($config) {
 	public static function php_crud_api_transform(&$tables) {
 		$get_objects = function (&$tables,$table_name,$where_index=false,$match_value=false) use (&$get_objects) {
 			$objects = array();
-			foreach ($tables[$table_name]['records'] as $record) {
-				if ($where_index===false || $record[$where_index]==$match_value) {
-					$object = array();
-					foreach ($tables[$table_name]['columns'] as $index=>$column) {
-						$object[$column] = $record[$index];
-						foreach ($tables as $relation=>$reltable) {
-							if (isset($reltable['relations'])) {
-								foreach ($reltable['relations'] as $key=>$target) {
-									if ($target == "$table_name.$column") {
-										$column_indices = array_flip($reltable['columns']);
-										$object[$relation] = $get_objects($tables,$relation,$column_indices[$key],$record[$index]);
+			if (isset($tables[$table_name]['records'])) {
+				foreach ($tables[$table_name]['records'] as $record) {
+					if ($where_index===false || $record[$where_index]==$match_value) {
+						$object = array();
+						foreach ($tables[$table_name]['columns'] as $index=>$column) {
+							$object[$column] = $record[$index];
+							foreach ($tables as $relation=>$reltable) {
+								if (isset($reltable['relations'])) {
+									foreach ($reltable['relations'] as $key=>$target) {
+										if ($target == "$table_name.$column") {
+											$column_indices = array_flip($reltable['columns']);
+											$object[$relation] = $get_objects($tables,$relation,$column_indices[$key],$record[$index]);
+										}
 									}
 								}
 							}
 						}
+						$objects[] = $object;
 					}
-					$objects[] = $object;
 				}
 			}
 			return $objects;

diff --git a/lib/php_crud_api_transform.php b/lib/php_crud_api_transform.php
@@ -2,23 +2,25 @@
 function php_crud_api_transform(&$tables) {
 	$get_objects = function (&$tables,$table_name,$where_index=false,$match_value=false) use (&$get_objects) {
 		$objects = array();
-		foreach ($tables[$table_name]['records'] as $record) {
-			if ($where_index===false || $record[$where_index]==$match_value) {
-				$object = array();
-				foreach ($tables[$table_name]['columns'] as $index=>$column) {
-					$object[$column] = $record[$index];
-					foreach ($tables as $relation=>$reltable) {
-						if (isset($reltable['relations'])) {
-							foreach ($reltable['relations'] as $key=>$target) {
-								if ($target == "$table_name.$column") {
-									$column_indices = array_flip($reltable['columns']);
-									$object[$relation] = $get_objects($tables,$relation,$column_indices[$key],$record[$index]);
+		if (isset($tables[$table_name]['records'])) {
+			foreach ($tables[$table_name]['records'] as $record) {
+				if ($where_index===false || $record[$where_index]==$match_value) {
+					$object = array();
+					foreach ($tables[$table_name]['columns'] as $index=>$column) {
+						$object[$column] = $record[$index];
+						foreach ($tables as $relation=>$reltable) {
+							if (isset($reltable['relations'])) {
+								foreach ($reltable['relations'] as $key=>$target) {
+									if ($target == "$table_name.$column") {
+										$column_indices = array_flip($reltable['columns']);
+										$object[$relation] = $get_objects($tables,$relation,$column_indices[$key],$record[$index]);
+									}
 								}
 							}
 						}
 					}
+					$objects[] = $object;
 				}
-				$objects[] = $object;
 			}
 		}
 		return $objects;