fix for #367

Author: mevdschee

api.php

@@ -1136,7 +1136,7 @@ protected function parseGetParameterArray($get,$name,$characters) {
 
 	protected function applyBeforeHandler(&$action,&$database,&$table,&$ids,&$callback,&$inputs) {
 		if (is_callable($callback,true)) {
-			$max = (is_array($ids)&&count($ids))?:count($inputs);
+			$max = is_array($ids)?count($ids):count($inputs);
 			$values = array('action'=>$action,'database'=>$database,'table'=>$table);
 			for ($i=0;$i<$max;$i++) {
 				$action = $values['action'];
@@ -1907,9 +1907,9 @@ protected function getParameters($settings) {
 
 		// reflection
 		list($tables,$collect,$select) = $this->findRelations($tables,$database,$auto_include);
-		$fields = $this->findFields($tables,$database);
-		if ($tenancy_function) $this->applyTenancyFunction($tenancy_function,$action,$database,$fields,$filters);
-		$fields = $this->limitFields($fields,$columns,$exclude,$select,$database);
+		$allFields = $this->findFields($tables,$database);
+		if ($tenancy_function) $this->applyTenancyFunction($tenancy_function,$action,$database,$allFields,$filters);
+		$fields = $this->limitFields($allFields,$columns,$exclude,$select,$database);
 
 		// permissions
 		if ($table_authorizer) $this->applyTableAuthorizer($table_authorizer,$action,$database,$tables);
@@ -1922,7 +1922,7 @@ protected function getParameters($settings) {
 		foreach ($inputs as $k=>$context) {
 			$input = $this->filterInputByFields($context,$fields[$tables[0]]);
 
-			if ($tenancy_function) $this->applyInputTenancy($tenancy_function,$action,$database,$tables[0],$input,$fields[$tables[0]]);
+			if ($tenancy_function) $this->applyInputTenancy($tenancy_function,$action,$database,$tables[0],$input,$allFields[$tables[0]]);
 			if ($input_sanitizer) $this->applyInputSanitizer($input_sanitizer,$action,$database,$tables[0],$input,$fields[$tables[0]]);
 			if ($input_validator) $this->applyInputValidator($input_validator,$action,$database,$tables[0],$input,$fields[$tables[0]],$context);
 

tests/Tests.php

@@ -661,20 +661,6 @@ public function testListPostWithIncludeButNoRecords()
         $test->expect('{"posts":{"columns":["id","user_id","category_id","content"],"records":[]},"post_tags":{"relations":{"post_id":"posts.id"},"columns":["id","post_id","tag_id"],"records":[]},"tags":{"relations":{"id":"post_tags.tag_id"},"columns":["id","name"],"records":[]}}');
     }
 
-    public function testListUsersExcludeTenancyId()
-    {
-        $test = new Api($this);
-        $test->get('/users?exclude=id');
-        $test->expect('{"users":{"columns":["username","location"],"records":[["user1","POINT(30 20)"]]}}');
-    }
-
-    public function testListUsersColumnsWithoutTenancyId()
-    {
-        $test = new Api($this);
-        $test->get('/users?columns=username,location');
-        $test->expect('{"users":{"columns":["username","location"],"records":[["user1","POINT(30 20)"]]}}');
-    }
-
     public function testTenancyCreateColumns()
     {
         // creation should fail, since due to tenancy function it will try to create with id=1, which is a PK and is already taken
@@ -696,15 +682,15 @@ public function testTenancyListColumns()
         // should list only user with id=1 (exactly 1 record)
         $test = new Api($this);
         $test->get('/users?columns=username,location');
-        $test->expect('{"users":{"columns":["username","location"],"records":[["user1",null]]}}');
+        $test->expect('{"users":{"columns":["username","location"],"records":[["user1","POINT(30 20)"]]}}');
     }
 
     public function testTenancyListExclude()
     {
         // should list only user with id=1 (exactly 1 record)
         $test = new Api($this);
         $test->get('/users?exclude=id');
-        $test->expect('{"users":{"columns":["username","location"],"records":[["user1",null]]}}');
+        $test->expect('{"users":{"columns":["username","location"],"records":[["user1","POINT(30 20)"]]}}');
     }
 
     public function testTenancyReadColumns()