rrelmy / rorm

Source/Model.php

Spacing +11 added lines, -11 removed lines

@@ -173,7 +173,7 @@ 
              * Because REPLACE INTO does DELETE and INSERT,
              * which does not play nice with TRIGGERs and FOREIGN KEY CONSTRAINTS
              */
-            $sql = 'INSERT INTO ' . $quotedTable . ' ';
+            $sql = 'INSERT INTO '.$quotedTable.' ';
 
             $insertData = array();
             $updateData = array();
@@ -187,20 +187,20 @@ 
                 $insertData[$quotedColumn] = Rorm::quote($dbh, $value);
 
                 if ($doMerge && !in_array($column, $idColumns)) {
-                    $updateData[] = $quotedColumn . ' = VALUES(' . $quotedColumn . ')';
+                    $updateData[] = $quotedColumn.' = VALUES('.$quotedColumn.')';
                 }
             }
             unset($column, $value, $quotedColumn);
 
             // insert
             $sql .=
-                '(' . implode(', ', array_keys($insertData)) . ')' .
-                ' VALUES ' .
-                '(' . implode(', ', $insertData) . ')';
+                '('.implode(', ', array_keys($insertData)).')'.
+                ' VALUES '.
+                '('.implode(', ', $insertData).')';
 
             if ($doMerge && count($updateData) > 0) {
                 // update
-                $sql .= ' ON DUPLICATE KEY UPDATE ' . implode(', ', $updateData);
+                $sql .= ' ON DUPLICATE KEY UPDATE '.implode(', ', $updateData);
             }
 
             // execute (most likely throws PDOException if there is an error)
@@ -220,9 +220,9 @@ 
              * SQLite
              */
             if ($doMerge) {
-                $sql = 'INSERT OR REPLACE INTO ' . $quotedTable . ' ';
+                $sql = 'INSERT OR REPLACE INTO '.$quotedTable.' ';
             } else {
-                $sql = 'INSERT INTO ' . $quotedTable . ' ';
+                $sql = 'INSERT INTO '.$quotedTable.' ';
             }
 
             // build (column) VALUES (values)
@@ -236,7 +236,7 @@ 
             }
             unset($column, $value);
 
-            $sql .= '(' . implode(', ', array_keys($quotedData)) . ') VALUES (' . implode(', ', $quotedData) . ')';
+            $sql .= '('.implode(', ', array_keys($quotedData)).') VALUES ('.implode(', ', $quotedData).')';
 
             // execute (most likely throws PDOException if there is an error)
             if ($dbh->exec($sql) === false) {
@@ -268,10 +268,10 @@ 
 
         $where = array();
         foreach ($idColumns as $columnName) {
-            $where[] = $quoteIdentifier($columnName) . ' = ' . Rorm::quote($dbh, $this->$columnName);
+            $where[] = $quoteIdentifier($columnName).' = '.Rorm::quote($dbh, $this->$columnName);
         }
 
-        $sql = 'DELETE FROM ' . $quoteIdentifier(static::getTable()) . ' WHERE ' . implode(' AND ', $where);
+        $sql = 'DELETE FROM '.$quoteIdentifier(static::getTable()).' WHERE '.implode(' AND ', $where);
 
         return $dbh->exec($sql) > 0;
     }

Source/QueryBuilder.php

Spacing +19 added lines, -19 removed lines

@@ -114,7 +114,7 @@ 
     {
         $select = $expression;
         if ($as !== null) {
-            $select .= ' AS ' . $this->quoteIdentifier($as);
+            $select .= ' AS '.$this->quoteIdentifier($as);
         }
         $this->select[] = $select;
 
@@ -130,7 +130,7 @@ 
      */
     public function where($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' = ?';
+        $this->where[] = $this->quoteIdentifier($column).' = ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -142,7 +142,7 @@ 
      */
     public function whereNot($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' != ?';
+        $this->where[] = $this->quoteIdentifier($column).' != ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -177,7 +177,7 @@ 
      */
     public function whereExpr($column, $expression)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' = ' . $expression;
+        $this->where[] = $this->quoteIdentifier($column).' = '.$expression;
         return $this;
     }
 
@@ -204,7 +204,7 @@ 
      */
     public function whereLt($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' < ?';
+        $this->where[] = $this->quoteIdentifier($column).' < ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -218,7 +218,7 @@ 
      */
     public function whereLte($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' <= ?';
+        $this->where[] = $this->quoteIdentifier($column).' <= ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -232,7 +232,7 @@ 
      */
     public function whereGt($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' > ?';
+        $this->where[] = $this->quoteIdentifier($column).' > ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -246,7 +246,7 @@ 
      */
     public function whereGte($column, $value)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' >= ?';
+        $this->where[] = $this->quoteIdentifier($column).' >= ?';
         $this->buildParams[] = $value;
         return $this;
     }
@@ -257,7 +257,7 @@ 
      */
     public function whereNotNull($column)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' IS NOT NULL';
+        $this->where[] = $this->quoteIdentifier($column).' IS NOT NULL';
         return $this;
     }
 
@@ -267,7 +267,7 @@ 
      */
     public function whereNull($column)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' IS NULL';
+        $this->where[] = $this->quoteIdentifier($column).' IS NULL';
         return $this;
     }
 
@@ -278,8 +278,8 @@ 
      */
     public function whereIn($column, array $data)
     {
-        $this->where[] = $this->quoteIdentifier($column) . ' IN (' .
-            substr(str_repeat('?, ', count($data)), 0, -2) .
+        $this->where[] = $this->quoteIdentifier($column).' IN ('.
+            substr(str_repeat('?, ', count($data)), 0, -2).
             ')';
         $this->buildParams = array_merge($this->buildParams, $data);
         return $this;
@@ -292,7 +292,7 @@ 
      */
     public function orderByAsc($column)
     {
-        $this->order[] = $this->quoteIdentifier($column) . ' ASC';
+        $this->order[] = $this->quoteIdentifier($column).' ASC';
         return $this;
     }
 
@@ -302,7 +302,7 @@ 
      */
     public function orderByDesc($column)
     {
-        $this->order[] = $this->quoteIdentifier($column) . ' DESC';
+        $this->order[] = $this->quoteIdentifier($column).' DESC';
         return $this;
     }
 
@@ -362,11 +362,11 @@ 
         }
 
         // from
-        $query .= ' FROM ' . $this->quoteIdentifier($this->table);
+        $query .= ' FROM '.$this->quoteIdentifier($this->table);
 
         // where
         if (!empty($this->where)) {
-            $query .= ' WHERE ' . implode(' AND ', $this->where);
+            $query .= ' WHERE '.implode(' AND ', $this->where);
 
             // params (CAUTION, we override the array, faster and not used before!)
             $params = $this->buildParams;
@@ -374,16 +374,16 @@ 
 
         // order
         if (!empty($this->order)) {
-            $query .= ' ORDER BY ' . implode(', ', $this->order);
+            $query .= ' ORDER BY '.implode(', ', $this->order);
         }
 
         // limit
         if ($this->limit !== null) {
-            $query .= ' LIMIT ' . (int)$this->limit;
+            $query .= ' LIMIT '.(int)$this->limit;
 
             // offset
             if ($this->offset !== null) {
-                $query .= ' OFFSET ' . (int)$this->offset;
+                $query .= ' OFFSET '.(int)$this->offset;
             }
         }
 

Source/Rorm.php

Spacing +2 added lines, -2 removed lines

@@ -98,12 +98,12 @@
         if (static::isMySQL($dbh)) {
             // mysql mode
             return function ($identifier) {
-                return '`' . str_replace('`', '``', $identifier) . '`';
+                return '`'.str_replace('`', '``', $identifier).'`';
             };
         } else {
             // standard sql mode
             return function ($identifier) {
-                return '"' . str_replace('"', '""', $identifier) . '"';
+                return '"'.str_replace('"', '""', $identifier).'"';
             };
         }
     }