Completed
Push — master ( eba447...1a7516 )
by Blizzz
18:31
created
lib/private/DB/QueryBuilder/CompositeExpression.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -25,69 +25,69 @@
 block discarded – undo
25 25
 use OCP\DB\QueryBuilder\ICompositeExpression;
26 26
 
27 27
 class CompositeExpression implements ICompositeExpression, \Countable {
28
-	/** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */
29
-	protected $compositeExpression;
28
+    /** @var \Doctrine\DBAL\Query\Expression\CompositeExpression */
29
+    protected $compositeExpression;
30 30
 
31
-	/**
32
-	 * Constructor.
33
-	 *
34
-	 * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression
35
-	 */
36
-	public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) {
37
-		$this->compositeExpression = $compositeExpression;
38
-	}
31
+    /**
32
+     * Constructor.
33
+     *
34
+     * @param \Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression
35
+     */
36
+    public function __construct(\Doctrine\DBAL\Query\Expression\CompositeExpression $compositeExpression) {
37
+        $this->compositeExpression = $compositeExpression;
38
+    }
39 39
 
40
-	/**
41
-	 * Adds multiple parts to composite expression.
42
-	 *
43
-	 * @param array $parts
44
-	 *
45
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
46
-	 */
47
-	public function addMultiple(array $parts = array()) {
48
-		$this->compositeExpression->addMultiple($parts);
40
+    /**
41
+     * Adds multiple parts to composite expression.
42
+     *
43
+     * @param array $parts
44
+     *
45
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
46
+     */
47
+    public function addMultiple(array $parts = array()) {
48
+        $this->compositeExpression->addMultiple($parts);
49 49
 
50
-		return $this;
51
-	}
50
+        return $this;
51
+    }
52 52
 
53
-	/**
54
-	 * Adds an expression to composite expression.
55
-	 *
56
-	 * @param mixed $part
57
-	 *
58
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
59
-	 */
60
-	public function add($part) {
61
-		$this->compositeExpression->add($part);
53
+    /**
54
+     * Adds an expression to composite expression.
55
+     *
56
+     * @param mixed $part
57
+     *
58
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
59
+     */
60
+    public function add($part) {
61
+        $this->compositeExpression->add($part);
62 62
 
63
-		return $this;
64
-	}
63
+        return $this;
64
+    }
65 65
 
66
-	/**
67
-	 * Retrieves the amount of expressions on composite expression.
68
-	 *
69
-	 * @return integer
70
-	 */
71
-	public function count() {
72
-		return $this->compositeExpression->count();
73
-	}
66
+    /**
67
+     * Retrieves the amount of expressions on composite expression.
68
+     *
69
+     * @return integer
70
+     */
71
+    public function count() {
72
+        return $this->compositeExpression->count();
73
+    }
74 74
 
75
-	/**
76
-	 * Returns the type of this composite expression (AND/OR).
77
-	 *
78
-	 * @return string
79
-	 */
80
-	public function getType() {
81
-		return $this->compositeExpression->getType();
82
-	}
75
+    /**
76
+     * Returns the type of this composite expression (AND/OR).
77
+     *
78
+     * @return string
79
+     */
80
+    public function getType() {
81
+        return $this->compositeExpression->getType();
82
+    }
83 83
 
84
-	/**
85
-	 * Retrieves the string representation of this composite expression.
86
-	 *
87
-	 * @return string
88
-	 */
89
-	public function __toString()
90
-	{
91
-		return (string) $this->compositeExpression;
92
-	}
84
+    /**
85
+     * Retrieves the string representation of this composite expression.
86
+     *
87
+     * @return string
88
+     */
89
+    public function __toString()
90
+    {
91
+        return (string) $this->compositeExpression;
92
+    }
93 93
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/Literal.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -25,17 +25,17 @@
 block discarded – undo
25 25
 use OCP\DB\QueryBuilder\ILiteral;
26 26
 
27 27
 class Literal implements ILiteral{
28
-	/** @var mixed */
29
-	protected $literal;
28
+    /** @var mixed */
29
+    protected $literal;
30 30
 
31
-	public function __construct($literal) {
32
-		$this->literal = $literal;
33
-	}
31
+    public function __construct($literal) {
32
+        $this->literal = $literal;
33
+    }
34 34
 
35
-	/**
36
-	 * @return string
37
-	 */
38
-	public function __toString() {
39
-		return (string) $this->literal;
40
-	}
35
+    /**
36
+     * @return string
37
+     */
38
+    public function __toString() {
39
+        return (string) $this->literal;
40
+    }
41 41
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 
25 25
 use OCP\DB\QueryBuilder\ILiteral;
26 26
 
27
-class Literal implements ILiteral{
27
+class Literal implements ILiteral {
28 28
 	/** @var mixed */
29 29
 	protected $literal;
30 30
 
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/Parameter.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -25,17 +25,17 @@
 block discarded – undo
25 25
 use OCP\DB\QueryBuilder\IParameter;
26 26
 
27 27
 class Parameter implements IParameter {
28
-	/** @var mixed */
29
-	protected $name;
28
+    /** @var mixed */
29
+    protected $name;
30 30
 
31
-	public function __construct($name) {
32
-		$this->name = $name;
33
-	}
31
+    public function __construct($name) {
32
+        $this->name = $name;
33
+    }
34 34
 
35
-	/**
36
-	 * @return string
37
-	 */
38
-	public function __toString() {
39
-		return (string) $this->name;
40
-	}
35
+    /**
36
+     * @return string
37
+     */
38
+    public function __toString() {
39
+        return (string) $this->name;
40
+    }
41 41
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	public function iLike($x, $y, $type = null) {
49 49
 		$x = $this->helper->quoteColumnName($x);
50 50
 		$y = $this->helper->quoteColumnName($y);
51
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
51
+		return $this->expressionBuilder->comparison($x, ' COLLATE '.$this->charset.'_general_ci LIKE', $y);
52 52
 	}
53 53
 
54 54
 }
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -30,27 +30,27 @@
 block discarded – undo
30 30
 
31 31
 class MySqlExpressionBuilder extends ExpressionBuilder {
32 32
 
33
-	/** @var string */
34
-	protected $charset;
35
-
36
-	/**
37
-	 * @param \OCP\IDBConnection|Connection $connection
38
-	 * @param IQueryBuilder $queryBuilder
39
-	 */
40
-	public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
41
-		parent::__construct($connection, $queryBuilder);
42
-
43
-		$params = $connection->getParams();
44
-		$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
45
-	}
46
-
47
-	/**
48
-	 * @inheritdoc
49
-	 */
50
-	public function iLike($x, $y, $type = null) {
51
-		$x = $this->helper->quoteColumnName($x);
52
-		$y = $this->helper->quoteColumnName($y);
53
-		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
54
-	}
33
+    /** @var string */
34
+    protected $charset;
35
+
36
+    /**
37
+     * @param \OCP\IDBConnection|Connection $connection
38
+     * @param IQueryBuilder $queryBuilder
39
+     */
40
+    public function __construct(IDBConnection $connection, IQueryBuilder $queryBuilder) {
41
+        parent::__construct($connection, $queryBuilder);
42
+
43
+        $params = $connection->getParams();
44
+        $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
45
+    }
46
+
47
+    /**
48
+     * @inheritdoc
49
+     */
50
+    public function iLike($x, $y, $type = null) {
51
+        $x = $this->helper->quoteColumnName($x);
52
+        $y = $this->helper->quoteColumnName($y);
53
+        return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->charset . '_general_ci LIKE', $y);
54
+    }
55 55
 
56 56
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -29,29 +29,29 @@
 block discarded – undo
29 29
 
30 30
 class PgSqlExpressionBuilder extends ExpressionBuilder {
31 31
 
32
-	/**
33
-	 * Returns a IQueryFunction that casts the column to the given type
34
-	 *
35
-	 * @param string $column
36
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
37
-	 * @return string
38
-	 */
39
-	public function castColumn($column, $type) {
40
-		if ($type === IQueryBuilder::PARAM_INT) {
41
-			$column = $this->helper->quoteColumnName($column);
42
-			return new QueryFunction('CAST(' . $column . ' AS INT)');
43
-		}
44
-
45
-		return parent::castColumn($column, $type);
46
-	}
47
-
48
-	/**
49
-	 * @inheritdoc
50
-	 */
51
-	public function iLike($x, $y, $type = null) {
52
-		$x = $this->helper->quoteColumnName($x);
53
-		$y = $this->helper->quoteColumnName($y);
54
-		return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
55
-	}
32
+    /**
33
+     * Returns a IQueryFunction that casts the column to the given type
34
+     *
35
+     * @param string $column
36
+     * @param mixed $type One of IQueryBuilder::PARAM_*
37
+     * @return string
38
+     */
39
+    public function castColumn($column, $type) {
40
+        if ($type === IQueryBuilder::PARAM_INT) {
41
+            $column = $this->helper->quoteColumnName($column);
42
+            return new QueryFunction('CAST(' . $column . ' AS INT)');
43
+        }
44
+
45
+        return parent::castColumn($column, $type);
46
+    }
47
+
48
+    /**
49
+     * @inheritdoc
50
+     */
51
+    public function iLike($x, $y, $type = null) {
52
+        $x = $this->helper->quoteColumnName($x);
53
+        $y = $this->helper->quoteColumnName($y);
54
+        return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
55
+    }
56 56
 
57 57
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 	public function castColumn($column, $type) {
40 40
 		if ($type === IQueryBuilder::PARAM_INT) {
41 41
 			$column = $this->helper->quoteColumnName($column);
42
-			return new QueryFunction('CAST(' . $column . ' AS INT)');
42
+			return new QueryFunction('CAST('.$column.' AS INT)');
43 43
 		}
44 44
 
45 45
 		return parent::castColumn($column, $type);
Please login to merge, or discard this patch.
lib/private/DB/PgSqlTools.php 2 patches
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -31,41 +31,41 @@
 block discarded – undo
31 31
 */
32 32
 class PgSqlTools {
33 33
 
34
-	/** @var \OCP\IConfig */
35
-	private $config;
34
+    /** @var \OCP\IConfig */
35
+    private $config;
36 36
 
37
-	/**
38
-	 * @param \OCP\IConfig $config
39
-	 */
40
-	public function __construct(IConfig $config) {
41
-		$this->config = $config;
42
-	}
37
+    /**
38
+     * @param \OCP\IConfig $config
39
+     */
40
+    public function __construct(IConfig $config) {
41
+        $this->config = $config;
42
+    }
43 43
 
44
-	/**
45
-	* @brief Resynchronizes all sequences of a database after using INSERTs
46
-	*        without leaving out the auto-incremented column.
47
-	* @param \OC\DB\Connection $conn
48
-	* @return null
49
-	*/
50
-	public function resynchronizeDatabaseSequences(Connection $conn) {
51
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
52
-		$databaseName = $conn->getDatabase();
53
-		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
44
+    /**
45
+     * @brief Resynchronizes all sequences of a database after using INSERTs
46
+     *        without leaving out the auto-incremented column.
47
+     * @param \OC\DB\Connection $conn
48
+     * @return null
49
+     */
50
+    public function resynchronizeDatabaseSequences(Connection $conn) {
51
+        $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
52
+        $databaseName = $conn->getDatabase();
53
+        $conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
54 54
 
55
-		foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
56
-			$sequenceName = $sequence->getName();
57
-			$sqlInfo = 'SELECT table_schema, table_name, column_name
55
+        foreach ($conn->getSchemaManager()->listSequences() as $sequence) {
56
+            $sequenceName = $sequence->getName();
57
+            $sqlInfo = 'SELECT table_schema, table_name, column_name
58 58
 				FROM information_schema.columns
59 59
 				WHERE column_default = ? AND table_catalog = ?';
60
-			$sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
61
-				"nextval('$sequenceName'::regclass)",
62
-				$databaseName
63
-			));
64
-			$tableName = $sequenceInfo['table_name'];
65
-			$columnName = $sequenceInfo['column_name'];
66
-			$sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
67
-			$sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
68
-			$conn->executeQuery($sqlSetval);
69
-		}
70
-	}
60
+            $sequenceInfo = $conn->fetchAssoc($sqlInfo, array(
61
+                "nextval('$sequenceName'::regclass)",
62
+                $databaseName
63
+            ));
64
+            $tableName = $sequenceInfo['table_name'];
65
+            $columnName = $sequenceInfo['column_name'];
66
+            $sqlMaxId = "SELECT MAX($columnName) FROM $tableName";
67
+            $sqlSetval = "SELECT setval('$sequenceName', ($sqlMaxId))";
68
+            $conn->executeQuery($sqlSetval);
69
+        }
70
+    }
71 71
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	* @return null
49 49
 	*/
50 50
 	public function resynchronizeDatabaseSequences(Connection $conn) {
51
-		$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
51
+		$filterExpression = '/^'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
52 52
 		$databaseName = $conn->getDatabase();
53 53
 		$conn->getConfiguration()->setFilterSchemaAssetsExpression($filterExpression);
54 54
 
Please login to merge, or discard this patch.
lib/private/DB/PostgreSqlMigrator.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -25,32 +25,32 @@
 block discarded – undo
25 25
 use Doctrine\DBAL\Schema\Schema;
26 26
 
27 27
 class PostgreSqlMigrator extends Migrator {
28
-	/**
29
-	 * @param Schema $targetSchema
30
-	 * @param \Doctrine\DBAL\Connection $connection
31
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
32
-	 */
33
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
34
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
28
+    /**
29
+     * @param Schema $targetSchema
30
+     * @param \Doctrine\DBAL\Connection $connection
31
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
32
+     */
33
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
34
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
35 35
 
36
-		foreach ($schemaDiff->changedTables as $tableDiff) {
37
-			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
38
-			// see https://github.com/doctrine/dbal/issues/2427
39
-			foreach ($tableDiff->changedColumns as $column) {
40
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
41
-					if ($changedProperties !== 'default') {
42
-						return true;
43
-					}
44
-					$fromDefault = $column->fromColumn->getDefault();
45
-					$toDefault = $column->column->getDefault();
46
-					$fromDefault = trim($fromDefault, "()");
36
+        foreach ($schemaDiff->changedTables as $tableDiff) {
37
+            // fix default value in brackets - pg 9.4 is returning a negative default value in ()
38
+            // see https://github.com/doctrine/dbal/issues/2427
39
+            foreach ($tableDiff->changedColumns as $column) {
40
+                $column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
41
+                    if ($changedProperties !== 'default') {
42
+                        return true;
43
+                    }
44
+                    $fromDefault = $column->fromColumn->getDefault();
45
+                    $toDefault = $column->column->getDefault();
46
+                    $fromDefault = trim($fromDefault, "()");
47 47
 
48
-					// by intention usage of !=
49
-					return $fromDefault != $toDefault;
50
-				});
51
-			}
52
-		}
48
+                    // by intention usage of !=
49
+                    return $fromDefault != $toDefault;
50
+                });
51
+            }
52
+        }
53 53
 
54
-		return $schemaDiff;
55
-	}
54
+        return $schemaDiff;
55
+    }
56 56
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 			// fix default value in brackets - pg 9.4 is returning a negative default value in ()
38 38
 			// see https://github.com/doctrine/dbal/issues/2427
39 39
 			foreach ($tableDiff->changedColumns as $column) {
40
-				$column->changedProperties = array_filter($column->changedProperties, function ($changedProperties) use ($column) {
40
+				$column->changedProperties = array_filter($column->changedProperties, function($changedProperties) use ($column) {
41 41
 					if ($changedProperties !== 'default') {
42 42
 						return true;
43 43
 					}
Please login to merge, or discard this patch.
lib/private/DB/Adapter.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public function lockTable($tableName) {
68 68
 		$this->conn->beginTransaction();
69
-		$this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
69
+		$this->conn->executeUpdate('LOCK TABLE `'.$tableName.'` IN EXCLUSIVE MODE');
70 70
 	}
71 71
 
72 72
 	/**
@@ -93,14 +93,14 @@  discard block
 block discarded – undo
93 93
 		if (empty($compare)) {
94 94
 			$compare = array_keys($input);
95 95
 		}
96
-		$query = 'INSERT INTO `' .$table . '` (`'
97
-			. implode('`,`', array_keys($input)) . '`) SELECT '
98
-			. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
99
-			. 'FROM `' . $table . '` WHERE ';
96
+		$query = 'INSERT INTO `'.$table.'` (`'
97
+			. implode('`,`', array_keys($input)).'`) SELECT '
98
+			. str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative?
99
+			. 'FROM `'.$table.'` WHERE ';
100 100
 
101 101
 		$inserts = array_values($input);
102
-		foreach($compare as $key) {
103
-			$query .= '`' . $key . '`';
102
+		foreach ($compare as $key) {
103
+			$query .= '`'.$key.'`';
104 104
 			if (is_null($input[$key])) {
105 105
 				$query .= ' IS NULL AND ';
106 106
 			} else {
Please login to merge, or discard this patch.
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -33,84 +33,84 @@
 block discarded – undo
33 33
  */
34 34
 class Adapter {
35 35
 
36
-	/**
37
-	 * @var \OC\DB\Connection $conn
38
-	 */
39
-	protected $conn;
36
+    /**
37
+     * @var \OC\DB\Connection $conn
38
+     */
39
+    protected $conn;
40 40
 
41
-	public function __construct($conn) {
42
-		$this->conn = $conn;
43
-	}
41
+    public function __construct($conn) {
42
+        $this->conn = $conn;
43
+    }
44 44
 
45
-	/**
46
-	 * @param string $table name
47
-	 * @return int id of last insert statement
48
-	 */
49
-	public function lastInsertId($table) {
50
-		return $this->conn->realLastInsertId($table);
51
-	}
45
+    /**
46
+     * @param string $table name
47
+     * @return int id of last insert statement
48
+     */
49
+    public function lastInsertId($table) {
50
+        return $this->conn->realLastInsertId($table);
51
+    }
52 52
 
53
-	/**
54
-	 * @param string $statement that needs to be changed so the db can handle it
55
-	 * @return string changed statement
56
-	 */
57
-	public function fixupStatement($statement) {
58
-		return $statement;
59
-	}
53
+    /**
54
+     * @param string $statement that needs to be changed so the db can handle it
55
+     * @return string changed statement
56
+     */
57
+    public function fixupStatement($statement) {
58
+        return $statement;
59
+    }
60 60
 
61
-	/**
62
-	 * Create an exclusive read+write lock on a table
63
-	 *
64
-	 * @param string $tableName
65
-	 * @since 9.1.0
66
-	 */
67
-	public function lockTable($tableName) {
68
-		$this->conn->beginTransaction();
69
-		$this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
70
-	}
61
+    /**
62
+     * Create an exclusive read+write lock on a table
63
+     *
64
+     * @param string $tableName
65
+     * @since 9.1.0
66
+     */
67
+    public function lockTable($tableName) {
68
+        $this->conn->beginTransaction();
69
+        $this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
70
+    }
71 71
 
72
-	/**
73
-	 * Release a previous acquired lock again
74
-	 *
75
-	 * @since 9.1.0
76
-	 */
77
-	public function unlockTable() {
78
-		$this->conn->commit();
79
-	}
72
+    /**
73
+     * Release a previous acquired lock again
74
+     *
75
+     * @since 9.1.0
76
+     */
77
+    public function unlockTable() {
78
+        $this->conn->commit();
79
+    }
80 80
 
81
-	/**
82
-	 * Insert a row if the matching row does not exists.
83
-	 *
84
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
85
-	 * @param array $input data that should be inserted into the table  (column name => value)
86
-	 * @param array|null $compare List of values that should be checked for "if not exists"
87
-	 *				If this is null or an empty array, all keys of $input will be compared
88
-	 *				Please note: text fields (clob) must not be used in the compare array
89
-	 * @return int number of inserted rows
90
-	 * @throws \Doctrine\DBAL\DBALException
91
-	 */
92
-	public function insertIfNotExist($table, $input, array $compare = null) {
93
-		if (empty($compare)) {
94
-			$compare = array_keys($input);
95
-		}
96
-		$query = 'INSERT INTO `' .$table . '` (`'
97
-			. implode('`,`', array_keys($input)) . '`) SELECT '
98
-			. str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
99
-			. 'FROM `' . $table . '` WHERE ';
81
+    /**
82
+     * Insert a row if the matching row does not exists.
83
+     *
84
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
85
+     * @param array $input data that should be inserted into the table  (column name => value)
86
+     * @param array|null $compare List of values that should be checked for "if not exists"
87
+     *				If this is null or an empty array, all keys of $input will be compared
88
+     *				Please note: text fields (clob) must not be used in the compare array
89
+     * @return int number of inserted rows
90
+     * @throws \Doctrine\DBAL\DBALException
91
+     */
92
+    public function insertIfNotExist($table, $input, array $compare = null) {
93
+        if (empty($compare)) {
94
+            $compare = array_keys($input);
95
+        }
96
+        $query = 'INSERT INTO `' .$table . '` (`'
97
+            . implode('`,`', array_keys($input)) . '`) SELECT '
98
+            . str_repeat('?,', count($input)-1).'? ' // Is there a prettier alternative?
99
+            . 'FROM `' . $table . '` WHERE ';
100 100
 
101
-		$inserts = array_values($input);
102
-		foreach($compare as $key) {
103
-			$query .= '`' . $key . '`';
104
-			if (is_null($input[$key])) {
105
-				$query .= ' IS NULL AND ';
106
-			} else {
107
-				$inserts[] = $input[$key];
108
-				$query .= ' = ? AND ';
109
-			}
110
-		}
111
-		$query = substr($query, 0, -5);
112
-		$query .= ' HAVING COUNT(*) = 0';
101
+        $inserts = array_values($input);
102
+        foreach($compare as $key) {
103
+            $query .= '`' . $key . '`';
104
+            if (is_null($input[$key])) {
105
+                $query .= ' IS NULL AND ';
106
+            } else {
107
+                $inserts[] = $input[$key];
108
+                $query .= ' = ? AND ';
109
+            }
110
+        }
111
+        $query = substr($query, 0, -5);
112
+        $query .= ' HAVING COUNT(*) = 0';
113 113
 
114
-		return $this->conn->executeUpdate($query, $inserts);
115
-	}
114
+        return $this->conn->executeUpdate($query, $inserts);
115
+    }
116 116
 }
Please login to merge, or discard this patch.
lib/private/DB/AdapterMySQL.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -27,31 +27,31 @@
 block discarded – undo
27 27
 
28 28
 class AdapterMySQL extends Adapter {
29 29
 
30
-	/** @var string */
31
-	protected $charset;
32
-
33
-	/**
34
-	 * @param string $tableName
35
-	 */
36
-	public function lockTable($tableName) {
37
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
38
-	}
39
-
40
-	public function unlockTable() {
41
-		$this->conn->executeUpdate('UNLOCK TABLES');
42
-	}
43
-
44
-	public function fixupStatement($statement) {
45
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
46
-		return $statement;
47
-	}
48
-
49
-	protected function getCharset() {
50
-		if (!$this->charset) {
51
-			$params = $this->conn->getParams();
52
-			$this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
53
-		}
54
-
55
-		return $this->charset;
56
-	}
30
+    /** @var string */
31
+    protected $charset;
32
+
33
+    /**
34
+     * @param string $tableName
35
+     */
36
+    public function lockTable($tableName) {
37
+        $this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
38
+    }
39
+
40
+    public function unlockTable() {
41
+        $this->conn->executeUpdate('UNLOCK TABLES');
42
+    }
43
+
44
+    public function fixupStatement($statement) {
45
+        $statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
46
+        return $statement;
47
+    }
48
+
49
+    protected function getCharset() {
50
+        if (!$this->charset) {
51
+            $params = $this->conn->getParams();
52
+            $this->charset = isset($params['charset']) ? $params['charset'] : 'utf8';
53
+        }
54
+
55
+        return $this->charset;
56
+    }
57 57
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 * @param string $tableName
35 35
 	 */
36 36
 	public function lockTable($tableName) {
37
-		$this->conn->executeUpdate('LOCK TABLES `' .$tableName . '` WRITE');
37
+		$this->conn->executeUpdate('LOCK TABLES `'.$tableName.'` WRITE');
38 38
 	}
39 39
 
40 40
 	public function unlockTable() {
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	}
43 43
 
44 44
 	public function fixupStatement($statement) {
45
-		$statement = str_replace(' ILIKE ', ' COLLATE ' . $this->getCharset() . '_general_ci LIKE ', $statement);
45
+		$statement = str_replace(' ILIKE ', ' COLLATE '.$this->getCharset().'_general_ci LIKE ', $statement);
46 46
 		return $statement;
47 47
 	}
48 48
 
Please login to merge, or discard this patch.