Merge pull request 'use the correct table alias in joins 'on clause'' (#17) from bugfix/fix-multiple-level-join-table-alias into master

Reviewed-on: #17

src/PersistentData/PersistentDataManager.php

@@ -150,7 +150,7 @@ class PersistentDataManager implements IPersistentDataManager
 
             $columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations));
 
-            $this->leftJoinRelations($select, $table, $relations, $withRelations);
+            $this->leftJoinRelations($select, $table, $table, $relations, $withRelations);
             $select->columns($columns);
         } else {
             $select->columns($columns);
@@ -180,19 +180,19 @@ class PersistentDataManager implements IPersistentDataManager
         return $columns;
     }
 
-    private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void
+    private function leftJoinRelations(Select $select, string $table, string $tableAlias, array $relations, array $withRelations): void
     {
         foreach ($relations as $relation => $relationType) {
             $relationTableAlias = $table . '__' . $relation;
             $relationTable = call_user_func([$relationType, 'getTable']);
             $select->setTableAliases([$relationTableAlias => $relationTable]);
-            $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$table, $relation . '_id']);
+            $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$tableAlias, $relation . '_id']);
 
             $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
             if (count($withRelations)) {
                 $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
             }
-            $this->leftJoinRelations($select, $relationTable, $relationsOfRelation, $withRelations);
+            $this->leftJoinRelations($select, $relationTable, $relationTableAlias, $relationsOfRelation, $withRelations);
         }
     }
 

src/Session/DatabaseSessionHandler.php

@@ -13,14 +13,17 @@ class DatabaseSessionHandler implements ISessionHandler
 
     private string $table;
 
+    private DateTime $shouldBeNewerThan;
+
     private bool $exists = false;
 
     private bool $written = false;
 
-    public function __construct(IConnection $dbConnection, string $table)
+    public function __construct(IConnection $dbConnection, string $table, DateTime $shouldBeNewerThan)
     {
         $this->dbConnection = $dbConnection;
         $this->table = $table;
+        $this->shouldBeNewerThan = $shouldBeNewerThan;
     }
 
     public function open($savePath, $sessionName): bool
@@ -36,17 +39,20 @@ class DatabaseSessionHandler implements ISessionHandler
     public function read($id): string
     {
         $select = new Select($this->dbConnection, $this->table);
-        $select->columns(['data']);
+        $select->columns(['data', 'updated']);
         $select->whereId(substr($id, 0, 32));
 
         $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
         if ($result === null) {
             return '';
         }
 
         $this->exists = true;
 
+        if (new DateTime($result['updated']) < $this->shouldBeNewerThan) {
+            return '';
+        }
+
         return $result['data'];
     }