From 410640585a2d34c89162b929c026d507d950f3aa Mon Sep 17 00:00:00 2001 From: "Arjay Q. Angeles" Date: Wed, 24 Apr 2019 11:16:40 +0800 Subject: [PATCH] Use shorter table name alias. --- src/EloquentDataTable.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EloquentDataTable.php b/src/EloquentDataTable.php index c597c563..86b72ee1 100644 --- a/src/EloquentDataTable.php +++ b/src/EloquentDataTable.php @@ -169,10 +169,10 @@ protected function joinEagerLoadedColumn($relation, $relationColumn) case $model instanceof BelongsTo: $table = $model->getRelated()->getTable(); - $alias = "alias_{$index}_{$table}"; + $alias = "{$table}_{$index}"; $tableAs = "{$table} AS {$alias}"; $foreign = $model->getQualifiedForeignKeyName(); - $owner = "{$alias}.{$model->getOwnerKeyName()}"; + $other = "{$alias}.{$model->getOwnerKeyName()}"; $deletedAt = $this->checkSoftDeletesOnModel($model->getRelated()); break; @@ -180,7 +180,7 @@ protected function joinEagerLoadedColumn($relation, $relationColumn) default: throw new Exception('Relation ' . get_class($model) . ' is not yet supported.'); } - $this->performJoin($tableAs ?? $table, $foreign, $owner ?? $other, $deletedAt); + $this->performJoin($tableAs ?? $table, $foreign, $other, $deletedAt); $lastQuery = $model->getQuery(); }