diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index eeb17f665f07de2fc81ee1452e04ff811b272a66..126a6dde2d44fd2fa1f2421e7f4dcab7acbc13c9 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -96,7 +96,7 @@ ClassificationUtils.mapToClass = function(pScore)
ClassificationUtils.getAllGroups = function(pClassificationtype, pTwoCol)
{
var sql = new SqlBuilder()
- .selectDistinct(["CLASSIFICATIONGROUP", (pTwoCol ? "CLASSIFICATIONGROUP" : "")])
+ .select(["distinct CLASSIFICATIONGROUP", (pTwoCol ? "CLASSIFICATIONGROUP" : "")])
.from("CLASSIFICATIONTYPE")
.where("CLASSIFICATIONTYPE.CLASSIFICATIONTYPE", pClassificationtype)
.orderBy("CLASSIFICATIONGROUP");
diff --git a/process/SqlLib_tests/process.js b/process/SqlLib_tests/process.js
index c6a50cae3d8066a741a0b00790701af67c682039..c577854128e02049fc14fd7612578a419f2d58ea 100644
--- a/process/SqlLib_tests/process.js
+++ b/process/SqlLib_tests/process.js
@@ -777,7 +777,7 @@ var testConstantFunctions = new TestSuite([
]);
var selectTests = new TestSuite([
- ["test if a sql-builder in a fields-array is translated to sql correctly", function(pTester)
+ ["a sql-builder in a fields-array is translated to sql correctly", function(pTester)
{
var countSubQuery = newSelect("count(*)")
.from("AB_ATTRIBUTEUSAGE")
@@ -791,6 +791,36 @@ var selectTests = new TestSuite([
pTester.assert("select AB_ATTRIBUTEID, AB_ATTRIBUTEUSAGEID, (select count(*) from AB_ATTRIBUTEUSAGE where AB_ATTRIBUTEUSAGE.OBJECT_TYPE = ? and AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID)", actual._select._sqlStorage, "prepared select-sql");
pTester.assert(1, actual._select.preparedValues.length, "number of params");
}],
+
+ ["a sql-builder in from is used as subselect", function(pTester)
+ {
+ var subQuery = newSelect("FIRSTNAME")
+ .from("PERSON")
+ .where("PERSON.LASTNAME", "Meier")
+
+ var actual = new SqlBuilder()
+ .select("*")
+ .from(subQuery)
+
+ pTester.assert("from (select FIRSTNAME from PERSON where PERSON.LASTNAME = ?)", actual._from._sqlStorage, "prepared select-sql");
+ pTester.assert(1, actual._from.preparedValues.length, "number of params");
+ }],
+
+ ["SqlBuilder as on-condition should only add the conditon of the builder", function(pTester)
+ {
+ var subQuery = newSelect("NAME")
+ .from("ORGANISATION")
+ .where("ORGANISATION.NAME", "Adito")
+
+ var actual = new SqlBuilder()
+ .select("*")
+ .from("PERSON")
+ .join("ORGANISATION", subQuery)
+
+ logging.log(JSON.stringify([actual._joins], null, "\t"))
+ pTester.assert("join ORGANISATION on ORGANISATION.NAME = ?", actual._joins[0]._sqlStorage, "prepared select-sql");
+ pTester.assert(1, actual._joins[0].preparedValues.length, "number of params");
+ }],
])
var tester = new Tester("Test SqlBuilder");
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 729e428f310070d90554d89204e13e9c64ef0e06..e8292830a9bea17613f9ae9b81cdd5075e143e01 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -13,9 +13,9 @@ import("Util_lib");
* Creates a new SqlBuilder object and sets the select clause of the sql.
*
* @param {String|Array|SqlBuilder} pFields You can pass:
- * - A String is just used AS IT IS.
- * - The array can also contain Strings, SqlBuilder which are just concatenated
+ * - A String is just used AS IT IS. (e.g. "FIRSTNAME, LASTNAME")
* - SqlBuilder is used as Subquery
+ * - The array can also contain Strings, SqlBuilder which are just concatenated (e.g. ["FIRSTNAME", "LASTNAME", someSqlBuilderContainingFullSelect])
* Please see .select() for more information and examples.
* @param {String} [pAlias=currentAlias] This alias is used for fetching the ColumnTypes and also for the .table, .cell, .updateData, ... -functions
* @return {SqlBuilder} A new SqlBuilder object already containing the provided fields
@@ -236,11 +236,11 @@ SqlBuilder.prototype.toString = function(pDefaultConditionIfNone)
/**
* Sets the select clause of the sql.
* @param {String|Array|SqlBuilder} pFields You can pass:
- * - A String is just used AS IT IS.
- * - The array can also contain Strings, SqlBuilder which are just concatenated
+ * - A String is just used AS IT IS. (e.g. "FIRSTNAME, LASTNAME")
* - SqlBuilder is used as Subquery
- *
- *@return {SqlBuilder} current SqlBuilder object
+ * - The array can also contain Strings, SqlBuilder which are just concatenated (e.g. ["FIRSTNAME", "LASTNAME", someSqlBuilderContainingFullSelect])
+ *
+ * @return {SqlBuilder} current SqlBuilder object
*/
SqlBuilder.prototype.select = function(pFields)
{
@@ -248,20 +248,14 @@ SqlBuilder.prototype.select = function(pFields)
return this;
}
-/**
- * Sets the select clause of the sql with distinct.
- * @param {String|String[]} pFields
- * @return {SqlBuilder} current SqlBuilder object
- */
-SqlBuilder.prototype.selectDistinct = function(pFields)
-{
- this._select = SqlBuilder._getStatement(pFields, "select distinct", undefined, true);
- return this;
-}
-
/**
* Sets the from clause of the sql.
- * @param {String|SqlBuilder} pTable
+ *
+ * Note: It is recommended to add joins via the .join functions.
+ * But in some cases you may already get a full from clause including the joins. In this case it is also possible to include them in the from-string.
+ *
+ * @param {String|SqlBuilder} pTable if it is a String, it is used as it is as table
+ * if it is a SqlBuilder, it is used as subselect: e.g. select * from (select FIRSTNAME from PERSON)
* @param {String} [pTableAlias] table alias
* @return {SqlBuilder} current SqlBuilder object
*/
@@ -275,9 +269,13 @@ SqlBuilder.prototype.from = function(pTable, pTableAlias)
/**
* Adds a join clause to the sql.
- * @param {String|SqlBuilder} pTable
+ *
+ * @param {String|SqlBuilder} pTable if it is a String, it is used as it is as table
+ * if it is a SqlBuilder, it is used as subselect: e.g. select * from (select FIRSTNAME from PERSON)
* @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).
+ * - a string (without the where keyword)
+ * - a SqlBuilder
+ * - an array (for prepared queries).
* @param {String} [pTableAlias] table alias
* @param {String} [pPrefix] string before the join, for example "left", "right"
* @return {SqlBuilder} current SqlBuilder object
@@ -293,6 +291,10 @@ SqlBuilder.prototype.join = function(pTable, pCondition, pTableAlias, pPrefix)
postfix = pTableAlias + " " + postfix;
var joinPart = SqlBuilder._getStatement(pTable, prefix, postfix);
+
+ if (pCondition instanceof SqlBuilder)
+ pCondition = [pCondition._where._sqlStorage, pCondition._where.preparedValues]
+
var conditionPart = SqlBuilder._getStatement(pCondition);
joinPart._sqlStorage += " " + conditionPart._sqlStorage;
@@ -934,12 +936,13 @@ SqlBuilder._getStatement = function (pElement, pPrefix, pPostfix, pAutoJoin)
{
if (Array.isArray(pElement) && pElement.length !== undefined && pAutoJoin) //array of fields
{
- for (let i = 0, l = pElement.length; i < l; i++)
+ for (let i = 0; i < pElement.length; i++)
{
if (typeof pElement[i] !== "string")
pElement[i] = _getElement(pElement[i]);
}
- pElement = pElement.join(", ");
+
+ pElement = ArrayUtils.joinNonEmptyFields(pElement, ", ");
}
else
{