Completed
Push — master ( 21732b...5af230 )
by Daniel
02:34
created
source/MySQLiByDanielGPqueriesBasic.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
         $this->sCleanParameters($parameters);
55 55
         return implode(' ', [
56 56
             'SELECT',
57
-            $parameters[0] . ', ' . $parameters[1],
57
+            $parameters[0].', '.$parameters[1],
58 58
             'FROM',
59 59
             $parameters[2],
60 60
             'GROUP BY',
61 61
             $parameters[0],
62 62
             'ORDER BY',
63
-            $parameters[1] . ';'
63
+            $parameters[1].';'
64 64
         ]);
65 65
     }
66 66
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     {
75 75
         $sDBs = 'WHERE '
76 76
                 . '`SCHEMA_NAME` NOT IN ("'
77
-                . implode('", "', ['information_schema', 'mysql', 'performance_schema', 'sys']) . '") ';
77
+                . implode('", "', ['information_schema', 'mysql', 'performance_schema', 'sys']).'") ';
78 78
         return 'SELECT '
79 79
                 . '`SCHEMA_NAME` As `Db`, `DEFAULT_CHARACTER_SET_NAME` AS `DbCharset`, '
80 80
                 . '`DEFAULT_COLLATION_NAME` AS `DbCollation` '
@@ -128,15 +128,15 @@  discard block
 block discarded – undo
128 128
     {
129 129
         $this->sCleanParameters($parameters);
130 130
         return 'SELECT * '
131
-                . 'FROM `' . $parameters[0] . '` '
132
-                . 'WHERE ' . $parameters[1] . ';';
131
+                . 'FROM `'.$parameters[0].'` '
132
+                . 'WHERE '.$parameters[1].';';
133 133
     }
134 134
 
135 135
     protected function sQueryToDeleteSingleIdentifier($parameters)
136 136
     {
137 137
         $this->sCleanParameters($parameters);
138 138
         return 'DELETE '
139
-                . 'FROM `' . $parameters[0] . '` '
140
-                . 'WHERE `' . $parameters[1] . '` = "' . $parameters[2] . '";';
139
+                . 'FROM `'.$parameters[0].'` '
140
+                . 'WHERE `'.$parameters[1].'` = "'.$parameters[2].'";';
141 141
     }
142 142
 }
Please login to merge, or discard this patch.
source/MySQLiByDanielGPqueries.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
         if (is_array($filterArray)) {
116 116
             unset($filterArray['LIMIT']);
117 117
             foreach ($filterArray as $key => $value) {
118
-                $fltr[] = '`' . $tableToApplyFilterTo . '`.`' . $key . '` ' . $this->sGlueFilterValIntoWhereStr($value);
118
+                $fltr[] = '`'.$tableToApplyFilterTo.'`.`'.$key.'` '.$this->sGlueFilterValIntoWhereStr($value);
119 119
             }
120 120
         }
121 121
         return $this->sManageDynamicFiltersFinal($fltr);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     {
126 126
         if (count($filters) > 0) {
127 127
             $sReturn = ['WHERE', $this->sGlueFiltersIntoWhereArrayFilter($filters)];
128
-            return implode(' ', $sReturn) . ' ';
128
+            return implode(' ', $sReturn).' ';
129 129
         }
130 130
         return '';
131 131
     }
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
     private function sManageLimit($filters)
134 134
     {
135 135
         if (array_key_exists('LIMIT', $filters)) {
136
-            return 'LIMIT ' . $filters['LIMIT'];
136
+            return 'LIMIT '.$filters['LIMIT'];
137 137
         }
138 138
         return '';
139 139
     }
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
142 142
     {
143 143
         return 'SELECT '
144 144
                 . '`C`.`TABLE_SCHEMA`, '
145
-                . $this->sQueryMySqlColumnsColumns() . ' '
145
+                . $this->sQueryMySqlColumnsColumns().' '
146 146
                 . 'FROM `information_schema`.`COLUMNS` `C` '
147
-                . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON ((' . implode(') AND (', [
147
+                . 'LEFT JOIN `information_schema`.`KEY_COLUMN_USAGE` `KCU` ON (('.implode(') AND (', [
148 148
                     '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
149 149
                     '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
150 150
                     '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
151
-                ]) . ')) '
151
+                ]).')) '
152 152
                 . $this->sManageDynamicFilters($filterArray, 'C')
153 153
                 . 'GROUP BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`COLUMN_NAME` '
154 154
                 . 'ORDER BY `C`.`TABLE_SCHEMA`, `C`.`TABLE_NAME`, `C`.`ORDINAL_POSITION` '
@@ -175,20 +175,20 @@  discard block
 block discarded – undo
175 175
     {
176 176
         return 'SELECT '
177 177
                 . '`KCU`.`CONSTRAINT_SCHEMA`, '
178
-                . $this->sQueryMySqlIndexesColumns() . ' '
178
+                . $this->sQueryMySqlIndexesColumns().' '
179 179
                 . 'FROM `information_schema`.`KEY_COLUMN_USAGE` `KCU` '
180
-                . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON ((' . implode(') AND (', [
180
+                . 'INNER JOIN `information_schema`.`COLUMNS` `C` ON (('.implode(') AND (', [
181 181
                     '`C`.`TABLE_SCHEMA` = `KCU`.`TABLE_SCHEMA`',
182 182
                     '`C`.`TABLE_NAME` = `KCU`.`TABLE_NAME`',
183 183
                     '`C`.`COLUMN_NAME` = `KCU`.`COLUMN_NAME`',
184
-                ]) . ')) '
185
-                . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON ((' . implode(') AND (', [
184
+                ]).')) '
185
+                . 'LEFT JOIN `information_schema`.`REFERENTIAL_CONSTRAINTS` `RC` ON (('.implode(') AND (', [
186 186
                     '`KCU`.`CONSTRAINT_SCHEMA` = `RC`.`CONSTRAINT_SCHEMA`',
187 187
                     '`KCU`.`CONSTRAINT_NAME` = `RC`.`CONSTRAINT_NAME`',
188
-                ]) . ')) '
188
+                ]).')) '
189 189
                 . $this->sManageDynamicFilters($filterArray, 'KCU')
190 190
                 . 'ORDER BY `KCU`.`TABLE_SCHEMA`, `KCU`.`TABLE_NAME`'
191
-                . $this->xtraSoring($filterArray, 'COLUMN_NAME') . ';';
191
+                . $this->xtraSoring($filterArray, 'COLUMN_NAME').';';
192 192
     }
193 193
 
194 194
     private function sQueryMySqlIndexesColumns()
@@ -203,23 +203,23 @@  discard block
 block discarded – undo
203 203
     private function sQueryMySqlStatisticPattern($tblName, $lnkDbCol, $adtnlCol = null, $adtnlFltr = null)
204 204
     {
205 205
         $tblAls = substr($tblName, 0, 1);
206
-        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`' . $tblName . '` `' . $tblAls . '` '
207
-                . 'WHERE (`' . $tblAls . '`.`' . $lnkDbCol . '` = `S`.`SCHEMA_NAME`)'
208
-                . (!is_null($adtnlCol) ? ' AND (`' . $tblAls . '`.`' . $adtnlCol . '` = "' . $adtnlFltr . '")' : '')
209
-                . ') AS `' . ucwords(strtolower((is_null($adtnlCol) ? $tblName : $adtnlFltr))) . '`';
206
+        return '(SELECT COUNT(*) AS `No. of records` FROM `information_schema`.`'.$tblName.'` `'.$tblAls.'` '
207
+                . 'WHERE (`'.$tblAls.'`.`'.$lnkDbCol.'` = `S`.`SCHEMA_NAME`)'
208
+                . (!is_null($adtnlCol) ? ' AND (`'.$tblAls.'`.`'.$adtnlCol.'` = "'.$adtnlFltr.'")' : '')
209
+                . ') AS `'.ucwords(strtolower((is_null($adtnlCol) ? $tblName : $adtnlFltr))).'`';
210 210
     }
211 211
 
212 212
     protected function sQueryMySqlStatistics($filterArray = null)
213 213
     {
214 214
         return 'SELECT '
215 215
                 . '`S`.`SCHEMA_NAME`, '
216
-                . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE') . ', '
217
-                . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW') . ', '
218
-                . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA') . ', '
219
-                . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA') . ', '
220
-                . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function') . ', '
221
-                . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure') . ', '
222
-                . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA') . ' '
216
+                . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'BASE TABLE').', '
217
+                . $this->sQueryMySqlStatisticPattern('TABLES', 'TABLE_SCHEMA', 'TABLE_TYPE', 'VIEW').', '
218
+                . $this->sQueryMySqlStatisticPattern('COLUMNS', 'TABLE_SCHEMA').', '
219
+                . $this->sQueryMySqlStatisticPattern('TRIGGERS', 'EVENT_OBJECT_SCHEMA').', '
220
+                . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Function').', '
221
+                . $this->sQueryMySqlStatisticPattern('ROUTINES', 'ROUTINE_SCHEMA', 'ROUTINE_TYPE', 'Procedure').', '
222
+                . $this->sQueryMySqlStatisticPattern('EVENTS', 'EVENT_SCHEMA').' '
223 223
                 . 'FROM `information_schema`.`SCHEMATA` `S` '
224 224
                 . 'WHERE (`S`.`SCHEMA_NAME` NOT IN ("information_schema", "mysql", "performance_schema", "sys")) '
225 225
                 . str_replace('WHERE', 'AND', $this->sManageDynamicFilters($filterArray, 'S'))
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
                 . ', `T`.`CREATE_OPTIONS`, `T`.`TABLE_COMMENT` '
241 241
                 . 'FROM `information_schema`.`TABLES` `T` '
242 242
                 . $this->sManageDynamicFilters($filterArray, 'T')
243
-                . $this->xtraSoring($filterArray, 'TABLE_SCHEMA') . ';';
243
+                . $this->xtraSoring($filterArray, 'TABLE_SCHEMA').';';
244 244
     }
245 245
 
246 246
     private function xtraSoring($filterArray, $filterValueToDecide)
Please login to merge, or discard this patch.
source/MySQLiAdvancedOutput.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      */
66 66
     protected function getFieldNameForDisplay($details)
67 67
     {
68
-        $tableUniqueId = $details['TABLE_SCHEMA'] . '.' . $details['TABLE_NAME'];
68
+        $tableUniqueId = $details['TABLE_SCHEMA'].'.'.$details['TABLE_NAME'];
69 69
         if ($details['COLUMN_COMMENT'] != '') {
70 70
             return $details['COLUMN_COMMENT'];
71 71
         } elseif (isset($this->advCache['tableStructureLocales'][$tableUniqueId][$details['COLUMN_NAME']])) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         }
96 96
         $vlSlct    = explode(',', $this->getFieldValue($val));
97 97
         $slctOptns = $this->getSetOrEnum2Array($tblSrc, $val['COLUMN_NAME']);
98
-        return $this->setArrayToSelect($slctOptns, $vlSlct, $val['COLUMN_NAME'] . $adnlThings['suffix'], $inAdtnl);
98
+        return $this->setArrayToSelect($slctOptns, $vlSlct, $val['COLUMN_NAME'].$adnlThings['suffix'], $inAdtnl);
99 99
     }
100 100
 
101 101
     /**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
         if ($iar !== []) {
142 142
             $inAdtnl = array_merge($inAdtnl, $iar);
143 143
         }
144
-        return '<b>' . $this->getFieldValue($value) . '</b>' . $this->setStringIntoShortTag('input', $inAdtnl);
144
+        return '<b>'.$this->getFieldValue($value).'</b>'.$this->setStringIntoShortTag('input', $inAdtnl);
145 145
     }
146 146
 
147 147
     /**
@@ -154,8 +154,8 @@  discard block
 block discarded – undo
154 154
      */
155 155
     private function getFieldOutputNumericNonFK($fkArray, $value, $iar = [])
156 156
     {
157
-        $query         = $this->sQueryGenericSelectKeyValue([
158
-            '`' . $value['COLUMN_NAME'] . '`',
157
+        $query = $this->sQueryGenericSelectKeyValue([
158
+            '`'.$value['COLUMN_NAME'].'`',
159 159
             $fkArray[$value['COLUMN_NAME']][2],
160 160
             $fkArray[$value['COLUMN_NAME']][0],
161 161
         ]);
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
                 if ($val[$cnm[0]] == $oCol) {
297 297
                     $vlQ        = array_merge($val, ['LIMIT' => 2]);
298 298
                     $tFd        = $this->setMySQLquery2Server($this->getForeignKeysQuery($vlQ), $cnm[1])['result'];
299
-                    $tgtFld     = '`' . ($tFd[0][$cnm[0]] == $val[$cnm[0]] ? $tFd[1][$cnm[0]] : $tFd[0][$cnm[0]]) . '`';
299
+                    $tgtFld     = '`'.($tFd[0][$cnm[0]] == $val[$cnm[0]] ? $tFd[1][$cnm[0]] : $tFd[0][$cnm[0]]).'`';
300 300
                     $aRt[$oCol] = [$this->glueDbTb($val[$cnm[2]], $val[$cnm[3]]), $val[$cnm[2]], $tgtFld];
301 301
                 }
302 302
             }
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
                 $inM = $this->setStringIntoTag($mCN[$dtl['COLUMN_NAME']], 'span', ['style' => 'font-style:italic;']);
348 348
             }
349 349
         }
350
-        $lbl = '<span class="fake_label">' . $this->getFieldNameForDisplay($dtl) . '</span>';
350
+        $lbl = '<span class="fake_label">'.$this->getFieldNameForDisplay($dtl).'</span>';
351 351
         return ['label' => $lbl, 'input' => $inM];
352 352
     }
353 353
 
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
         } elseif (in_array($dtls['DATA_TYPE'], ['date', 'datetime', 'time', 'timestamp', 'year'])) {
364 364
             $sReturn = $this->setNeededFieldSingleType($tblName, $dtls, $iar);
365 365
         }
366
-        return $this->getFieldCompletionType($dtls) . $sReturn;
366
+        return $this->getFieldCompletionType($dtls).$sReturn;
367 367
     }
368 368
 
369 369
     private function setNeededFieldSingleType($tblName, $dtls, $iar)
Please login to merge, or discard this patch.