From b689b452c3efe717cc398e08ae85f27bf8cad3d5 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Fri, 10 Aug 2012 09:03:05 +0100 Subject: [PATCH] fix sql error in GET for depositproducts and reset password again. --- .../service/DepositProductReadPlatformServiceImpl.java | 6 ++---- mifosng-provider/src/test/resources/META-INF/context.xml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java index 2aa0af31e..001fdcc6d 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/depositproduct/service/DepositProductReadPlatformServiceImpl.java @@ -38,7 +38,7 @@ public class DepositProductReadPlatformServiceImpl implements public Collection retrieveAllDepositProducts() { this.context.authenticatedUser(); DepositProductMapper depositProductMapper= new DepositProductMapper(); - String sql="select "+depositProductMapper.depositProductSchema() + " where sp.is_deleted=0"; + String sql= "select " + depositProductMapper.depositProductSchema() + " where dp.is_deleted=0"; return this.jdbcTemplate.query(sql,depositProductMapper, new Object[]{}); } @@ -118,6 +118,4 @@ public class DepositProductReadPlatformServiceImpl implements List currencyOptions = currencyReadPlatformService.retrieveAllowedCurrencies(); productData.setCurrencyOptions(currencyOptions); } - - -} +} \ No newline at end of file diff --git a/mifosng-provider/src/test/resources/META-INF/context.xml b/mifosng-provider/src/test/resources/META-INF/context.xml index 7c0a42100..d9556190e 100644 --- a/mifosng-provider/src/test/resources/META-INF/context.xml +++ b/mifosng-provider/src/test/resources/META-INF/context.xml @@ -5,7 +5,7 @@ driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://localhost:3306/mifosplatform-tenants" username="root" - password="mifos" + password="mysql" validationQuery="select 1" maxActive="10" maxIdle="4"