[playframework#237] Update EBean version to 2.7.5

naveedehmad · Jun 2, 2012 · 47e080a · 47e080a
1 parent 40cbf53
commit 47e080a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/framework/project/Build.scala b/framework/project/Build.scala
@@ -192,7 +192,7 @@ object PlayBuild extends Build {
 
             "com.google.code.findbugs"          %    "jsr305"                   %   "2.0.0",
 
-            ("org.avaje"                        %    "ebean"                    %   "2.7.3" notTransitive())
+            ("org.avaje"                        %    "ebean"                    %   "2.7.5" notTransitive())
               .exclude("javax.persistence", "persistence-api")
             ,
 

diff --git a/framework/src/play/src/main/java/play/db/ebean/Model.java b/framework/src/play/src/main/java/play/db/ebean/Model.java
@@ -444,13 +444,6 @@ public RawSql getRawSql() {
             return query().getRawSql();
         }
 
-        /**
-         * Returns the type of query (List, Set, Map, Bean, rowCount etc).
-         */
-        public Query.Type getType() {
-            return query().getType();
-        }
-
         public UseIndex getUseIndex() {
             return query().getUseIndex();
         }
@@ -729,6 +722,22 @@ public Query<T> where(com.avaje.ebean.Expression expression) {
         public Query<T> where(String addToWhereClause) {
             return query().where(addToWhereClause);
         }
+
+        /**
+         * Return the total hits matched for a lucene text search query.
+         */
+        @Override
+        public int getTotalHits() {
+            return query().getTotalHits();
+        }
+
+        /**
+         * Execute the select with "for update" which should lock the record "on read"
+         */
+        @Override
+        public Query<T> setForUpdate(boolean forUpdate) {
+            return query().setForUpdate(forUpdate);
+        }
 
     }