Lib: Enhanced DoQuery and GetSchema, and tests

- Added support for normalizing variables and chdbids in DoQuery and
  GetSchema responses. This is a breaking change.
- Enhanced tests to test expected and actual data structures

Author: tflanagan

quickbase.php

@@ -542,6 +542,33 @@ final public static function API_DoQuery(&$query, &$results){
 					$results['table']['records'][$i] = $newRecord;
 				}
 			}
+
+			if(isset($results['table']['variables']) && isset($results['table']['variables']['var'])){
+				if(isset($results['table']['variables']['var']['_'])){
+					$results['table']['variables']['var'] = array( $results['table']['variables']['var'] );
+				}
+
+				$vars = array();
+
+				foreach($results['table']['variables']['var'] as $key => $value){
+					$vars[$value['name']] = $value['_'];
+				}
+
+				$results['table']['variables'] = $vars;
+			}
+
+			if(isset($results['table']['chdbids'])){
+				if(isset($results['table']['chdbids']['_'])){
+					$results['table']['chdbids'] = array( $results['table']['chdbids'] );
+				}
+
+				for($i = 0, $l = count($results['table']['chdbids']); $i < $l; ++$i){
+					$results['table']['chdbids'][$i] = array(
+						'name' => $results['table']['chdbids'][$i]['name'],
+						'dbid' => $results['table']['chdbids'][$i]['_']
+					);
+				}
+			}
 		}else{
 			if(isset($results['record'])){
 				$results['records'] = $results['record'];
@@ -585,13 +612,31 @@ final public static function API_DoQuery(&$query, &$results){
 
 	final public static function API_GetSchema(&$query, &$results){
 		if(isset($results['table']['chdbids'])){
+			if(isset($results['table']['chdbids']['_'])){
+				$results['table']['chdbids'] = array( $results['table']['chdbids'] );
+			}
+
 			for($i = 0, $l = count($results['table']['chdbids']); $i < $l; ++$i){
 				$results['table']['chdbids'][$i] = array(
 					'name' => $results['table']['chdbids'][$i]['name'],
 					'dbid' => $results['table']['chdbids'][$i]['_']
 				);
 			}
 		}
+
+		if(isset($results['table']['variables']) && isset($results['table']['variables']['var'])){
+			if(isset($results['table']['variables']['var']['_'])){
+				$results['table']['variables']['var'] = array( $results['table']['variables']['var'] );
+			}
+
+			$vars = array();
+
+			foreach($results['table']['variables']['var'] as $key => $value){
+				$vars[$value['name']] = $value['_'];
+			}
+
+			$results['table']['variables'] = $vars;
+		}
 	}
 
 	// final public static function API_GetRecordAsHTML(&$query, &$results){ }

tests/API_AddField.php

@@ -15,15 +15,37 @@
  * limitations under the License.
 */
 
-$response = $qb->api('API_AddField', array(
+$expected = array(
+	'action' => 'API_AddField',
+	'errcode' => 0,
+	'errtext' => 'No error',
+	'fid' => 0,
+	'label' => 'Test Field'
+);
+
+$actual = $qb->api('API_AddField', array(
 	'dbid' => getenv('dbid'),
 	'label' => 'Test Field',
 	'type' => 'text'
 ));
 
-$qb->api('API_DeleteField', array(
+if(!objStrctMatch($actual, $expected)){
+	throw new Exception('Mismatched API_AddField Data Structure');
+}
+
+$expected = array(
+	'action' => 'API_DeleteField',
+	'errcode' => 0,
+	'errtext' => 'No error'
+);
+
+$actual = $qb->api('API_DeleteField', array(
 	'dbid' => getenv('dbid'),
-	'fid' => $response['fid']
+	'fid' => $actual['fid']
 ));
 
+if(!objStrctMatch($actual, $expected)){
+	throw new Exception('Mismatched API_DeleteField Data Structure');
+}
+
 ?>

tests/API_AddRecord.php

@@ -15,13 +15,36 @@
  * limitations under the License.
 */
 
-$response = $qb->api('API_AddRecord', array(
+$expected = array(
+	'action' => 'API_AddRecord',
+	'errcode' => 0,
+	'errtext' => 'No error',
+	'rid' => 0,
+	'update_id' => 0
+);
+
+$actual = $qb->api('API_AddRecord', array(
 	'dbid' => getenv('dbid')
 ));
 
-$qb->api('API_DeleteRecord', array(
+if(!objStrctMatch($actual, $expected)){
+	throw new Exception('Mismatched API_AddRecord Data Structure');
+}
+
+$expected = array(
+	'action' => 'API_DeleteRecord',
+	'errcode' => 0,
+	'errtext' => 'No error',
+	'rid' => 0
+);
+
+$actual = $qb->api('API_DeleteRecord', array(
 	'dbid' => getenv('dbid'),
-	'rid' => $response['rid']
+	'rid' => $actual['rid']
 ));
 
+if(!objStrctMatch($actual, $expected)){
+	throw new Exception('Mismatched API_DeleteRecord Data Structure');
+}
+
 ?>

tests/API_Authenticate.php

@@ -15,9 +15,21 @@
  * limitations under the License.
 */
 
-$qb->api('API_Authenticate', array(
+$expected = array(
+	'action' => 'API_Authenticate',
+	'errcode' => 0,
+	'errtext' => 'No error',
+	'ticket' => '',
+	'userid' => ''
+);
+
+$actual = $qb->api('API_Authenticate', array(
 	'username' => getenv('username'),
 	'password' => getenv('password')
 ));
 
+if(!objStrctMatch($actual, $expected)){
+	throw new Exception('Mismatched API_Authenticate Data Structure');
+}
+
 ?>