danielgp / common-lib

source/MySQLiByDanielGPqueries.php

Spacing +32 added lines, -32 removed lines

@@ -48,7 +48,7 @@ 
     private function correctTableWithQuotesAsFieldPrefix($referenceTable)
     {
         if ($referenceTable != '') {
-            return '`' . str_replace('`', '', $referenceTable) . '`.';
+            return '`'.str_replace('`', '', $referenceTable).'`.';
         }
         return '';
     }
@@ -81,7 +81,7 @@ 
     private function sGlueFilterValIntoWhereStr($filterValue)
     {
         if (is_array($filterValue)) {
-            return 'IN ("' . implode('", "', $filterValue) . '")';
+            return 'IN ("'.implode('", "', $filterValue).'")';
         }
         return $this->sGlueFilterValueIntoWhereStringFinal($filterValue);
     }
@@ -94,13 +94,13 @@ 
             'NOT NULL|NULL',
         ];
         if (in_array($filterValue, explode('|', $kFields[0]))) {
-            return '= ' . $filterValue;
+            return '= '.$filterValue;
         } elseif (in_array($filterValue, explode('|', $kFields[1]))) {
             return $filterValue;
         } elseif (in_array($filterValue, explode('|', $kFields[2]))) {
-            return 'IS ' . $filterValue;
+            return 'IS '.$filterValue;
         }
-        return '= "' . $filterValue . '"';
+        return '= "'.$filterValue.'"';
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     private function sGlueFiltersIntoWhereArrayFilter($filters)
     {
-        return '(' . implode(') AND (', $filters) . ')';
+        return '('.implode(') AND (', $filters).')';
     }
 
     /**
@@ -129,7 +129,7 @@ 
         $fltr = [];
         unset($filterArray['LIMIT']);
         foreach ($filterArray as $key => $value) {
-            $fltr[] = '`' . $tableToApplyFilterTo . '`.`' . $key . '` ' . $this->sGlueFilterValIntoWhereStr($value);
+            $fltr[] = '`'.$tableToApplyFilterTo.'`.`'.$key.'` '.$this->sGlueFilterValIntoWhereStr($value);
         }
         return $this->sManageDynamicFiltersFinal($fltr);
     }
@@ -138,7 +138,7 @@ 
     {
         if (count($filters) > 0) {
             $sReturn = ['WHERE', $this->sGlueFiltersIntoWhereArrayFilter($filters)];
-            return implode(' ', $sReturn) . ' ';
+            return implode(' ', $sReturn).' ';
         }
         return '';
     }
@@ -159,13 +159,13 @@ 
         $filterArray = (is_array($filterArray) ? $filterArray : ['' => '']);
         return 'SELECT '
             . '`C`.`TABLE_SCHEMA`, '
-            . $this->sQueryMySqlColumnsColumns() . ' '
+            . $this->sQueryMySqlColumnsColumns().' '
             . 'FROM `information_schema`.`COLUMNS` `C` '
-            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON ((' . implode(') AND (', [
+            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON (('.implode(') AND (', [
                 '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
                 '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
                 '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
-            ]) . ')) '
+            ]).')) '
             . $this->sManageDynamicFilters($filterArray, 'C')
             . 'GROUP BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`COLUMN_NAME` '
             . 'ORDER BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`ORDINAL_POSITION` '
@@ -192,20 +192,20 @@ 
     {
         return 'SELECT '
             . '`KCU`.`CONSTRAINT_SCHEMA`, '
-            . $this->sQueryMySqlIndexesColumns() . ' '
+            . $this->sQueryMySqlIndexesColumns().' '
             . 'FROM `information_schema`.`KEY_COLUMN_USAGE` `KCU` '
-            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON ((' . implode(') AND (', [
+            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON (('.implode(') AND (', [
                 '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
                 '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
                 '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
-            ]) . ')) '
-            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON ((' . implode(') AND (', [
+            ]).')) '
+            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON (('.implode(') AND (', [
                 '`KCU`.`CONSTRAINT_SCHEMA` = `RC`.`CONSTRAINT_SCHEMA`',
                 '`KCU`.`CONSTRAINT_NAME` = `RC`.`CONSTRAINT_NAME`',
-            ]) . ')) '
+            ]).')) '
             . $this->sManageDynamicFilters($filterArray, 'KCU')
             . 'ORDER BY `KCU`.`TABLE_SCHEMA`, `KCU`.`TABLE_NAME`'
-            . $this->xtraSoring($filterArray, 'COLUMN_NAME') . ';';
+            . $this->xtraSoring($filterArray, 'COLUMN_NAME').';';
     }
 
     private function sQueryMySqlIndexesColumns()
@@ -221,23 +221,23 @@ 
     {
         $tblAls  = substr($tblName, 0, 1);
         $colName = (is_null($adtnlCol) ? $tblName : $adtnlFltr);
-        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`' . $tblName . '` `' . $tblAls . '` '
-            . 'WHERE (`' . $tblAls . '`.`' . $lnkDbCol . '` = `S`.`SCHEMA_NAME`)'
-            . (!is_null($adtnlCol) ? ' AND (`' . $tblAls . '`.`' . $adtnlCol . '` = "' . $adtnlFltr . '")' : '')
-            . ') AS `' . ucwords(strtolower($colName)) . '`';
+        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`'.$tblName.'` `'.$tblAls.'` '
+            . 'WHERE (`'.$tblAls.'`.`'.$lnkDbCol.'` = `S`.`SCHEMA_NAME`)'
+            . (!is_null($adtnlCol) ? ' AND (`'.$tblAls.'`.`'.$adtnlCol.'` = "'.$adtnlFltr.'")' : '')
+            . ') AS `'.ucwords(strtolower($colName)).'`';
     }
 
     protected function sQueryMySqlStatistics($filterArray = null)
     {
         return 'SELECT '
             . '`S`.`SCHEMA_NAME`, '
-            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE') . ', '
-            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW') . ', '
-            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA') . ', '
-            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA') . ', '
-            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function') . ', '
-            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure') . ', '
-            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA') . ' '
+            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE').', '
+            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW').', '
+            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA').', '
+            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA').', '
+            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function').', '
+            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure').', '
+            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA').' '
             . 'FROM `information_schema`.`SCHEMATA` `S` '
             . 'WHERE (`S`.`SCHEMA_NAME` NOT IN ("information_schema", "mysql", "performance_schema", "sys")) '
             . str_replace('WHERE', 'AND', $this->sManageDynamicFilters($filterArray, 'S'))
@@ -258,7 +258,7 @@ 
             . ', `T`.`CREATE_OPTIONS`, `T`.`TABLE_COMMENT` '
             . 'FROM `information_schema`.`TABLES` `T` '
             . $this->sManageDynamicFilters($filterArray, 'T')
-            . $this->xtraSoring($filterArray, 'TABLE_SCHEMA') . ';';
+            . $this->xtraSoring($filterArray, 'TABLE_SCHEMA').';';
     }
 
     /**
@@ -273,8 +273,8 @@ 
     {
         $filters2 = implode(', ', array_diff($value, ['']));
         if ($filters2 != '') {
-            return '(' . $referenceTable . '`' . $key . '` IN ("'
-                . str_replace(',', '","', str_replace(["'", '"'], '', $filters2)) . '"))';
+            return '('.$referenceTable.'`'.$key.'` IN ("'
+                . str_replace(',', '","', str_replace(["'", '"'], '', $filters2)).'"))';
         }
         return '';
     }
@@ -292,7 +292,7 @@ 
         if ((substr($value, 0, 1) == '%') && (substr($value, -1) == '%')) {
             $fTemp = 'LIKE';
         }
-        return '(`' . $key . '` ' . $fTemp . '"' . $value . '")';
+        return '(`'.$key.'` '.$fTemp.'"'.$value.'")';
     }
 
     private function xtraSoring($filterArray, $filterValueToDecide)

source/MySQLiByDanielGPstructures.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
      */
     protected function getFieldNameForDisplay($details)
     {
-        $tableUniqueId = $details['TABLE_SCHEMA'] . '.' . $details['TABLE_NAME'];
+        $tableUniqueId = $details['TABLE_SCHEMA'].'.'.$details['TABLE_NAME'];
         if ($details['COLUMN_COMMENT'] != '') {
             return $details['COLUMN_COMMENT'];
         } elseif (isset($this->advCache['tableStructureLocales'][$tableUniqueId][$details['COLUMN_NAME']])) {
@@ -85,8 +85,8 @@ 
      */
     protected function getFieldOutputTextFK($foreignKeysArray, $value, $iar)
     {
-        $query   = $this->sQueryGenericSelectKeyValue([
-            '`' . $value['COLUMN_NAME'] . '`',
+        $query = $this->sQueryGenericSelectKeyValue([
+            '`'.$value['COLUMN_NAME'].'`',
             $foreignKeysArray[$value['COLUMN_NAME']][2],
             $foreignKeysArray[$value['COLUMN_NAME']][0]
         ]);