Fix pagination with custom select columns and improve versionable detection

psalm-baseline.xml

@@ -10,11 +10,6 @@
       <code>$fk-&gt;isParentChild</code>
     </UndefinedPropertyAssignment>
   </file>
-  <file src="src/Propel/Generator/Behavior/Versionable/VersionableBehavior.php">
-    <UndefinedPropertyAssignment occurrences="1">
-      <code>$versionTable-&gt;isVersionTable</code>
-    </UndefinedPropertyAssignment>
-  </file>
   <file src="src/Propel/Generator/Builder/DataModelBuilder.php">
     <InvalidArgument occurrences="1">
       <code>$this</code>

src/Propel/Generator/Behavior/Versionable/VersionableBehavior.php

@@ -67,7 +67,7 @@ public function modifyDatabase(): void
                 // don't add the same behavior twice
                 continue;
             }
-            if (property_exists($table, 'isVersionTable')) {
+            if ($table->isAVersionTable()) {
                 // don't add the behavior to version tables
                 continue;
             }
@@ -150,7 +150,7 @@ protected function addVersionTable(): void
                 'skipSql' => $table->isSkipSql(),
                 'identifierQuoting' => $table->isIdentifierQuotingEnabled(),
             ]);
-            $versionTable->isVersionTable = true;
+            $versionTable->setAsVersionTable(true);
             // every behavior adding a table should re-execute database behaviors
             foreach ($database->getBehaviors() as $behavior) {
                 $behavior->modifyDatabase();

src/Propel/Generator/Model/Table.php

@@ -159,6 +159,7 @@ class Table extends ScopedMappingModel implements IdMethod
     protected bool $isCrossRef = false;
 
     protected ?string $defaultStringFormat = null;
+    protected ?bool $isVersionTable = false;
 
     /**
      * Constructs a table object with a name
@@ -2302,4 +2303,12 @@ public function isConnectedWithTable(Table $table): bool
         return $this->getForeignKeysReferencingTable($table->getName()) ||
             $table->getForeignKeysReferencingTable($this->getName());
     }
+
+    public function isAVersionTable(): bool {
+        return $this->isVersionTable;
+    }
+
+    public function setAsVersionTable(bool $isVersionTable): void {
+        $this->isVersionTable = $isVersionTable;
+    }
 }

src/Propel/Runtime/ActiveQuery/Criteria.php

@@ -1623,7 +1623,7 @@
      */
     public function clearSelectColumns()
     {
-        $this->selectColumns = $this->asColumns = [];
+        $this->selectColumns = $this->asColumns = $this->select = [];
 
         return $this;
     }

templates/Builder/Om/baseQueryClassHeader.php

@@ -8,27 +8,27 @@
      *  - string $parentClass
      *  - string $entityNotFoundExceptionClass
      *  - string $unqualifiedClassName
-     * 
+     *
      *  - bool $addTimestamp
      *  - string $propelVersion
-     * 
+     *
      *  - Column[] $columns
      *  - string[] $relationNames (both ref and backref)
-     *  - string[] $relatedTableQueryClassNames 
+     *  - string[] $relatedTableQueryClassNames
      */
 ?>
 
 /**
  * Base class that represents a query for the `<?= $tableName ?>` table.
  *
 <?php if ($tableDesc): ?>
- * <?= $tableDesc ?> 
+ * <?= $tableDesc ?>
  *
 <?php endif; ?>
 <?php if ($addTimestamp): ?>
  * This class was autogenerated by Propel <?= $propelVersion ?> on:
  *
- * <?= strftime('%c') ?> 
+ * <?= date('%c') ?>
  *
 <?php endif; ?>
 <?php foreach($columns as $column):?>
@@ -64,7 +64,7 @@
  *
 <?php endif; ?>
  * @method     <?= $modelClass ?>|null findOne(?ConnectionInterface $con = null) Return the first <?= $modelClass ?> matching the query
- * @method     <?= $modelClass ?> findOneOrCreate(?ConnectionInterface $con = null) Return the first <?= $modelClass ?> matching the query, or a new <?= $modelClass ?> object populated from the query conditions when no match is found
+ * @method     <?= $modelClass ?> findOneOrCreate(?ConnectionInterface $con = null) `Return the first <?= $modelClass ?> matching the query, or a new <?= $modelClass ?> object populated from the query conditions when no match is found`
  *
 <?php foreach($columns as $column):?>
  * @method     <?= $modelClass ?>|null findOneBy<?= $column->getPhpName() ?>(<?= $column->getPhpType() ?> $<?= $column->getName() ?>) Return the first <?= $modelClass ?> filtered by the <?= $column->getName() ?> column
@@ -78,15 +78,15 @@
 <?php endforeach;?>
  *
  * @method     <?= $modelClass ?>[]|Collection find(?ConnectionInterface $con = null) Return <?= $modelClass ?> objects based on current ModelCriteria
- * @psalm-method Collection&\Traversable<<?= $modelClass ?>> find(?ConnectionInterface $con = null) Return <?= $modelClass ?> objects based on current ModelCriteria
+ * @psalm-method \Collection&\Traversable<<?= $modelClass ?>> find(?ConnectionInterface $con = null) Return <?= $modelClass ?> objects based on current ModelCriteria
  *
 <?php foreach($columns as $column):?>
- * @method     <?= $modelClass ?>[]|Collection findBy<?= $column->getPhpName() ?>(<?= $column->getPhpType() ?>|array<<?= $column->getPhpType() ?>> $<?= $column->getName() ?>) Return <?= $modelClass ?> objects filtered by the <?= $column->getName() ?> column
- * @psalm-method Collection&\Traversable<<?= $modelClass ?>> findBy<?= $column->getPhpName() ?>(<?= $column->getPhpType() ?>|array<<?= $column->getPhpType() ?>> $<?= $column->getName() ?>) Return <?= $modelClass ?> objects filtered by the <?= $column->getName() ?> column
+ * @method     <?= $modelClass ?>[]|Collection findBy<?= $column->getPhpName() ?>(<?= $column->getPhpType() ?>|<?= $column->getPhpType() ?>[] $<?= $column->getName() ?>) Return <?= $modelClass ?> objects filtered by the <?= $column->getName() ?> column
+ * @psalm-method \Collection&\Traversable<<?= $modelClass ?>> findBy<?= $column->getPhpName() ?>(<?= $column->getPhpType() ?>|array<<?= $column->getPhpType() ?>> $<?= $column->getName() ?>) Return <?= $modelClass ?> objects filtered by the <?= $column->getName() ?> column
 <?php endforeach;?>
  *
  * @method     <?= $modelClass ?>[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit
  * @psalm-method \Propel\Runtime\Util\PropelModelPager&\Traversable<<?= $modelClass ?>> paginate($page = 1, $maxPerPage = 10, ?ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit
  */
-abstract class <?= $unqualifiedClassName ?> extends <?= $parentClass ?> 
+abstract class <?= $unqualifiedClassName ?> extends <?= $parentClass ?>
 {