From 3e1eb024d5f8db106eb7e9ecb210930592087dde Mon Sep 17 00:00:00 2001 From: Holden Karau Date: Mon, 30 Apr 2012 15:21:41 -0700 Subject: [PATCH] Fix elasticBoost generation The extra ()'s cause problems if using a single field for sort order --- build.sbt | 2 +- src/main/scala/com/foursquare/slashem/Ast.scala | 2 +- .../scala/com/foursquare/slashem/ElasticQueryTest.scala | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f346894..1e59e6f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "slashem" -version := "0.9.10a" +version := "0.9.10b" organization := "com.foursquare" diff --git a/src/main/scala/com/foursquare/slashem/Ast.scala b/src/main/scala/com/foursquare/slashem/Ast.scala index ec090a6..415586e 100644 --- a/src/main/scala/com/foursquare/slashem/Ast.scala +++ b/src/main/scala/com/foursquare/slashem/Ast.scala @@ -224,7 +224,7 @@ object Ast { fieldName } def elasticBoost(): Pair[List[String],String] = { - Pair(Nil,"(doc['" + fieldName + "'].value)") + Pair(Nil,"doc['" + fieldName + "'].value") } } diff --git a/src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala b/src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala index e883604..2ef0826 100644 --- a/src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala +++ b/src/test/scala/com/foursquare/slashem/ElasticQueryTest.scala @@ -71,6 +71,13 @@ class ElasticQueryTest extends SpecsMatchers with ScalaCheckMatchers { } + @Test + def simpleOrderTest { + val fullQuery = ESimplePanda.where(_.name contains "lol") + .limit(5).orderDesc(_.followers) + val r = fullQuery fetch() + } + @Test def testEmptySearch { try {