dvdoug / DB

MySQLColumnMeta.php

Spacing +1 added lines, -1 removed lines

@@ -259,7 +259,7 @@
      * @return int
      */
     public function getLength() {
-      switch($this->getOriginalType()) {
+      switch ($this->getOriginalType()) {
         case 'BIT':
         case 'TINYINT':
         case 'TINYINT UNSIGNED':

Braces +1 added lines, -2 removed lines

@@ -213,8 +213,7 @@
         case 'DATETIME':
           if ($this->precision) {
             return 'TIMESTAMP';
-          }
-          else {
+          } else {
             return 'DATE';
           }
 

MSSQLPDODatabase.php

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
         $statement = $this->prepare("SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = :database ORDER BY TABLE_NAME ASC");
         $statement->bindParamToValue(':database', $aDatabase);
         $statement->execute();
-      }
-      else {
+      } else {
         $statement = $this->query("SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES");
       }
 

MSSQLColumnMeta.php

Spacing +1 added lines, -1 removed lines

@@ -391,7 +391,7 @@
      * @return int
      */
     public function getLength() {
-      switch($this->getOriginalType()) {
+      switch ($this->getOriginalType()) {
         case 'TINYINT':
         case 'SMALLINT':
         case 'INT':

Braces +5 added lines, -10 removed lines

@@ -229,8 +229,7 @@ 
 
         if ($rows['COUNT'] > 0) {
           return 'DATETIME';
-        }
-        else {
+        } else {
           return 'DATE';
         }
         break;
@@ -238,8 +237,7 @@ 
       case 'DATETIMEOFFSET':
         if ($this->minValue >= '1970-01-01 00:00:01' && $this->maxValue <= '2038-01-19 03:14:07') {
           return 'TIMESTAMP';
-        }
-        else {
+        } else {
           return 'DATETIME';
         }
         break;
@@ -257,8 +255,7 @@ 
       case 'NVARCHAR':
         if ($this->getLength() == -1) {
           return 'LONGTEXT';
-        }
-        else {
+        } else {
           return 'VARCHAR';
         }
         break;
@@ -275,8 +272,7 @@ 
       case 'VARBINARY':
         if ($this->getLength() == -1) {
           return 'LONGBLOB';
-        }
-        else {
+        } else {
           return 'VARBINARY';
         }
         break;
@@ -341,8 +337,7 @@ 
       case 'DATETIMEOFFSET':
         if ($this->precision) {
            return 'TIMESTAMP';
-        }
-        else {
+        } else {
           return 'DATE';
         }
         break;

DDLGeneration.php

Spacing +4 added lines, -4 removed lines

@@ -36,11 +36,11 @@ 
         $statement = $this->connection->query($query);
         $values = $statement->fetchAssoc(false)['Type'];
         $values = explode("','", substr($values, strpos($values, '(') + 2, -2));
-        $values = array_intersect_key($values,array_unique(array_map("strtolower",$values)));
+        $values = array_intersect_key($values, array_unique(array_map("strtolower", $values)));
         asort($values);
 
         $def .= $MySQLType;
-        $def .= '(' . join(', ', array_map(function($c) {return "'".addslashes($c)."'";}, $values)) . ')';
+        $def .= '(' . join(', ', array_map(function($c) {return "'" . addslashes($c) . "'"; }, $values)) . ')';
       }
       else if (in_array($MySQLType, array('CHAR', 'VARCHAR')) && $this->getLength() < 64 && $this->getDistinctValueCount() <= 16) {
         $query = sprintf("SELECT DISTINCT %s FROM %s.%s WHERE %s IS NOT NULL ORDER BY %s ASC",
@@ -53,12 +53,12 @@ 
         foreach ($this->connection->query($query) as $value) {
           $values[] = trim($value[$this->name]);
         }
-        $values = array_intersect_key($values,array_unique(array_map("strtolower",$values)));
+        $values = array_intersect_key($values, array_unique(array_map("strtolower", $values)));
         asort($values);
 
         if ($values) {
           $def .= 'ENUM';
-          $def .= '(' . join(', ', array_map(function($c) {return "'".addslashes($c)."'";}, $values)) . ')';
+          $def .= '(' . join(', ', array_map(function($c) {return "'" . addslashes($c) . "'"; }, $values)) . ')';
         }
         else {
           $def .= $MySQLType;

Braces +11 added lines, -22 removed lines

@@ -22,8 +22,7 @@ 
       if (strpos($MySQLType, 'UNSIGNED') !== false) {
         $unsigned = true;
         $MySQLType = substr($MySQLType, 0, -9);
-      }
-      else {
+      } else {
         $unsigned = false;
       }
 
@@ -41,8 +40,7 @@ 
 
         $def .= $MySQLType;
         $def .= '(' . join(', ', array_map(function($c) {return "'".addslashes($c)."'";}, $values)) . ')';
-      }
-      else if (in_array($MySQLType, array('CHAR', 'VARCHAR')) && $this->getLength() < 64 && $this->getDistinctValueCount() <= 16) {
+      } else if (in_array($MySQLType, array('CHAR', 'VARCHAR')) && $this->getLength() < 64 && $this->getDistinctValueCount() <= 16) {
         $query = sprintf("SELECT DISTINCT %s FROM %s.%s WHERE %s IS NOT NULL ORDER BY %s ASC",
                          $this->connection->quoteIdentifier($this->name),
                          $this->connection->quoteIdentifier($this->database),
@@ -59,28 +57,23 @@ 
         if ($values) {
           $def .= 'ENUM';
           $def .= '(' . join(', ', array_map(function($c) {return "'".addslashes($c)."'";}, $values)) . ')';
-        }
-        else {
+        } else {
           $def .= $MySQLType;
           if ($this->getLength() > 0) {
             $def .= '(' . $this->getLength() . ')';
           }
         }
-      }
-      else if (in_array($MySQLType, array('DATETIME', 'TIMESTAMP', 'TIME'))) {
+      } else if (in_array($MySQLType, array('DATETIME', 'TIMESTAMP', 'TIME'))) {
         $def .= $MySQLType;
         $def .= '(' . (int)$this->getScale() . ')';
-      }
-      else {
+      } else {
         $def .= $MySQLType;
 
         if ($this->getScale() && !in_array($MySQLType, array('DATE'))) {
           $def .= '(' . $this->getPrecision() . ',' . $this->getScale() . ')';
-        }
-        else if ($this->getPrecision() && !in_array($MySQLType, array('TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT'))) {
+        } else if ($this->getPrecision() && !in_array($MySQLType, array('TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT'))) {
           $def .= '(' . $this->getPrecision() . ')';
-        }
-        else if ($this->getLength() > 0 && !in_array($MySQLType, array('TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT'))) {
+        } else if ($this->getLength() > 0 && !in_array($MySQLType, array('TINYINT', 'SMALLINT', 'MEDIUMINT', 'INT', 'BIGINT'))) {
           $def .= '(' . $this->getLength() . ')';
         }
 
@@ -91,8 +84,7 @@ 
 
       if ($this->isNullable()) {
         $def .= ' NULL';
-      }
-      else {
+      } else {
         $def .= ' NOT NULL';
       }
 
@@ -109,18 +101,15 @@ 
 
       if ($this->getScale()) {
         $def .= '(' . $this->getPrecision() . ',' . $this->getScale() . ')';
-      }
-      else if ($this->getPrecision()) {
+      } else if ($this->getPrecision()) {
         $def .= '(' . $this->getPrecision() . ')';
-      }
-      else if ($this->getLength()) {
+      } else if ($this->getLength()) {
         $def .= '(' . $this->getLength() . ')';
       }
 
       if ($this->isNullable()) {
         $def .= ' NULL';
-      }
-      else {
+      } else {
         $def .= ' NOT NULL';
       }
 

OraclePDODatabase.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         $statement = $this->prepare("SELECT OWNER, TABLE_NAME FROM ALL_TABLES WHERE OWNER = :owner ORDER BY TABLE_NAME ASC");
         $statement->bindParamToValue(':owner', $aDatabase);
         $statement->execute();
-      }
-      else {
+      } else {
         $statement = $this->query("SELECT OWNER, TABLE_NAME FROM ALL_TABLES");
       }
 

OracleColumnMeta.php

Spacing +1 added lines, -1 removed lines

@@ -317,7 +317,7 @@
      * @return int
      */
     public function getLength() {
-      switch($this->getOriginalType()) {
+      switch ($this->getOriginalType()) {
         case 'NUMBER':
         case 'CHAR':
         case 'NCHAR':

Braces +15 added lines, -30 removed lines

@@ -150,8 +150,7 @@ 
         $this->maxValue = $data['ROWMAX'];
         $this->minValue = $data['ROWMIN'];
 
-      }
-      catch (\Exception $e) { //LONG column has restrictions on querying, so just get total value count
+      } catch (\Exception $e) { //LONG column has restrictions on querying, so just get total value count
         if (strpos($e->getMessage(), 'ORA-00997: illegal use of LONG datatype') !== false) {
           $query = sprintf("SELECT COUNT(*) AS COUNT FROM %s.%s WHERE %s IS NOT NULL",
                            $this->connection->quoteIdentifier($this->database),
@@ -192,45 +191,33 @@ 
             if ($this->minValue >= 0) { //unsigned
               if (bccomp($this->maxValue, '256') === -1) {
                 return 'TINYINT UNSIGNED';
-              }
-              else if (bccomp($this->maxValue, '65536') === -1) {
+              } else if (bccomp($this->maxValue, '65536') === -1) {
                 return 'SMALLINT UNSIGNED';
-              }
-              else if (bccomp($this->maxValue, '16777216') === -1) {
+              } else if (bccomp($this->maxValue, '16777216') === -1) {
                 return 'MEDIUMINT UNSIGNED';
-              }
-              else if (bccomp($this->maxValue, '4294967296') === -1) {
+              } else if (bccomp($this->maxValue, '4294967296') === -1) {
                 return 'INT UNSIGNED';
-              }
-              else if (bccomp($this->maxValue, '18446744073709551616') === -1) {
+              } else if (bccomp($this->maxValue, '18446744073709551616') === -1) {
                 return 'BIGINT UNSIGNED';
-              }
-              else {
+              } else {
                 return 'NUMERIC';
               }
-            }
-            else { //signed
+            } else { //signed
               if (bccomp(max(abs($this->minValue), $this->maxValue), '128') === -1) {
                 return 'TINYINT';
-              }
-              else if (bccomp(max(abs($this->minValue), $this->maxValue), '32768') === -1) {
+              } else if (bccomp(max(abs($this->minValue), $this->maxValue), '32768') === -1) {
                 return 'SMALLINT';
-              }
-              else if (bccomp(max(abs($this->minValue), $this->maxValue), '8388608') === -1) {
+              } else if (bccomp(max(abs($this->minValue), $this->maxValue), '8388608') === -1) {
                 return 'MEDIUMINT';
-              }
-              else if (bccomp(max(abs($this->minValue), $this->maxValue), '2147483648') === -1) {
+              } else if (bccomp(max(abs($this->minValue), $this->maxValue), '2147483648') === -1) {
                 return 'INT';
-              }
-              else if (bccomp(max(abs($this->minValue), $this->maxValue), '9223372036854775808') === -1) {
+              } else if (bccomp(max(abs($this->minValue), $this->maxValue), '9223372036854775808') === -1) {
                 return 'BIGINT';
-              }
-              else {
+              } else {
                 return 'DECIMAL';
               }
             }
-          }
-          else {
+          } else {
             return 'DECIMAL';
           }
           break;
@@ -252,8 +239,7 @@ 
         case 'TIMESTAMP WITH LOCAL TIME ZONE':
           if ($this->minValue >= '1970-01-01 00:00:01' && $this->maxValue <= '2038-01-19 03:14:07') {
             return 'TIMESTAMP';
-          }
-          else {
+          } else {
             return 'DATETIME';
           }
 
@@ -271,8 +257,7 @@ 
 
           if ($rows['COUNT'] > 0) {
             return 'DATETIME';
-          }
-          else {
+          } else {
             return 'DATE';
           }
           break;

MySQLPDODatabase.php

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
         $statement = $this->prepare("SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = :database ORDER BY TABLE_NAME ASC");
         $statement->bindParamToValue(':database', $aDatabase);
         $statement->execute();
-      }
-      else {
+      } else {
         $statement = $this->query("SELECT TABLE_SCHEMA, TABLE_NAME FROM INFORMATION_SCHEMA.TABLES");
       }
 

PDOStatement.php

Braces +7 added lines, -14 removed lines

@@ -30,12 +30,10 @@ 
       if ($aAllRows) {
         if ($aGroupByFirstCol) {
           return $this->fetchAll(\PDO::FETCH_ASSOC | \PDO::FETCH_GROUP);
-        }
-        else {
+        } else {
           return $this->fetchAll(\PDO::FETCH_ASSOC);
         }
-      }
-      else {
+      } else {
         return $this->fetch(\PDO::FETCH_ASSOC);
       }
     }
@@ -50,12 +48,10 @@ 
       if ($aAllRows) {
         if ($aGroupByFirstCol) {
           return $this->fetchAll(\PDO::FETCH_KEY_PAIR | \PDO::FETCH_GROUP);
-        }
-        else {
+        } else {
           return $this->fetchAll(\PDO::FETCH_KEY_PAIR);
         }
-      }
-      else {
+      } else {
         return $this->fetch(\PDO::FETCH_KEY_PAIR);
       }
     }
@@ -72,20 +68,17 @@ 
     public function fetchObj($aClassName = 'stdClass', $aConstructorArguments = array(), $aRunConstructorFirst = true, $aAllRows = true, $aGroupByFirstCol = false) {
       if ($aRunConstructorFirst) {
         $this->setFetchMode(\PDO::FETCH_CLASS | \PDO::FETCH_PROPS_LATE, $aClassName, $aConstructorArguments);
-      }
-      else {
+      } else {
         $this->setFetchMode(\PDO::FETCH_CLASS, $aClassName, $aConstructorArguments);
       }
 
       if ($aAllRows) {
         if ($aGroupByFirstCol) {
           return $this->fetchAll(\PDO::FETCH_CLASS | \PDO::FETCH_GROUP);
-        }
-        else {
+        } else {
           return $this->fetchAll(\PDO::FETCH_CLASS);
         }
-      }
-      else {
+      } else {
         return $this->fetch(\PDO::FETCH_CLASS);
       }
     }

PDODatabase.php

Spacing +4 added lines, -4 removed lines

@@ -127,7 +127,7 @@ 
         if ($length <= 191) { //skip index if too long for MySQL
           $tableDef .= ',' . PHP_EOL . PHP_EOL;
           $tableDef .= 'PRIMARY KEY (';
-          $tableDef .= join(', ' . PHP_EOL, array_map(function($c) {return '`'.strtolower($c).'`';}, $primaryKey));
+          $tableDef .= join(', ' . PHP_EOL, array_map(function($c) {return '`' . strtolower($c) . '`'; }, $primaryKey));
           $tableDef .= ')';
         }
       }
@@ -151,7 +151,7 @@ 
           }
           $tableDef .= ',' . PHP_EOL;
           $tableDef .= 'KEY `' . strtolower($indexName) . '` (';
-          $tableDef .= join(", ", array_map(function($c) {return '`'.strtolower($c).'`';}, $indexColumns));
+          $tableDef .= join(", ", array_map(function($c) {return '`' . strtolower($c) . '`'; }, $indexColumns));
           $tableDef .= ')';
         }
       }
@@ -193,7 +193,7 @@ 
       if ($primaryKey) {
         $tableDef .= ',' . PHP_EOL . PHP_EOL;
         $tableDef .= 'PRIMARY KEY (';
-        $tableDef .= join(', ' . PHP_EOL, array_map(function($c) {return '"'.strtolower($c).'"';}, $primaryKey));
+        $tableDef .= join(', ' . PHP_EOL, array_map(function($c) {return '"' . strtolower($c) . '"'; }, $primaryKey));
         $tableDef .= ')';
       }
 
@@ -206,7 +206,7 @@ 
           }
           $tableDef .= ',' . PHP_EOL;
           $tableDef .= 'KEY `' . strtolower($indexName) . '` (';
-          $tableDef .= join(', ', array_map(function($c) {return '"'.strtolower($c).'"';}, $indexColumns));
+          $tableDef .= join(', ', array_map(function($c) {return '"' . strtolower($c) . '"'; }, $indexColumns));
           $tableDef .= ')';
         }
       }

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
         case self::PARAM_IS_INT:
           if (is_int($aParam) || ctype_digit($aParam)) {
             return (int)$aParam;
-          }
-          else {
+          } else {
             throw new \RuntimeException("Parameter {$aParam} is not an integer");
           }
           break;