diff options
| author | kseniya <ktomskih@datamonsters.co> | 2017-09-21 16:17:49 +0700 |
|---|---|---|
| committer | kseniya <ktomskih@datamonsters.co> | 2017-09-21 19:19:02 +0700 |
| commit | f1c217d2e6ff2e195e7374605878c7a347a074c7 (patch) | |
| tree | 2b04bc8b863794151216b788f5d8f07f9d0a550a /src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala | |
| parent | c466ce359ec923d8c1f9a8188191ecee8085312c (diff) | |
| download | rest-query-f1c217d2e6ff2e195e7374605878c7a347a074c7.tar.gz rest-query-f1c217d2e6ff2e195e7374605878c7a347a074c7.tar.bz2 rest-query-f1c217d2e6ff2e195e7374605878c7a347a074c7.zip | |
Fix slick query builder bugv0.3.16
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala b/src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala index 79cb114..ab2757b 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/db/SlickQueryBuilder.scala @@ -203,7 +203,7 @@ sealed trait SlickQueryBuilderParameters { val operator = op match { case Eq => sql"=" case NotEq => sql"!=" - case Like => sql"like" + case Like => sql" like " case Gt => sql">" case GtEq => sql">=" case Lt => sql"<" @@ -213,12 +213,13 @@ sealed trait SlickQueryBuilderParameters { case Atom.NAry(dimension, op, values) => val sqlOp = op match { - case SearchFilterNAryOperation.In => sql"in" - case SearchFilterNAryOperation.NotIn => sql"not in" + case SearchFilterNAryOperation.In => sql" in " + case SearchFilterNAryOperation.NotIn => sql" not in " } val formattedValues = if (values.nonEmpty) { - sql"${values.mkString(",")}" + val condition = s"(${values.map(v => "'" + v.toString + "'").mkString(",")})" + sql"#${condition}" } else sql"NULL" sql"#${escapeDimension(dimension)}" concat sqlOp concat formattedValues |