cs

Author: dg

src/Database/Explorer.php

@@ -81,6 +81,7 @@ public function queryArgs(string $sql, array $params): ResultSet
 
 	/**
 	 * Returns table selection.
+	 * @return Table\Selection<Table\ActiveRow>
 	 */
 	public function table(string $table): Table\Selection
 	{

src/Database/Table/ActiveRow.php

@@ -121,7 +121,7 @@ public function ref(string $key, ?string $throughColumn = null): ?self
 	 */
 	public function related(string $key, ?string $throughColumn = null): GroupedSelection
 	{
-		$groupedSelection = $this->table->getReferencingTable($key, $throughColumn, $this[$this->table->getPrimary()]);
+		$groupedSelection = $this->table->getReferencingTable($key, $throughColumn, $this->__get($this->table->getPrimary()));
 		if (!$groupedSelection) {
 			throw new Nette\MemberAccessException("No reference found for \${$this->table->getName()}->related($key).");
 		}

src/Database/Table/SqlBuilder.php

@@ -315,7 +315,21 @@ protected function addCondition(
 		while (count($params)) {
 			$arg = array_shift($params);
 			preg_match(
-				'#(?:.*?\?.*?){' . $placeholderNum . '}(((?:&|\||^|~|\+|-|\*|/|%|\(|,|<|>|=|(?<=\W|^)(?:REGEXP|ALL|AND|ANY|BETWEEN|EXISTS|IN|[IR]?LIKE|OR|NOT|SOME|INTERVAL))\s*)?(?:\(\?\)|\?))#s',
+				'#
+				(?:.*?\?.*?){' . $placeholderNum . '}
+				(
+					(
+						(?:
+							&|\||^|~|\+|-|\*|/|%|\(|,|<|>|=
+							|
+							(?<=\W|^)
+							(?:REGEXP|ALL|AND|ANY|BETWEEN|EXISTS|IN|[IR]?LIKE|OR|NOT|SOME|INTERVAL)
+						)
+						\s*
+					)?
+					(?:\(\?\)|\?)
+				)
+				#xs',
 				$condition,
 				$match,
 				PREG_OFFSET_CAPTURE,

tests/Database/Drivers/PgSqlDriver.formatLike.phpt

@@ -33,10 +33,10 @@ $connection->query('SET escape_string_warning TO off'); // do not log warnings
 
 $connection->query('SET standard_conforming_strings TO on');
 $tests($connection);
-Assert::false($connection->query("SELECT 'AAxBB' LIKE", $connection::literal($driver->formatLike('A\\B', 0)))->fetchField());
-Assert::true($connection->query("SELECT 'AA\\BB' LIKE", $connection::literal($driver->formatLike('A\\B', 0)))->fetchField());
+Assert::false($connection->query("SELECT 'AAxBB' LIKE", $connection::literal($driver->formatLike('A\B', 0)))->fetchField());
+Assert::true($connection->query("SELECT 'AA\\BB' LIKE", $connection::literal($driver->formatLike('A\B', 0)))->fetchField());
 
 $connection->query('SET standard_conforming_strings TO off');
 $tests($connection);
-Assert::false($connection->query("SELECT 'AAxBB' LIKE", $connection::literal($driver->formatLike('A\\B', 0)))->fetchField());
-Assert::true($connection->query("SELECT 'AA\\\\BB' LIKE", $connection::literal($driver->formatLike('A\\B', 0)))->fetchField());
+Assert::false($connection->query("SELECT 'AAxBB' LIKE", $connection::literal($driver->formatLike('A\B', 0)))->fetchField());
+Assert::true($connection->query("SELECT 'AA\\\\BB' LIKE", $connection::literal($driver->formatLike('A\B', 0)))->fetchField());