Consistent use of ResolvedSqlJoinName

humlab-sead · Oct 25, 2019 · 66d5dba · 66d5dba · roger-mahler · Oct 28, 2019
1 parent 9f9e414
commit 66d5dba
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -10,7 +10,7 @@ public string Compile(QueryBuilder.QuerySetup query, Facet facet, List<int> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 "))}