From 66d5dba8a5de97f5182a39069f4be11957264b4f Mon Sep 17 00:00:00 2001 From: roger-mahler Date: Fri, 25 Oct 2019 16:11:03 +0200 Subject: [PATCH] Consistent use of ResolvedSqlJoinName --- .../DiscreteCompilers/DiscreteCategoryCountSqlQueryCompiler.cs | 2 +- .../DiscreteCompilers/DiscreteContentSqlQueryBuilder.cs | 2 +- .../DiscreteCompilers/ValidPicksSqlQueryCompiler.cs | 2 +- .../RangeCompilers/RangeCategoryBoundSqlQueryBuilder.cs | 2 +- .../RangeCompilers/RangeCategoryCountSqlQueryCompiler.cs | 2 +- .../QueryBuilder/RangeCompilers/RangeOuterBoundSqlCompiler.cs | 2 +- .../QueryBuilder/ResultCompilers/MapResultSqlQueryCompiler.cs | 2 +- .../ResultCompilers/TabularResultSqlQueryCompiler.cs | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteCategoryCountSqlQueryCompiler.cs b/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteCategoryCountSqlQueryCompiler.cs index f1d14be9..f87358bc 100644 --- a/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteCategoryCountSqlQueryCompiler.cs +++ b/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteCategoryCountSqlQueryCompiler.cs @@ -9,7 +9,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, Facet countFac SELECT category, {aggType}(value) AS count FROM ( SELECT {facet.CategoryIdExpr} AS category, {countFacet.CategoryIdExpr} AS value - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} {query.Joins.Combine("")} WHERE 1 = 1 {"AND ".GlueTo(query.Criterias.Combine(" AND "))} diff --git a/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteContentSqlQueryBuilder.cs b/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteContentSqlQueryBuilder.cs index c552041b..9c41c7f0 100644 --- a/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteContentSqlQueryBuilder.cs +++ b/sead.query.core/QueryBuilder/DiscreteCompilers/DiscreteContentSqlQueryBuilder.cs @@ -11,7 +11,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, string text_fi string sql = $@" SELECT cast({facet.CategoryIdExpr} AS varchar) AS category, {facet.CategoryNameExpr} AS name - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} {query.Joins.Combine("")} WHERE 1 = 1 {text_criteria} diff --git a/sead.query.core/QueryBuilder/DiscreteCompilers/ValidPicksSqlQueryCompiler.cs b/sead.query.core/QueryBuilder/DiscreteCompilers/ValidPicksSqlQueryCompiler.cs index 79511d43..5051af15 100644 --- a/sead.query.core/QueryBuilder/DiscreteCompilers/ValidPicksSqlQueryCompiler.cs +++ b/sead.query.core/QueryBuilder/DiscreteCompilers/ValidPicksSqlQueryCompiler.cs @@ -10,7 +10,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, List pick string picks_clause = picks.Combine(",", x => $"('{x}'::text)"); string sql = $@" SELECT DISTINCT pick_id, {facet.CategoryNameExpr} AS name - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} JOIN (VALUES {picks_clause}) AS x(pick_id) ON x.pick_id = {facet.CategoryIdExpr}::text {query.Joins.Combine("")} diff --git a/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryBoundSqlQueryBuilder.cs b/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryBoundSqlQueryBuilder.cs index 9b5fcb35..943c1114 100644 --- a/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryBoundSqlQueryBuilder.cs +++ b/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryBoundSqlQueryBuilder.cs @@ -11,7 +11,7 @@ public string Compile(QuerySetup query, Facet facet, string facetCode) string clauses = String.Join("", facet.Clauses.Select(x => x.Clause)); string sql = $@" SELECT '{facetCode}' AS facet_code, MIN({facet.CategoryIdExpr}::real) AS min, MAX({facet.CategoryIdExpr}::real) AS max - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} {query.Joins.Combine("")} {"WHERE ".GlueTo(clauses)}"; return sql; diff --git a/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryCountSqlQueryCompiler.cs b/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryCountSqlQueryCompiler.cs index efffac51..d0267a70 100644 --- a/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryCountSqlQueryCompiler.cs +++ b/sead.query.core/QueryBuilder/RangeCompilers/RangeCategoryCountSqlQueryCompiler.cs @@ -14,7 +14,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, string interva FROM categories c LEFT JOIN ( SELECT category, COUNT(DISTINCT {countColumn}) AS count_column - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} JOIN categories ON cast({facet.CategoryIdExpr} as decimal(15, 2)) between categories.lower and categories.upper {query.Joins.Combine("\n\t\t\t\t")} diff --git a/sead.query.core/QueryBuilder/RangeCompilers/RangeOuterBoundSqlCompiler.cs b/sead.query.core/QueryBuilder/RangeCompilers/RangeOuterBoundSqlCompiler.cs index b351c091..42b5e348 100644 --- a/sead.query.core/QueryBuilder/RangeCompilers/RangeOuterBoundSqlCompiler.cs +++ b/sead.query.core/QueryBuilder/RangeCompilers/RangeOuterBoundSqlCompiler.cs @@ -7,7 +7,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet) { string sql = $@" SELECT MIN({facet.CategoryIdExpr}) AS lower, MAX({facet.CategoryIdExpr}) AS upper - FROM {facet.TargetTable.TableOrUdfName}{facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(facet.AliasName)} + FROM {facet.TargetTable.ResolvedSqlJoinName} "; return sql; } diff --git a/sead.query.core/QueryBuilder/ResultCompilers/MapResultSqlQueryCompiler.cs b/sead.query.core/QueryBuilder/ResultCompilers/MapResultSqlQueryCompiler.cs index 77fc3eab..deb1889b 100644 --- a/sead.query.core/QueryBuilder/ResultCompilers/MapResultSqlQueryCompiler.cs +++ b/sead.query.core/QueryBuilder/ResultCompilers/MapResultSqlQueryCompiler.cs @@ -7,7 +7,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, ResultQuerySet { string sql = $@" SELECT DISTINCT {facet.CategoryIdExpr} AS id_column, {facet.CategoryNameExpr} AS name, coalesce(latitude_dd, 0.0) AS latitude_dd, coalesce(longitude_dd, 0) AS longitude_dd - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} {query.Joins.Combine("")} WHERE 1 = 1 {"AND ".GlueTo(query.Criterias.Combine(" AND "))} diff --git a/sead.query.core/QueryBuilder/ResultCompilers/TabularResultSqlQueryCompiler.cs b/sead.query.core/QueryBuilder/ResultCompilers/TabularResultSqlQueryCompiler.cs index a5a556ee..febae8e8 100644 --- a/sead.query.core/QueryBuilder/ResultCompilers/TabularResultSqlQueryCompiler.cs +++ b/sead.query.core/QueryBuilder/ResultCompilers/TabularResultSqlQueryCompiler.cs @@ -10,7 +10,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, ResultQuerySet SELECT {config.DataFields.Combine(", ")} FROM ( SELECT {config.AliasPairs.Select(x => $"{x.Item1} AS {x.Item2}").ToList().Combine(", ")} - FROM {query.Facet.TargetTable.TableOrUdfName}{query.Facet.TargetTable.UdfCallArguments ?? ""} {"AS ".GlueTo(query.Facet.AliasName)} + FROM {query.Facet.TargetTable.ResolvedSqlJoinName} {query.Joins.Combine("")} WHERE 1 = 1 {"AND ".GlueTo(query.Criterias.Combine(" AND "))}