| @@ -66,7 +66,7 @@ discard block | ||
| 66 | 66 | private function sGlueFilterValIntoWhereStr($filterValue) | 
| 67 | 67 |      { | 
| 68 | 68 |          if (is_array($filterValue)) { | 
| 69 | -            return 'IN ("' . implode('", "', $filterValue) . '")'; | |
| 69 | +            return 'IN ("'.implode('", "', $filterValue).'")'; | |
| 70 | 70 | } | 
| 71 | 71 | return $this->sGlueFilterValueIntoWhereStringFinal($filterValue); | 
| 72 | 72 | } | 
| @@ -79,13 +79,13 @@ discard block | ||
| 79 | 79 | 'NOT NULL|NULL', | 
| 80 | 80 | ]; | 
| 81 | 81 |          if (in_array($filterValue, explode('|', $kFields[0]))) { | 
| 82 | - return '= ' . $filterValue; | |
| 82 | + return '= '.$filterValue; | |
| 83 | 83 |          } elseif (in_array($filterValue, explode('|', $kFields[1]))) { | 
| 84 | 84 | return $filterValue; | 
| 85 | 85 |          } elseif (in_array($filterValue, explode('|', $kFields[2]))) { | 
| 86 | - return 'IS ' . $filterValue; | |
| 86 | + return 'IS '.$filterValue; | |
| 87 | 87 | } | 
| 88 | - return '= "' . $filterValue . '"'; | |
| 88 | + return '= "'.$filterValue.'"'; | |
| 89 | 89 | } | 
| 90 | 90 | |
| 91 | 91 | /** | 
| @@ -96,7 +96,7 @@ discard block | ||
| 96 | 96 | */ | 
| 97 | 97 | private function sGlueFiltersIntoWhereArrayFilter($filters) | 
| 98 | 98 |      { | 
| 99 | -        return '(' . implode(') AND (', $filters) . ')'; | |
| 99 | +        return '('.implode(') AND (', $filters).')'; | |
| 100 | 100 | } | 
| 101 | 101 | |
| 102 | 102 | /** | 
| @@ -114,7 +114,7 @@ discard block | ||
| 114 | 114 | $fltr = []; | 
| 115 | 115 | unset($filterArray['LIMIT']); | 
| 116 | 116 |          foreach ($filterArray as $key => $value) { | 
| 117 | - $fltr[] = '`' . $tableToApplyFilterTo . '`.`' . $key . '` ' . $this->sGlueFilterValIntoWhereStr($value); | |
| 117 | + $fltr[] = '`'.$tableToApplyFilterTo.'`.`'.$key.'` '.$this->sGlueFilterValIntoWhereStr($value); | |
| 118 | 118 | } | 
| 119 | 119 | return $this->sManageDynamicFiltersFinal($fltr); | 
| 120 | 120 | } | 
| @@ -123,7 +123,7 @@ discard block | ||
| 123 | 123 |      { | 
| 124 | 124 |          if (count($filters) > 0) { | 
| 125 | 125 | $sReturn = ['WHERE', $this->sGlueFiltersIntoWhereArrayFilter($filters)]; | 
| 126 | -            return implode(' ', $sReturn) . ' '; | |
| 126 | +            return implode(' ', $sReturn).' '; | |
| 127 | 127 | } | 
| 128 | 128 | return ''; | 
| 129 | 129 | } | 
| @@ -144,13 +144,13 @@ discard block | ||
| 144 | 144 | $filterArray = (is_array($filterArray) ? $filterArray : ['' => '']); | 
| 145 | 145 | return 'SELECT ' | 
| 146 | 146 | . '`C`.`TABLE_SCHEMA`, ' | 
| 147 | - . $this->sQueryMySqlColumnsColumns() . ' ' | |
| 147 | + . $this->sQueryMySqlColumnsColumns().' ' | |
| 148 | 148 | . 'FROM `information_schema`.`COLUMNS` `C` ' | 
| 149 | -            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON ((' . implode(') AND (', [ | |
| 149 | +            . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON (('.implode(') AND (', [ | |
| 150 | 150 | '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`', | 
| 151 | 151 | '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`', | 
| 152 | 152 | '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`', | 
| 153 | - ]) . ')) ' | |
| 153 | + ]).')) ' | |
| 154 | 154 | . $this->sManageDynamicFilters($filterArray, 'C') | 
| 155 | 155 | . 'GROUP BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`COLUMN_NAME` ' | 
| 156 | 156 | . 'ORDER BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`ORDINAL_POSITION` ' | 
| @@ -177,20 +177,20 @@ discard block | ||
| 177 | 177 |      { | 
| 178 | 178 | return 'SELECT ' | 
| 179 | 179 | . '`KCU`.`CONSTRAINT_SCHEMA`, ' | 
| 180 | - . $this->sQueryMySqlIndexesColumns() . ' ' | |
| 180 | + . $this->sQueryMySqlIndexesColumns().' ' | |
| 181 | 181 | . 'FROM `information_schema`.`KEY_COLUMN_USAGE` `KCU` ' | 
| 182 | -            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON ((' . implode(') AND (', [ | |
| 182 | +            . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON (('.implode(') AND (', [ | |
| 183 | 183 | '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`', | 
| 184 | 184 | '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`', | 
| 185 | 185 | '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`', | 
| 186 | - ]) . ')) ' | |
| 187 | -            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON ((' . implode(') AND (', [ | |
| 186 | + ]).')) ' | |
| 187 | +            . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON (('.implode(') AND (', [ | |
| 188 | 188 | '`KCU`.`CONSTRAINT_SCHEMA` = `RC`.`CONSTRAINT_SCHEMA`', | 
| 189 | 189 | '`KCU`.`CONSTRAINT_NAME` = `RC`.`CONSTRAINT_NAME`', | 
| 190 | - ]) . ')) ' | |
| 190 | + ]).')) ' | |
| 191 | 191 | . $this->sManageDynamicFilters($filterArray, 'KCU') | 
| 192 | 192 | . 'ORDER BY `KCU`.`TABLE_SCHEMA`, `KCU`.`TABLE_NAME`' | 
| 193 | - . $this->xtraSoring($filterArray, 'COLUMN_NAME') . ';'; | |
| 193 | + . $this->xtraSoring($filterArray, 'COLUMN_NAME').';'; | |
| 194 | 194 | } | 
| 195 | 195 | |
| 196 | 196 | private function sQueryMySqlIndexesColumns() | 
| @@ -206,23 +206,23 @@ discard block | ||
| 206 | 206 |      { | 
| 207 | 207 | $tblAls = substr($tblName, 0, 1); | 
| 208 | 208 | $colName = (is_null($adtnlCol) ? $tblName : $adtnlFltr); | 
| 209 | - return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`' . $tblName . '` `' . $tblAls . '` ' | |
| 210 | - . 'WHERE (`' . $tblAls . '`.`' . $lnkDbCol . '` = `S`.`SCHEMA_NAME`)' | |
| 211 | - . (!is_null($adtnlCol) ? ' AND (`' . $tblAls . '`.`' . $adtnlCol . '` = "' . $adtnlFltr . '")' : '') | |
| 212 | - . ') AS `' . ucwords(strtolower($colName)) . '`'; | |
| 209 | + return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`'.$tblName.'` `'.$tblAls.'` ' | |
| 210 | + . 'WHERE (`'.$tblAls.'`.`'.$lnkDbCol.'` = `S`.`SCHEMA_NAME`)' | |
| 211 | + . (!is_null($adtnlCol) ? ' AND (`'.$tblAls.'`.`'.$adtnlCol.'` = "'.$adtnlFltr.'")' : '') | |
| 212 | + . ') AS `'.ucwords(strtolower($colName)).'`'; | |
| 213 | 213 | } | 
| 214 | 214 | |
| 215 | 215 | protected function sQueryMySqlStatistics($filterArray = null) | 
| 216 | 216 |      { | 
| 217 | 217 | return 'SELECT ' | 
| 218 | 218 | . '`S`.`SCHEMA_NAME`, ' | 
| 219 | -            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE') . ', ' | |
| 220 | -            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW') . ', ' | |
| 221 | -            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA') . ', ' | |
| 222 | -            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA') . ', ' | |
| 223 | -            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function') . ', ' | |
| 224 | -            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure') . ', ' | |
| 225 | -            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA') . ' ' | |
| 219 | +            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE').', ' | |
| 220 | +            . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW').', ' | |
| 221 | +            . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA').', ' | |
| 222 | +            . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA').', ' | |
| 223 | +            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function').', ' | |
| 224 | +            . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure').', ' | |
| 225 | +            . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA').' ' | |
| 226 | 226 | . 'FROM `information_schema`.`SCHEMATA` `S` ' | 
| 227 | 227 |              . 'WHERE (`S`.`SCHEMA_NAME` NOT IN ("information_schema", "mysql", "performance_schema", "sys")) ' | 
| 228 | 228 |              . str_replace('WHERE', 'AND', $this->sManageDynamicFilters($filterArray, 'S')) | 
| @@ -243,7 +243,7 @@ discard block | ||
| 243 | 243 | . ', `T`.`CREATE_OPTIONS`, `T`.`TABLE_COMMENT` ' | 
| 244 | 244 | . 'FROM `information_schema`.`TABLES` `T` ' | 
| 245 | 245 | . $this->sManageDynamicFilters($filterArray, 'T') | 
| 246 | - . $this->xtraSoring($filterArray, 'TABLE_SCHEMA') . ';'; | |
| 246 | + . $this->xtraSoring($filterArray, 'TABLE_SCHEMA').';'; | |
| 247 | 247 | } | 
| 248 | 248 | |
| 249 | 249 | private function xtraSoring($filterArray, $filterValueToDecide) |