diff options
| author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-27 12:41:33 +0700 |
|---|---|---|
| committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-27 12:41:33 +0700 |
| commit | d9440a727edd25f2472754dc51b0206d6abbeba4 (patch) | |
| tree | 1e7a123e5f28c7b5adfa4962971a550d247c28dd /src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala | |
| parent | b27ba47906e48e9fc59d65893c71309303f73fc8 (diff) | |
| parent | fde83eb31ef4f2c2334b41d3a727239c034bfd63 (diff) | |
| download | rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.tar.gz rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.tar.bz2 rest-query-d9440a727edd25f2472754dc51b0206d6abbeba4.zip | |
Merge branch 'master' into PDSUI-2336
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala index bf42f40..8e75c76 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala @@ -59,9 +59,9 @@ trait RestHelper { def exprToQuery(expr: SearchFilterExpr): Seq[(String, String)] = expr match { case SearchFilterExpr.Empty => Seq.empty case SearchFilterExpr.Atom.Binary(dimension, op, value) => - Seq("filters" -> s"${dimension.name} ${opToString(op)} $value") + Seq("filters" -> s"${dimension.tableName.fold("")(t => s"$t.") + dimension.name} ${opToString(op)} $value") case SearchFilterExpr.Atom.NAry(dimension, SearchFilterNAryOperation.In, values) => - Seq("filters" -> s"${dimension.name} in ${values.mkString(",")}") + Seq("filters" -> s"${dimension.tableName.fold("")(t => s"$t.") + dimension.name} in ${values.mkString(",")}") case SearchFilterExpr.Intersection(ops) => ops.flatMap(op => exprToQuery(op)) case expr => sys.error(s"No parser available for filter expression $expr.") |