src,tests: added standard response for API_ImportFromCSV, updated tests to work with new app

Author: tflanagan

quickbase.php

@@ -888,7 +888,35 @@ final public static function API_GrantedDBs(&$query, &$results){
 
 	// final public static function API_GrantedDBsForGroup(&$query, &$results){ }
 	// final public static function API_GrantedGroups(&$query, &$results){ }
-	// final public static function API_ImportFromCSV(&$query, &$results){ }
+
+	final public static function API_ImportFromCSV(&$query, &$results){
+		if(isset($results['rids'])){
+			if(isset($results['rids']['fields'])){
+				$results['rids'] = array_map(function($record){
+					foreach($record['field'] as $field){
+						$record[$field['id']] = $field['_'];
+					}
+
+					unset($record['field']);
+
+					return $record;
+				}, $results['rids']['fields']);
+			}else{
+				$results['rids'] = array_map(function($record){
+					$ret = array(
+						'rid' => $record['_']
+					);
+
+					if(isset($record['update_id'])){
+						$ret['update_id'] = $record['update_id'];
+					}
+
+					return $ret;
+				}, $results['rids']);
+			}
+		}
+	}
+
 	// final public static function API_ProvisionUser(&$query, &$results){ }
 	// final public static function API_PurgeRecords(&$query, &$results){ }
 	// final public static function API_RemoveGroupFromRole(&$query, &$results){ }

tests/API_DoQuery.php

@@ -33,21 +33,24 @@
 			'next_field_id' => 0,
 			'next_query_id' => 0,
 			'def_sort_fid' => 0,
-			'def_sort_order' => 0
+			'def_sort_order' => 0,
+			'key_fid' => 0,
+			'single_record_name' => '',
+			'plural_record_name' => ''
 		),
 		'variables' => array(
 			'test' => 'test'
 		),
 		'queries' => array(
 			array(
 				'id' => 1,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'nos.',
 				'qytype' => 'table',
 				'qyname' => 'List All'
 			), array(
 				'id' => 2,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'so-D.onlynew.nos.',
 				'qytype' => 'table',
 				'qyname' => 'List Changes',

tests/API_FindDBByName.php

@@ -25,7 +25,7 @@
 
 /* Main */
 $actual = $qb->api('API_FindDBByName', array(
-	'dbname' => 'Tristian\'s Application'
+	'dbname' => 'QuickBase Lib Test Application'
 ));
 
 if(!objStrctMatch($actual, $expected)){

tests/API_GetAppDTMInfo.php

@@ -27,16 +27,6 @@
 		'id' => ''
 	),
 	'tables' => array(
-		array(
-			'lastModifiedTime' => 0,
-			'lastRecModTime' => 0,
-			'id' => ''
-		),
-		array(
-			'lastModifiedTime' => 0,
-			'lastRecModTime' => 0,
-			'id' => ''
-		),
 		array(
 			'lastModifiedTime' => 0,
 			'lastRecModTime' => 0,

tests/API_GetDBPage.php

@@ -24,7 +24,7 @@
 
 $actual = $qb->api('API_GetDBPage', array(
 	'dbid' => getenv('appid'),
-	'pageID' => 2
+	'pageID' => 9
 ));
 
 if(!objStrctMatch($actual, $expected)){

tests/API_GetSchema.php

@@ -33,21 +33,24 @@
 			'next_field_id' => 0,
 			'next_query_id' => 0,
 			'def_sort_fid' => 0,
-			'def_sort_order' => 0
+			'def_sort_order' => 0,
+			'key_fid' => 0,
+			'single_record_name' => '',
+			'plural_record_name' => ''
 		),
 		'variables' => array(
 			'test' => ''
 		),
 		'queries' => array(
 			array(
 				'id' => 1,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'nos.',
 				'qytype' => 'table',
 				'qyname' => 'List All'
 			), array(
 				'id' => 2,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'so-D.onlynew.nos.',
 				'qytype' => 'table',
 				'qyname' => 'List Changes',

tests/API_UserRoles.php

@@ -20,63 +20,6 @@
 	'errcode' => 0,
 	'errtext' => 'No error',
 	'users' => array(
-		array(
-			'name' => '',
-			'lastAccess' => 0,
-			'lastAccessAppLocal' => '',
-			'firstName' => '',
-			'lastName' => '',
-			'roles' => array(
-				array(
-					'name' => '',
-					'access' => array(
-						'name' => '',
-						'id' => 0
-					),
-					'id' => 0
-				)
-			),
-			'type' => '',
-			'id' => ''
-		),
-		array(
-			'name' => '',
-			'lastAccess' => 0,
-			'lastAccessAppLocal' => '',
-			'firstName' => '',
-			'lastName' => '',
-			'roles' => array(
-				array(
-					'name' => '',
-					'access' => array(
-						'name' => '',
-						'id' => 0
-					),
-					'id' => 0
-				)
-			),
-			'type' => '',
-			'id' => ''
-		),
-		array(
-			'name' => '',
-			'lastAccess' => 0,
-			'lastAccessAppLocal' => '',
-			'firstName' => '',
-			'lastName' => '',
-			'roles' => array(
-				array(
-					'name' => '',
-					'access' => array(
-						'name' => '',
-						'id' => 0
-					),
-					'id' => 0
-				)
-			),
-			'type' => '',
-			'id' => ''
-		),
 		array(
 			'name' => '',
 			'lastAccess' => 0,

tests/curl_multi.php

@@ -33,21 +33,24 @@
 			'next_field_id' => 0,
 			'next_query_id' => 0,
 			'def_sort_fid' => 0,
-			'def_sort_order' => 0
+			'def_sort_order' => 0,
+			'key_fid' => 0,
+			'single_record_name' => '',
+			'plural_record_name' => ''
 		),
 		'variables' => array(
 			'test' => 'test'
 		),
 		'queries' => array(
 			array(
 				'id' => 1,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'nos.',
 				'qytype' => 'table',
 				'qyname' => 'List All'
 			), array(
 				'id' => 2,
-				'qycalst' => 0,
+				'qycalst' => '',
 				'qyopts' => 'so-D.onlynew.nos.',
 				'qytype' => 'table',
 				'qyname' => 'List Changes',