addHiddenAttribute

Author: fogelito

src/Database/Adapter/SQL.php

@@ -1557,23 +1557,29 @@ public function getTenantQuery(
      */
     protected function addHiddenAttribute(array $selects): string
     {
-        $hash = [Query::DEFAULT_ALIAS];
+        $hash = [Query::DEFAULT_ALIAS => true];
 
         foreach ($selects as $select) {
-            if (!in_array($select->getAlias(), $hash)){
-                $hash[] = $select->getAlias();
+            $alias = $select->getAlias();
+            if (!isset($hash[$alias])){
+                $hash[$alias] = true;
             }
         }
 
+        $hash = array_keys($hash);
+
         $strings = [];
 
         foreach ($hash as $alias) {
             $strings[] = $alias.'._uid as '.$this->quote($alias.'::$id');
             $strings[] = $alias.'._id as '.$this->quote($alias.'::$internalId');
-            $strings[] = $alias.'._tenant as '.$this->quote($alias.'::$tenant');
             $strings[] = $alias.'._permissions as '.$this->quote($alias.'::$permissions');
             $strings[] = $alias.'._createdAt as '.$this->quote($alias.'::$createdAt');
             $strings[] = $alias.'._updatedAt as '.$this->quote($alias.'::$updatedAt');
+
+            if ($this->sharedTables) {
+                $strings[] = $alias.'._tenant as '.$this->quote($alias.'::$tenant');
+            }
         }
 
         return ', '.implode(', ', $strings);

tests/e2e/Adapter/Scopes/JoinsTests.php

@@ -367,6 +367,14 @@ public function testJoin(): void
             $this->assertEquals('Invalid Query Select: Invalid "as" on attribute "*"', $e->getMessage());
         }
 
+
+        $document = $db->getDocument(
+            '__sessions',
+            $session2->getId()
+        );
+        var_dump($document);
+        $this->assertEquals('dsdsd', 'ds');
+
         /**
          * Simple `as` query getDocument
          */
@@ -414,8 +422,6 @@ public function testJoin(): void
             ]
         );
 
-        var_dump($document);
-
         $this->assertArrayHasKey('$permissions', $document);
         $this->assertArrayHasKey('$collection', $document);
         $this->assertArrayHasKey('___permissions', $document);
@@ -478,7 +484,6 @@ public function testJoin(): void
         $this->assertArrayHasKey('as_permissions', $document);
         $this->assertIsArray($document->getAttribute('as_permissions'));
 
-        $this->assertEquals('dsdsd', 'ds');
 
 
 //        /**