Selection: removed create*() methods

dg · dg · commit 9dc391a0a7b6 · 2026-01-13T16:08:48.000+01:00
diff --git a/src/Database/Table/GroupedSelection.php b/src/Database/Table/GroupedSelection.php
@@ -95,7 +95,7 @@ public function aggregation(string $function, ?string $groupFunction = null): mi
 		if ($aggregation === null) {
 			$aggregation = [];
 
-			$selection = $this->createSelectionInstance();
+			$selection = $this->explorer->table($this->name);
 			$selection->getSqlBuilder()->importConditions($this->getSqlBuilder());
 
 			if ($groupFunction && $selection->getSqlBuilder()->importGroupConditions($this->getSqlBuilder())) {
diff --git a/src/Database/Table/Selection.php b/src/Database/Table/Selection.php
@@ -453,7 +453,7 @@ public function alias(string $tableChain, string $alias): static
 	 */
 	public function aggregation(string $function, ?string $groupFunction = null): mixed
 	{
-		$selection = $this->createSelectionInstance();
+		$selection = $this->explorer->table($this->name);
 		$selection->getSqlBuilder()->importConditions($this->getSqlBuilder());
 		if ($groupFunction && $selection->getSqlBuilder()->importGroupConditions($this->getSqlBuilder())) {
 			$selection->select("$function AS aggregate");
@@ -542,7 +542,7 @@ protected function execute(): void
 		$this->rows = [];
 		$usedPrimary = true;
 		while ($row = @$result->fetchAssoc()) { // @ may contain duplicate columns
-			$row = $this->createRow($row);
+			$row = $this->explorer->createActiveRow($this, $row);
 			$usedPrimary = $usedPrimary && ($primary = $row->getSignature(throw: false)) !== '';
 			$this->rows[$usedPrimary ? $primary : $key++] = $row;
 		}
@@ -557,24 +557,11 @@ protected function execute(): void
 	}
 
 
-	/** @deprecated */
-	protected function createRow(array $row): ActiveRow
-	{
-		return $this->explorer->createActiveRow($row, $this);
-	}
-
-
 	/** @deprecated */
 	public function createSelectionInstance(?string $table = null): self
 	{
-		return $this->explorer->table($table ?: $this->name);
-	}
-
-
-	/** @deprecated */
-	protected function createGroupedSelectionInstance(string $table, string $column): GroupedSelection
-	{
-		return $this->explorer->createGroupedSelection($this, $table, $column);
+		// DELETE
+		return $this->explorer->table($table ?? $this->name);
 	}
 
 
@@ -835,7 +822,7 @@ public function insert(iterable $data): ActiveRow|array|int|bool
 			return $return->getRowCount();
 		}
 
-		$row = $this->createSelectionInstance()
+		$row = $this->explorer->table($this->name)
 			->select('*')
 			->wherePrimary($primaryKey)
 			->fetch();
@@ -924,7 +911,7 @@ public function getReferencedTable(ActiveRow $row, ?string $table, ?string $colu
 			}
 
 			if ($cacheKeys) {
-				$selection = $this->createSelectionInstance($table);
+				$selection = $this->explorer->table($table);
 				$selection->where($selection->getPrimary(), array_keys($cacheKeys));
 			} else {
 				$selection = [];
@@ -957,7 +944,7 @@ public function getReferencingTable(
 
 		$prototype = &$this->refCache['referencingPrototype'][$this->getSpecificCacheKey()]["$table.$column"];
 		if (!$prototype) {
-			$prototype = $this->createGroupedSelectionInstance($table, $column);
+			$prototype = $this->explorer->createGroupedSelectionInstance($this, $table, $column);
 			$prototype->where("$table.$column", array_keys((array) $this->rows));
 			$prototype->getSpecificCacheKey();
 		}
diff --git a/tests/Database/Explorer/bugs/deleteCacheBug.phpt b/tests/Database/Explorer/bugs/deleteCacheBug.phpt
@@ -40,7 +40,7 @@ test('', function () use ($explorer) {
 		$book->id;
 
 		if ($i === 1) {
-			$book->getTable()->createSelectionInstance()
+			$explorer->table('book')
 				->wherePrimary($book->id)
 				->delete();
 
