From 66abb680971ad23d605b96fbbaf3975237262c60 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 6 Jun 2013 10:57:58 +0200
Subject: [PATCH] tweaking params

---
 .../java/com/commafeed/backend/dao/GenericDAO.java    | 11 ++++++-----
 src/main/resources/META-INF/persistence.xml           |  4 ++++
 src/main/tomee/conf/tomee.xml                         |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/commafeed/backend/dao/GenericDAO.java b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
index 49600e2f..545e328d 100644
--- a/src/main/java/com/commafeed/backend/dao/GenericDAO.java
+++ b/src/main/java/com/commafeed/backend/dao/GenericDAO.java
@@ -13,6 +13,9 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 import javax.persistence.metamodel.Attribute;
 
+import org.hibernate.Session;
+import org.hibernate.ejb.EntityManagerImpl;
+
 import com.commafeed.backend.model.AbstractModel;
 import com.google.common.reflect.TypeToken;
 import com.uaihebert.factory.EasyCriteriaFactory;
@@ -36,12 +39,10 @@ public abstract class GenericDAO<T extends AbstractModel> {
 
 	public void saveOrUpdate(Collection<? extends AbstractModel> models) {
 		int i = 0;
+		EntityManagerImpl impl = (EntityManagerImpl) em.getDelegate();
+		Session session = impl.getSession();
 		for (AbstractModel model : models) {
-			if (model.getId() == null) {
-				em.persist(model);
-			} else {
-				em.merge(model);
-			}
+			session.saveOrUpdate(model);
 
 			if (i % 20 == 0) {
 				em.flush();
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 5c6aa5ac..97d04155 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -10,7 +10,11 @@
 		<shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
 		<properties>
 			<property name="hibernate.hbm2ddl.auto" value="update" />
+
+			<property name="format_sql" value="true" />
+			<property name="use_sql_comments" value="true" />
 			<property name="hibernate.show_sql" value="${jpa.show_sql}" />
+
 			<property name="hibernate.dialect" value="${jpa.dialect}" />
 			<property name="hibernate.default_batch_fetch_size" value="100" />
 
diff --git a/src/main/tomee/conf/tomee.xml b/src/main/tomee/conf/tomee.xml
index ccd4ad9f..bf417791 100644
--- a/src/main/tomee/conf/tomee.xml
+++ b/src/main/tomee/conf/tomee.xml
@@ -12,7 +12,7 @@
 <!-- 
 	<Resource id="MySQL" type="DataSource">
 		JdbcDriver com.mysql.jdbc.Driver
-        JdbcUrl jdbc:mysql://localhost/commafeed?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;failOverReadOnly=false&amp;maxReconnects=20
+        JdbcUrl jdbc:mysql://localhost/commafeed?useUnicode=true&amp;characterEncoding=UTF-8&amp;autoReconnect=true&amp;failOverReadOnly=false&amp;maxReconnects=20&amp;rewriteBatchedStatements=true
 		UserName cf
 		Password cf
 		MaxActive 50