You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/10/11 18:24:57 UTC
svn commit: r312910 - in /incubator/roller/branches/roller_2.0:
metadata/database/hibernate/hibernate.cfg.xml
src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
src/org/roller/business/utils/UpgradeDatabase.java
Author: snoopdave
Date: Tue Oct 11 09:24:52 2005
New Revision: 312910
URL: http://svn.apache.org/viewcvs?rev=312910&view=rev
Log:
DB2/Derby patch from Elias Torres
Modified:
incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
Modified: incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml?rev=312910&r1=312909&r2=312910&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml Tue Oct 11 09:24:52 2005
@@ -13,7 +13,7 @@
If you want to use HSQLDB, PostgreSQL, DB2 or Derby, then use the right dialect
<property name="dialect">org.hibernate.dialect.HQLDBDialect</property>
<property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>
- <property name="dialect">org.hibernate.dialect.DB2SQLDialect</property>
+ <property name="dialect">org.hibernate.dialect.DB2Dialect</property>
<property name="dialect">org.hibernate.dialect.DerbyDialect</property>
-->
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java?rev=312910&r1=312909&r2=312910&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/hibernate/HibernateRefererManagerImpl.java Tue Oct 11 09:24:52 2005
@@ -187,6 +187,23 @@
"group by w.name,w.handle,w.id order by s desc");
stmt.setInt(1, max);
stmt.setBoolean(2, true);
+ } else if(con.getMetaData().getDriverName().startsWith("Apache Derby")) {
+ // special handling for Derby
+ stmt = con.prepareStatement(
+ "select u.username,w.name,w.name,sum(r.dayhits) as s "+
+ "from rolleruser as u, website as w, referer as r "+
+ "where r.websiteid=w.id and w.userid=u.id and w.isenabled=? " +
+ "group by u.username,w.name,w.id order by s desc");
+ stmt.setBoolean(1, true);
+ } else if(con.getMetaData().getDriverName().startsWith("IBM DB2")) {
+ // special handling for IBM DB2
+ stmt = con.prepareStatement(
+ "select u.username,w.name,w.name,sum(r.dayhits) as s "+
+ "from rolleruser as u, website as w, referer as r "+
+ "where r.websiteid=w.id and w.userid=u.id and w.isenabled= ? " +
+ "group by u.username,w.name,w.id order by s desc fetch first " +
+ Integer.toString(max) + " rows only");
+ stmt.setBoolean(1, true);
} else {
stmt = con.prepareStatement(
"select w.id,w.name,w.handle,sum(r.dayhits) as s "+
@@ -213,6 +230,10 @@
websiteName,
websiteHandle,
hits));
+ if(list.size() >= max) {
+ rs.close();
+ break;
+ }
}
while ( rs.next() );
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java?rev=312910&r1=312909&r2=312910&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/business/utils/UpgradeDatabase.java Tue Oct 11 09:24:52 2005
@@ -65,7 +65,7 @@
"select value from roller_properties where name = '"+DBVERSION_PROP+"'");
if(rs.next()) {
- dbversion = rs.getInt(1);
+ dbversion = Integer.parseInt(rs.getString(1));
} else {
// tough to know if this is an upgrade with no db version :/