Skip to content

Commit 833796a

Browse files
MauricioFauthMauricioFauth
committed
Merge #19863 - Refactoring of initAlias()
Pull-request: #19863 Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
2 parents 987167c + 2831cf5 commit 833796a

19 files changed

Lines changed: 183 additions & 980 deletions

‎phpstan-baseline.neon‎

Lines changed: 44 additions & 494 deletions
Large diffs are not rendered by default.

‎psalm-baseline.xml‎

Lines changed: 22 additions & 197 deletions
Large diffs are not rendered by default.

‎src/Plugins/Export/ExportCodegen.php‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,8 @@ public static function cgMakeIdentifier(string $str, bool $ucfirst = true): stri
186186
*/
187187
private function handleNHibernateCSBody(string $db, string $table, array $aliases = []): string
188188
{
189-
$dbAlias = $db;
190-
$tableAlias = $table;
191-
$this->initAlias($aliases, $dbAlias, $tableAlias);
189+
$dbAlias = $this->getDbAlias($aliases, $db);
190+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
192191

193192
$result = DatabaseInterface::getInstance()->query(
194193
sprintf(
@@ -201,10 +200,7 @@ private function handleNHibernateCSBody(string $db, string $table, array $aliase
201200
/** @var TableProperty[] $tableProperties */
202201
$tableProperties = [];
203202
while ($row = $result->fetchRow()) {
204-
$colAs = $this->getAlias($aliases, $row[0], 'col', $db, $table);
205-
if ($colAs !== '') {
206-
$row[0] = $colAs;
207-
}
203+
$row[0] = $this->getColumnAlias($aliases, $db, $table, $row[0]);
208204

209205
$tableProperties[] = new TableProperty($row);
210206
}
@@ -291,9 +287,8 @@ private function handleNHibernateXMLBody(
291287
string $table,
292288
array $aliases = [],
293289
): string {
294-
$dbAlias = $db;
295-
$tableAlias = $table;
296-
$this->initAlias($aliases, $dbAlias, $tableAlias);
290+
$dbAlias = $this->getDbAlias($aliases, $db);
291+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
297292
$lines = [];
298293
$lines[] = '<?xml version="1.0" encoding="utf-8" ?>';
299294
$lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" '
@@ -311,10 +306,7 @@ private function handleNHibernateXMLBody(
311306
);
312307

313308
while ($row = $result->fetchRow()) {
314-
$colAs = $this->getAlias($aliases, $row[0], 'col', $db, $table);
315-
if ($colAs !== '') {
316-
$row[0] = $colAs;
317-
}
309+
$row[0] = $this->getColumnAlias($aliases, $db, $table, $row[0]);
318310

319311
$tableProperty = new TableProperty($row);
320312
if ($tableProperty->isPK()) {

‎src/Plugins/Export/ExportCsv.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ public function exportData(
181181
string $sqlQuery,
182182
array $aliases = [],
183183
): bool {
184-
$dbAlias = $db;
185-
$tableAlias = $table;
186-
$this->initAlias($aliases, $dbAlias, $tableAlias);
187-
188184
$dbi = DatabaseInterface::getInstance();
189185
/**
190186
* Gets the data from the database
@@ -195,9 +191,7 @@ public function exportData(
195191
if ($this->columns) {
196192
$insertFields = [];
197193
foreach ($result->getFieldNames() as $colAs) {
198-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
199-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
200-
}
194+
$colAs = $this->getColumnAlias($aliases, $db, $table, $colAs);
201195

202196
if ($this->enclosed === '') {
203197
$insertFields[] = $colAs;

‎src/Plugins/Export/ExportExcel.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ public function exportData(
179179
string $sqlQuery,
180180
array $aliases = [],
181181
): bool {
182-
$dbAlias = $db;
183-
$tableAlias = $table;
184-
$this->initAlias($aliases, $dbAlias, $tableAlias);
185-
186182
$dbi = DatabaseInterface::getInstance();
187183
/**
188184
* Gets the data from the database
@@ -193,9 +189,7 @@ public function exportData(
193189
if ($this->columns) {
194190
$insertFields = [];
195191
foreach ($result->getFieldNames() as $colAs) {
196-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
197-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
198-
}
192+
$colAs = $this->getColumnAlias($aliases, $db, $table, $colAs);
199193

200194
if ($this->enclosed === '') {
201195
$insertFields[] = $colAs;

‎src/Plugins/Export/ExportHtmlword.php‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,7 @@ public function exportData(
182182
string $sqlQuery,
183183
array $aliases = [],
184184
): bool {
185-
$dbAlias = $db;
186-
$tableAlias = $table;
187-
$this->initAlias($aliases, $dbAlias, $tableAlias);
185+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
188186

189187
if (
190188
! $this->export->outputHandler(
@@ -210,9 +208,7 @@ public function exportData(
210208
if ($this->columns) {
211209
$schemaInsert = '<tr class="print-category">';
212210
foreach ($result->getFieldNames() as $colAs) {
213-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
214-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
215-
}
211+
$colAs = $this->getColumnAlias($aliases, $db, $table, $colAs);
216212

217213
$schemaInsert .= '<td class="print"><strong>'
218214
. htmlspecialchars($colAs)
@@ -286,10 +282,7 @@ public function getTableDefStandIn(string $db, string $view, array $aliases = []
286282

287283
$columns = $dbi->getColumns($db, $view);
288284
foreach ($columns as $column) {
289-
$colAs = $column->field;
290-
if (! empty($aliases[$db]['tables'][$view]['columns'][$colAs])) {
291-
$colAs = $aliases[$db]['tables'][$view]['columns'][$colAs];
292-
}
285+
$colAs = $this->getColumnAlias($aliases, $db, $view, $column->field);
293286

294287
$schemaInsert .= $this->formatOneColumnDefinition($column, $uniqueKeys, $colAs);
295288
$schemaInsert .= '</tr>';
@@ -381,10 +374,7 @@ public function getTableDef(string $db, string $table, array $aliases = []): str
381374
}
382375

383376
foreach ($columns as $column) {
384-
$colAs = $column->field;
385-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
386-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
387-
}
377+
$colAs = $this->getColumnAlias($aliases, $db, $table, $column->field);
388378

389379
$schemaInsert .= $this->formatOneColumnDefinition($column, $uniqueKeys, $colAs);
390380
$fieldName = $column->field;
@@ -474,9 +464,7 @@ protected function getTriggers(array $triggers): string
474464
*/
475465
public function exportStructure(string $db, string $table, string $exportMode, array $aliases = []): bool
476466
{
477-
$dbAlias = $db;
478-
$tableAlias = $table;
479-
$this->initAlias($aliases, $dbAlias, $tableAlias);
467+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
480468

481469
$dump = '';
482470

‎src/Plugins/Export/ExportJson.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ public function exportData(
182182
string $sqlQuery,
183183
array $aliases = [],
184184
): bool {
185-
$dbAlias = $db;
186-
$tableAlias = $table;
187-
$this->initAlias($aliases, $dbAlias, $tableAlias);
185+
$dbAlias = $this->getDbAlias($aliases, $db);
186+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
188187

189188
if (! $this->first) {
190189
if (! $this->export->outputHandler(',')) {
@@ -243,9 +242,8 @@ protected function doExportForQuery(
243242
$colAs = $field->name;
244243
if (
245244
$db !== null && $table !== null && $aliases !== null
246-
&& ! empty($aliases[$db]['tables'][$table]['columns'][$colAs])
247245
) {
248-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
246+
$colAs = $this->getColumnAlias($aliases, $db, $table, $colAs);
249247
}
250248

251249
$columns[$i] = $colAs;

‎src/Plugins/Export/ExportLatex.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,8 @@ public function exportData(
298298
string $sqlQuery,
299299
array $aliases = [],
300300
): bool {
301-
$dbAlias = $db;
302-
$tableAlias = $table;
303-
$this->initAlias($aliases, $dbAlias, $tableAlias);
301+
$dbAlias = $this->getDbAlias($aliases, $db);
302+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
304303

305304
$dbi = DatabaseInterface::getInstance();
306305
$result = $dbi->tryQuery($sqlQuery, ConnectionType::User, DatabaseInterface::QUERY_UNBUFFERED);
@@ -310,9 +309,7 @@ public function exportData(
310309
$columnsAlias = [];
311310
foreach ($result->getFieldNames() as $i => $colAs) {
312311
$columns[$i] = $colAs;
313-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
314-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
315-
}
312+
$colAs = $this->getColumnAlias($aliases, $db, $table, $colAs);
316313

317314
$columnsAlias[$i] = $colAs;
318315
}
@@ -437,9 +434,8 @@ public function exportRawQuery(string|null $db, string $sqlQuery): bool
437434
*/
438435
public function exportStructure(string $db, string $table, string $exportMode, array $aliases = []): bool
439436
{
440-
$dbAlias = $db;
441-
$tableAlias = $table;
442-
$this->initAlias($aliases, $dbAlias, $tableAlias);
437+
$dbAlias = $this->getDbAlias($aliases, $db);
438+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
443439

444440
$relationParameters = $this->relation->getRelationParameters();
445441

@@ -558,10 +554,8 @@ public function exportStructure(string $db, string $table, string $exportMode, a
558554
$type = ' ';
559555
}
560556

561-
$fieldName = $colAs = $row->field;
562-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
563-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
564-
}
557+
$fieldName = $row->field;
558+
$colAs = $this->getColumnAlias($aliases, $db, $table, $row->field);
565559

566560
$localBuffer = $colAs . "\000" . $type . "\000"
567561
. ($row->isNull ? __('Yes') : __('No'))

‎src/Plugins/Export/ExportMediawiki.php‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,7 @@ public function exportDBCreate(string $db, string $dbAlias = ''): bool
152152
*/
153153
public function exportStructure(string $db, string $table, string $exportMode, array $aliases = []): bool
154154
{
155-
$dbAlias = $db;
156-
$tableAlias = $table;
157-
$this->initAlias($aliases, $dbAlias, $tableAlias);
155+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
158156

159157
$output = '';
160158
if ($exportMode === 'create_table') {
@@ -182,10 +180,7 @@ public function exportStructure(string $db, string $table, string $exportMode, a
182180
$output .= '! style="background:#ffffff" | '
183181
. $this->exportCRLF();
184182
foreach ($columns as $column) {
185-
$colAs = $column->field;
186-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
187-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
188-
}
183+
$colAs = $this->getColumnAlias($aliases, $db, $table, $column->field);
189184

190185
$output .= ' | ' . $colAs . $this->exportCRLF();
191186
}
@@ -236,9 +231,7 @@ public function exportData(
236231
string $sqlQuery,
237232
array $aliases = [],
238233
): bool {
239-
$dbAlias = $db;
240-
$tableAlias = $table;
241-
$this->initAlias($aliases, $dbAlias, $tableAlias);
234+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
242235

243236
// Print data comment
244237
$output = $this->exportComment(
@@ -271,9 +264,7 @@ public function exportData(
271264

272265
// Use '!' for separating table headers
273266
foreach ($columnNames as $column) {
274-
if (! empty($aliases[$db]['tables'][$table]['columns'][$column])) {
275-
$column = $aliases[$db]['tables'][$table]['columns'][$column];
276-
}
267+
$column = $this->getColumnAlias($aliases, $db, $table, $column);
277268

278269
$output .= ' ! ' . $column . $this->exportCRLF();
279270
}

‎src/Plugins/Export/ExportOds.php‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,7 @@ public function exportData(
201201
string $sqlQuery,
202202
array $aliases = [],
203203
): bool {
204-
$dbAlias = $db;
205-
$tableAlias = $table;
206-
$this->initAlias($aliases, $dbAlias, $tableAlias);
204+
$tableAlias = $this->getTableAlias($aliases, $db, $table);
207205
$dbi = DatabaseInterface::getInstance();
208206
// Gets the data from the database
209207
$result = $dbi->query($sqlQuery, ConnectionType::User, DatabaseInterface::QUERY_UNBUFFERED);
@@ -216,10 +214,7 @@ public function exportData(
216214
if ($this->columns) {
217215
$this->buffer .= '<table:table-row>';
218216
foreach ($fieldsMeta as $field) {
219-
$colAs = $field->name;
220-
if (! empty($aliases[$db]['tables'][$table]['columns'][$colAs])) {
221-
$colAs = $aliases[$db]['tables'][$table]['columns'][$colAs];
222-
}
217+
$colAs = $this->getColumnAlias($aliases, $db, $table, $field->name);
223218

224219
$this->buffer .= '<table:table-cell office:value-type="string">'
225220
. '<text:p>'

0 commit comments

Comments
 (0)