From 393145c8a6c8310899984742d74c502c989d7973 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 11 Oct 2019 09:45:48 +0200
Subject: [PATCH] joins: rename alias to tableAlias
---
process/Sql_lib/process.js | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 8daa0c113d1..09f92376554 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -894,19 +894,19 @@ SqlBuilder.prototype.from = function(pTable, pTableAlias)
* @param {String|SqlBuilder} pTable
* @param {String|String[]|SqlBuilder} pCondition The where condition. This can be
* a string (without the where keyword), a SqlBuilder or an array (for prepared queries).
- * @param {String} [pAlias] table alias
+ * @param {String} [pTableAlias] table alias
* @param {String} [pPrefix] string before the join, for example "left", "right"
* @return {SqlBuilder} current SqlBuilder object
*/
-SqlBuilder.prototype.join = function(pTable, pCondition, pAlias, pPrefix)
+SqlBuilder.prototype.join = function(pTable, pCondition, pTableAlias, pPrefix)
{
var prefix = "join";
if (pPrefix)
prefix = pPrefix + " " + prefix;
var postfix = "on";
- if (pAlias)
- postfix = pAlias + " " + postfix;
+ if (pTableAlias)
+ postfix = pTableAlias + " " + postfix;
var joinPart = SqlBuilder._getStatement(pTable, prefix, postfix);
var conditionPart = SqlBuilder._getStatement(pCondition);
@@ -923,12 +923,12 @@ SqlBuilder.prototype.join = function(pTable, pCondition, pAlias, pPrefix)
* @param {String|SqlBuilder} pTable
* @param {String|String[]|SqlBuilder} pCondition The where condition. This can be
* a string (without the where keyword), a SqlBuilder or an array (for prepared queries).
- * @param {String} [pAlias] table alias
+ * @param {String} [pTableAlias] table alias
* @return {SqlBuilder} current SqlBuilder object
*/
-SqlBuilder.prototype.leftJoin = function(pTable, pCondition, pAlias)
+SqlBuilder.prototype.leftJoin = function(pTable, pCondition, pTableAlias)
{
- return this.join(pTable, pCondition, pAlias, "left");
+ return this.join(pTable, pCondition, pTableAlias, "left");
}
/**
@@ -936,12 +936,12 @@ SqlBuilder.prototype.leftJoin = function(pTable, pCondition, pAlias)
* @param {String|SqlBuilder} pTable
* @param {String|String[]|SqlBuilder} pCondition The where condition. This can be
* a string (without the where keyword), a SqlBuilder or an array (for prepared queries).
- * @param {String} [pAlias] table alias
+ * @param {String} [pTableAlias] table alias
* @return {SqlBuilder} current SqlBuilder object
*/
-SqlBuilder.prototype.rightJoin = function(pTable, pCondition, pAlias)
+SqlBuilder.prototype.rightJoin = function(pTable, pCondition, pTableAlias)
{
- return this.join(pTable, pCondition, pAlias, "right");
+ return this.join(pTable, pCondition, pTableAlias, "right");
}
/**
--
GitLab