[jboss-svn-commits] JBL Code SVN: r29058 - labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-08-26 04:10:03 -0400 (Wed, 26 Aug 2009)
New Revision: 29058

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java
Log:
Changed join to standard FROM + WHERE clause

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java	2009-08-26 07:23:59 UTC (rev 29057)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsDAOImpl.java	2009-08-26 08:10:03 UTC (rev 29058)
@@ -49,21 +49,21 @@
       + " FROM phpbb_topics WHERE forum_id = ?";
 
   private static final String SELECT_FROM_POST = "SELECT p.post_id, p.topic_id, p.forum_id, nu.pn_uname, nu.pn_email, CASE WHEN post_time = \"0000-00-00 00:00:00\" THEN null ELSE post_time END as post_time, post_subject, post_text "
-      + "FROM phpbb_posts p join nuke_users nu on p.poster_id = nu.pn_uid";
+      + "FROM phpbb_posts p, nuke_users nu WHERE p.poster_id = nu.pn_uid";
 
   private static final String SELECT_POST_BY_ID = SELECT_FROM_POST
-      + " WHERE post_id = ?";
+      + " AND post_id = ?";
 
   private static final String SELECT_POSTS_BY_TOPICID = SELECT_FROM_POST
-      + " WHERE topic_id = ?";
+      + " AND topic_id = ?";
 
-  private static final String SELECT_WATCHING_FORUM_USERS_BY_FORUMID = "select u.pn_uname "
-      + "from phpbb_forums_watch w join nuke_users u on u.pn_uid = w.user_id "
-      + "where forum_id = ?";
+  private static final String SELECT_WATCHING_FORUM_USERS_BY_FORUMID = "SELECT u.pn_uname "
+      + "FROM phpbb_forums_watch w, nuke_users u "
+      + "WHERE u.pn_uid = w.user_id AND forum_id = ?";
 
-  private static final String SELECT_WATCHING_TOPIC_USERS_BY_FORUMID = "select u.pn_uname "
-      + "from phpbb_topics_watch w join nuke_users u on u.pn_uid = w.user_id "
-      + "where topic_id = ?";
+  private static final String SELECT_WATCHING_TOPIC_USERS_BY_FORUMID = "SELECT u.pn_uname "
+      + "FROM phpbb_topics_watch w, nuke_users u "
+      + "WHERE u.pn_uid = w.user_id AND topic_id = ?";
 
   private static final String SELECT_NUKES_USER_BY_USERNAME = "SELECT * FROM nuke_users WHERE pn_uname = ?";
 
@@ -71,7 +71,7 @@
 
   private static final String SELECT_POLL_OPTIONS_BY_POLLID = "SELECT vote_option_id, vote_option_text, vote_result FROM phpbb_vote_results WHERE vote_desc_id = ?";
 
-  private static final String SELECT_VOTING_USERS_BY_POLLID = "SELECT u.pn_uname, u.pn_email FROM phpbb_vote_voters v join nuke_users u on v.vote_user_id = u.pn_uid WHERE vote_desc_id = ?";
+  private static final String SELECT_VOTING_USERS_BY_POLLID = "SELECT u.pn_uname, u.pn_email FROM phpbb_vote_voters v, nuke_users u WHERE v.vote_user_id = u.pn_uid AND vote_desc_id = ?";
 
   public NukesForumsForumBean getForumByID(Long forumID) {
     return getSimpleJdbcTemplate().queryForObject(SELECT_FORUM_BY_ID,
@@ -97,7 +97,7 @@
       Long exceptPostID) {
     if (exceptPostID != null) {
       return getSimpleJdbcTemplate().query(
-          SELECT_POSTS_BY_TOPICID + " and post_id != ?",
+          SELECT_POSTS_BY_TOPICID + " AND post_id != ?",
           new NukesForumsPostBeanMapper(), topicID, exceptPostID);
     } else {
       return getSimpleJdbcTemplate().query(SELECT_POSTS_BY_TOPICID,