nextcloud / server

lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 		parent::__construct($connection, $queryBuilder, $logger);
 
 		$params = $connection->getInner()->getParams();
-		$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8') . '_general_ci');
+		$this->collation = $params['collation'] ?? (($params['charset'] ?? 'utf8').'_general_ci');
 	}
 
 	/**
@@ -29,7 +29,7 @@ 
 	public function iLike($x, $y, $type = null): string {
 		$x = $this->helper->quoteColumnName($x);
 		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->collation . ' LIKE', $y);
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->collation.' LIKE', $y);
 	}
 
 	/**
@@ -43,9 +43,9 @@ 
 	public function castColumn($column, $type): IQueryFunction {
 		switch ($type) {
 			case IQueryBuilder::PARAM_STR:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS CHAR)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS CHAR)');
 			case IQueryBuilder::PARAM_JSON:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS JSON)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS JSON)');
 			default:
 				return parent::castColumn($column, $type);
 		}

lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
 	public function castColumn($column, $type): IQueryFunction {
 		switch ($type) {
 			case IQueryBuilder::PARAM_INT:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS BIGINT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS BIGINT)');
 			case IQueryBuilder::PARAM_STR:
 			case IQueryBuilder::PARAM_JSON:
-				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS TEXT)');
+				return new QueryFunction('CAST('.$this->helper->quoteColumnName($column).' AS TEXT)');
 			default:
 				return parent::castColumn($column, $type);
 		}

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 		if ($type === IQueryBuilder::PARAM_JSON) {
 			$x = $this->prepareColumn($x, $type);
 			$y = $this->prepareColumn($y, $type);
-			return (string)(new QueryFunction('JSON_EQUAL(' . $x . ',' . $y . ')'));
+			return (string) (new QueryFunction('JSON_EQUAL('.$x.','.$y.')'));
 		}
 
 		return parent::eq($x, $y, $type);
@@ -47,7 +47,7 @@ 
 		if ($type === IQueryBuilder::PARAM_JSON) {
 			$x = $this->prepareColumn($x, $type);
 			$y = $this->prepareColumn($y, $type);
-			return (string)(new QueryFunction('NOT JSON_EQUAL(' . $x . ',' . $y . ')'));
+			return (string) (new QueryFunction('NOT JSON_EQUAL('.$x.','.$y.')'));
 		}
 
 		return parent::neq($x, $y, $type);
@@ -106,11 +106,11 @@ 
 	public function castColumn($column, $type): IQueryFunction {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 		if ($type === IQueryBuilder::PARAM_INT) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_number(to_char(' . $column . '))');
+			return new QueryFunction('to_number(to_char('.$column.'))');
 		}
 
 		return parent::castColumn($column, $type);
@@ -120,7 +120,7 @@ 
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null): string {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	/**

tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php

Spacing +7 added lines, -7 removed lines

@@ -111,7 +111,7 @@ 
 			->set('configvalue',
 				$query->expr()->castColumn(
 					$query->createFunction(
-						'(' . $query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
+						'('.$query->expr()->castColumn('configvalue', IQueryBuilder::PARAM_INT)
 						. ' + 1)'
 					), IQueryBuilder::PARAM_STR
 				)
@@ -147,7 +147,7 @@ 
 			$version = $result->fetchOne();
 			$result->closeCursor();
 			if (str_starts_with($version, '11.')) {
-				$this->markTestSkipped('JSON is not supported on Oracle 11, skipping until deprecation was clarified: ' . $version);
+				$this->markTestSkipped('JSON is not supported on Oracle 11, skipping until deprecation was clarified: '.$version);
 			}
 		}
 
@@ -187,7 +187,7 @@ 
 		$entries = $result->fetchAll();
 		$result->closeCursor();
 		self::assertCount(1, $entries);
-		self::assertEquals([['permissions','after']], json_decode($entries[0]['attributes'], true));
+		self::assertEquals([['permissions', 'after']], json_decode($entries[0]['attributes'], true));
 	}
 
 	public function testDateTimeEquals(): void {
@@ -248,8 +248,8 @@ 
 		$query->insert('appconfig')
 			->values([
 				'appid' => $query->createNamedParameter($appId),
-				'configkey' => $query->createNamedParameter((string)$key),
-				'configvalue' => $query->createNamedParameter((string)$value),
+				'configkey' => $query->createNamedParameter((string) $key),
+				'configvalue' => $query->createNamedParameter((string) $value),
 			])
 			->executeStatement();
 	}
@@ -262,11 +262,11 @@ 
 		$prefix = Server::get(IConfig::class)->getSystemValueString('dbtableprefix', 'oc_');
 		$schema = $this->connection->createSchema();
 		try {
-			$schema->getTable($prefix . 'testing');
+			$schema->getTable($prefix.'testing');
 			$this->connection->getQueryBuilder()->delete('testing')->executeStatement();
 		} catch (SchemaException $e) {
 			$this->schemaSetup = true;
-			$table = $schema->createTable($prefix . 'testing');
+			$table = $schema->createTable($prefix.'testing');
 			$table->addColumn('id', Types::BIGINT, [
 				'autoincrement' => true,
 				'notnull' => true,