Added table prefix to SearchFrom native query

Removed sorting from totalCount calculation at BaseDao
robeio · Sep 8, 2016 · 14cc46c · 14cc46c
1 parent 7926ab7
commit 14cc46c
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>io.robe</groupId>
     <artifactId>robe-parent</artifactId>
-    <version>0.5.0.0-1036</version>
+    <version>0.5.0.0-1037</version>
 
     <packaging>pom</packaging>
     <name>Robe Project</name>

diff --git a/robe-admin/pom.xml b/robe-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-assets/pom.xml b/robe-assets/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-auth/pom.xml b/robe-auth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-common/pom.xml b/robe-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
 

diff --git a/robe-convert/pom.xml b/robe-convert/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
 

diff --git a/robe-crud/pom.xml b/robe-crud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-guice/pom.xml b/robe-guice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-hibernate/pom.xml b/robe-hibernate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-hibernate/src/main/java/io/robe/hibernate/RobeHibernateBundle.java b/robe-hibernate/src/main/java/io/robe/hibernate/RobeHibernateBundle.java
@@ -24,6 +24,8 @@ public class RobeHibernateBundle<T extends Configuration & HasHibernateConfigura
     private static final Logger LOGGER = LoggerFactory.getLogger(RobeHibernateBundle.class);
 
     private static RobeHibernateBundle instance;
+    private org.hibernate.cfg.Configuration configuration;
+
 
     private RobeHibernateBundle(ImmutableList<Class<?>> entities, SessionFactoryFactory sessionFactoryFactory) {
         super(entities, sessionFactoryFactory);
@@ -96,7 +98,11 @@ public PooledDataSourceFactory getDataSourceFactory(T configuration) {
 
 
     protected void configure(org.hibernate.cfg.Configuration configuration) {
+        this.configuration = configuration;
+    }
 
+    public org.hibernate.cfg.Configuration getConfiguration() {
+        return configuration;
     }
 
 }

diff --git a/robe-hibernate/src/main/java/io/robe/hibernate/dao/BaseDao.java b/robe-hibernate/src/main/java/io/robe/hibernate/dao/BaseDao.java
@@ -9,6 +9,7 @@
 import io.robe.common.service.search.SearchableEnum;
 import io.robe.common.service.search.model.SearchModel;
 import io.robe.common.utils.StringsOperations;
+import io.robe.hibernate.RobeHibernateBundle;
 import io.robe.hibernate.entity.BaseEntity;
 import org.hibernate.Criteria;
 import org.hibernate.SessionFactory;
@@ -35,7 +36,8 @@
 public class BaseDao<T extends BaseEntity> extends AbstractDAO<T> {
 
     private static final ConcurrentHashMap<String, Field[]> fieldCache = new ConcurrentHashMap<>();
-
+    @Inject
+    RobeHibernateBundle bundle;
 
     /**
      * Constructor with session factory injection by guice
@@ -115,6 +117,7 @@ public List<T> findAll(SearchModel search) {
         List<T> list = buildCriteria(search).list();
         search.setLimit(null);
         search.setOffset(null);
+        search.setSort(null);
         long totalCount = (Long) buildCriteria(search).setProjection(Projections.rowCount()).uniqueResult();
         search.setTotalCount(totalCount);
         ResponseHeadersUtil.addTotalCount(search);
@@ -131,6 +134,7 @@ public List<T> findAllWithSearchFrom(SearchModel search) {
         List<T> list = addSearchFromProjection(buildCriteria(search)).list();
         search.setLimit(null);
         search.setOffset(null);
+        search.setSort(null);
         long totalCount = (Long) buildCriteria(search).setProjection(Projections.rowCount()).uniqueResult();
         search.setTotalCount(totalCount);
         ResponseHeadersUtil.addTotalCount(search);
@@ -152,7 +156,12 @@ public Criteria addSearchFromProjection(Criteria criteria) {
                     else
                         sqlBuilder.append("group_concat(").append(target).append(")");
 
-                    sqlBuilder.append(" from ").append(searchFrom.entity().getSimpleName());
+                    String prefix = bundle.getConfiguration().getProperty("hibernate.prefix");
+                    if (prefix != null)
+                        sqlBuilder.append(" from ").append(prefix).append(searchFrom.entity().getSimpleName());
+                    else
+                        sqlBuilder.append(" from ").append(searchFrom.entity().getSimpleName());
+
                     if (searchFrom.localId().isEmpty()) {
                         sqlBuilder.append(" where ").append(searchFrom.id()).append('=').append(field.getName()).append(") as ").append(alias);
                     } else {

diff --git a/robe-mail/pom.xml b/robe-mail/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-quartz/pom.xml b/robe-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/robe-servlet/pom.xml b/robe-servlet/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.robe</groupId>
         <artifactId>robe-parent</artifactId>
-        <version>0.5.0.0-1036</version>
+        <version>0.5.0.0-1037</version>
 
     </parent>
     <modelVersion>4.0.0</modelVersion>