dvdoug / DB

MySQLColumnMeta.php

Indentation +9 added lines, -9 removed lines

@@ -137,18 +137,18 @@
        * Metadata from the data stored
        */
       $query = sprintf("SELECT COUNT(*) AS COUNT FROM (SELECT %s FROM %s.%s GROUP BY %s) distinctvalues",
-                       $this->connection->quoteIdentifier($this->name),
-                       $this->connection->quoteIdentifier($this->database),
-                       $this->connection->quoteIdentifier($this->table),
-                       $this->connection->quoteIdentifier($this->name));
+                        $this->connection->quoteIdentifier($this->name),
+                        $this->connection->quoteIdentifier($this->database),
+                        $this->connection->quoteIdentifier($this->table),
+                        $this->connection->quoteIdentifier($this->name));
       $this->distinctValues = $this->connection->query($query)->fetchAssoc(false)['COUNT'];
 
       $query = sprintf("SELECT MIN(%s) AS ROWMIN, MAX(%s) AS ROWMAX FROM %s.%s WHERE %s IS NOT NULL",
-                       $this->connection->quoteIdentifier($this->name),
-                       $this->connection->quoteIdentifier($this->name),
-                       $this->connection->quoteIdentifier($this->database),
-                       $this->connection->quoteIdentifier($this->table),
-                       $this->connection->quoteIdentifier($this->name));
+                        $this->connection->quoteIdentifier($this->name),
+                        $this->connection->quoteIdentifier($this->name),
+                        $this->connection->quoteIdentifier($this->database),
+                        $this->connection->quoteIdentifier($this->table),
+                        $this->connection->quoteIdentifier($this->name));
       $data = $this->connection->query($query)->fetchAssoc(false);
       $this->maxValue = $data['ROWMAX'];
       $this->minValue = $data['ROWMIN'];

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':

MSSQLPDODatabase.php

Indentation +6 added lines, -6 removed lines

@@ -97,11 +97,11 @@ 
     }
 
       /**
-     * Primary key column(s)
-     * @param string $aDatabase database/schema name
-     * @param string $aTable table name
-     * @return array
-     */
+       * Primary key column(s)
+       * @param string $aDatabase database/schema name
+       * @param string $aTable table name
+       * @return array
+       */
     public function getPrimaryKey($aDatabase, $aTable) {
       $columns = array();
       $SQL = "SELECT ind.name AS INDEX_NAME,
@@ -150,7 +150,7 @@ 
      * @param string $aDatabase database/schema name
      * @param string $aTable table name
      * @return array
-    */
+     */
     public function getIndexes($aDatabase, $aTable) {
 
       $indexes = array();

MSSQLColumnMeta.php

Indentation +14 added lines, -14 removed lines

@@ -133,20 +133,20 @@ 
        */
       if (!in_array($this->type, array('TEXT', 'NTEXT', 'IMAGE'))) {
         $query = sprintf("SELECT COUNT(*) AS COUNT FROM (SELECT %s FROM %s.%s GROUP BY %s) distinctvalues",
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name));
         $this->distinctValues = $this->connection->query($query)->fetchAssoc(false)['COUNT'];
       }
 
       if (!in_array($this->type, array('BIT', 'TEXT', 'NTEXT', 'IMAGE', 'UNIQUEIDENTIFIER'))) {
         $query = sprintf("SELECT MIN(%s) AS ROWMIN, MAX(%s) AS ROWMAX FROM %s.%s WHERE %s IS NOT NULL",
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name));
         $data = $this->connection->query($query)->fetchAssoc(false);
         $this->maxValue = $data['ROWMAX'];
         $this->minValue = $data['ROWMIN'];
@@ -221,10 +221,10 @@ 
          * Work out whether date or datetime
         */
         $query = sprintf("SELECT COUNT(*) AS COUNT FROM %s.%s WHERE %s IS NOT NULL AND CONVERT(VARCHAR(8), %s, 108) != '00:00:00'",
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->name));
         $rows = $this->connection->query($query)->fetchAssoc(false);
 
         if ($rows['COUNT'] > 0) {
@@ -340,7 +340,7 @@ 
       case 'SMALLDATETIME':
       case 'DATETIMEOFFSET':
         if ($this->precision) {
-           return 'TIMESTAMP';
+            return 'TIMESTAMP';
         }
         else {
           return 'DATE';

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':

DDLGeneration.php

Indentation +8 added lines, -8 removed lines

@@ -29,9 +29,9 @@ 
 
       if (in_array($MySQLType, array('ENUM', 'SET'))) {
         $query = sprintf("SHOW COLUMNS FROM %s.%s LIKE %s",
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->escape($this->name));
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->escape($this->name));
 
         $statement = $this->connection->query($query);
         $values = $statement->fetchAssoc(false)['Type'];
@@ -44,11 +44,11 @@ 
       }
       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),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->name));
         $values = array();
         foreach ($this->connection->query($query) as $value) {
           $values[] = trim($value[$this->name]);

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;

OraclePDODatabase.php

Indentation +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
      * @param string $aDatabase database/schema name
      * @param string $aTable table name
      * @return array
-    */
+     */
     public function getIndexes($aDatabase, $aTable) {
 
       $indexes = array();

OracleColumnMeta.php

Indentation +16 added lines, -16 removed lines

@@ -134,18 +134,18 @@ 
        */
       try {
         $query = sprintf("SELECT COUNT(*) AS COUNT FROM (SELECT %s FROM %s.%s GROUP BY %s) distinctvalues",
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name));
         $this->distinctValues = $this->connection->query($query)->fetchAssoc(false)['COUNT'];
 
         $query = sprintf("SELECT MIN(%s) AS ROWMIN, MAX(%s) AS ROWMAX FROM %s.%s WHERE %s IS NOT NULL",
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->name),
-                         $this->connection->quoteIdentifier($this->database),
-                         $this->connection->quoteIdentifier($this->table),
-                         $this->connection->quoteIdentifier($this->name));
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->name),
+                          $this->connection->quoteIdentifier($this->database),
+                          $this->connection->quoteIdentifier($this->table),
+                          $this->connection->quoteIdentifier($this->name));
         $data = $this->connection->query($query)->fetchAssoc(false);
         $this->maxValue = $data['ROWMAX'];
         $this->minValue = $data['ROWMIN'];
@@ -154,9 +154,9 @@ 
       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),
-                           $this->connection->quoteIdentifier($this->table),
-                           $this->connection->quoteIdentifier($this->name));
+                            $this->connection->quoteIdentifier($this->database),
+                            $this->connection->quoteIdentifier($this->table),
+                            $this->connection->quoteIdentifier($this->name));
           $this->distinctValues = $this->connection->query($query)->fetchAssoc(false)['COUNT'] ?: 1;
         }
       }
@@ -263,10 +263,10 @@ 
            * Work out whether date or datetime
            */
           $query = sprintf("SELECT COUNT(*) AS COUNT FROM %s.%s WHERE %s IS NOT NULL AND TO_CHAR(%s, 'SSSSS') > 0",
-                           $this->connection->quoteIdentifier($this->database),
-                           $this->connection->quoteIdentifier($this->table),
-                           $this->connection->quoteIdentifier($this->name),
-                           $this->connection->quoteIdentifier($this->name));
+                            $this->connection->quoteIdentifier($this->database),
+                            $this->connection->quoteIdentifier($this->table),
+                            $this->connection->quoteIdentifier($this->name),
+                            $this->connection->quoteIdentifier($this->name));
           $rows = $this->connection->query($query)->fetchAssoc(false);
 
           if ($rows['COUNT'] > 0) {

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':

MySQLPDODatabase.php

Indentation +6 added lines, -6 removed lines

@@ -103,11 +103,11 @@ 
     }
 
       /**
-     * Primary key column(s)
-     * @param string $aDatabase database/schema name
-     * @param string $aTable table name
-     * @return array
-     */
+       * Primary key column(s)
+       * @param string $aDatabase database/schema name
+       * @param string $aTable table name
+       * @return array
+       */
     public function getPrimaryKey($aDatabase, $aTable) {
       $columns = array();
       $SQL = "SELECT ORDINAL_POSITION, COLUMN_NAME
@@ -133,7 +133,7 @@ 
      * @param string $aDatabase database/schema name
      * @param string $aTable table name
      * @return array
-    */
+     */
     public function getIndexes($aDatabase, $aTable) {
 
       $indexes = array();

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 .= ')';
         }
       }