midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FR: [ 2214883 ] Remove SQL code and Replace for Query 

-- JUnit test in next commit (no failures)
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883
This commit is contained in:
Redhuan D. Oon 2010-03-03 07:51:30 +00:00
parent dfe03fabfa
commit ab5b31fe9a
1 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
base/src/org/compiere/model/MRule.java
View File

@ -22,6 +22,7 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.logging.Level;
@ -92,26 +93,11 @@ public class MRule extends X_AD_Rule
return retValue;
}
//
MRule retValue = null;
String sql = "SELECT * FROM AD_Rule WHERE Value=? AND IsActive='Y'";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement (sql, null);
pstmt.setString(1, ruleValue);
rs = pstmt.executeQuery ();
if (rs.next ())
retValue = new MRule (ctx, rs, null);
}
catch (Exception e)
{
s_log.log(Level.SEVERE, sql, e);
}
finally {
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
final String whereClause = "Value=?";
MRule retValue = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
.setParameters(ruleValue)
.setOnlyActiveRecords(true)
.first();
if (retValue != null)
{
@ -128,30 +114,13 @@ public class MRule extends X_AD_Rule
*/
public static ArrayList<MRule> getModelValidatorLoginRules (Properties ctx)
{
final String whereClause = "EventType=?";
List<MRule>list = new Query(ctx,I_AD_Rule.Table_Name,whereClause,null)
.setParameters(EVENTTYPE_ModelValidatorLoginEvent)
.setOnlyActiveRecords(true)
.list();
ArrayList<MRule> rules = new ArrayList<MRule>();
MRule rule = null;
String sql = "SELECT * FROM AD_Rule WHERE EventType=? AND IsActive='Y'";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement (sql, null);
pstmt.setString(1, EVENTTYPE_ModelValidatorLoginEvent);
rs = pstmt.executeQuery ();
while (rs.next ()) {
rule = new MRule (ctx, rs, null);
rules.add(rule);
}
}
catch (Exception e)
{
s_log.log(Level.SEVERE, sql, e);
}
finally {
DB.close(rs, pstmt);
rs = null; pstmt = null;
}
rules.addAll(list);
if (rules != null && rules.size() > 0)
return rules;
else