4 files changed, 9 insertions, 6 deletions
diff --git a/sca-cpp/trunk/components/sqldb/server-test b/sca-cpp/trunk/components/sqldb/server-test
index 666a9a1f0b..db756ec1c4 100755
--- a/sca-cpp/trunk/components/sqldb/server-test
+++ b/sca-cpp/trunk/components/sqldb/server-test
@@ -18,6 +18,7 @@
 #  under the License.
 
 # Setup
+rm -rf tmp
 ../../modules/http/httpd-conf tmp localhost 8090 ../../modules/http/htdocs
 ../../modules/http/httpd-event-conf tmp
 ./pgsql-conf tmp
diff --git a/sca-cpp/trunk/components/sqldb/sqldb-test b/sca-cpp/trunk/components/sqldb/sqldb-test
index bbbbd4d373..cb023fec3a 100755
--- a/sca-cpp/trunk/components/sqldb/sqldb-test
+++ b/sca-cpp/trunk/components/sqldb/sqldb-test
@@ -18,6 +18,7 @@
 #  under the License.
 
 # Setup
+rm -rf tmp
 ./pgsql-conf tmp
 ./pgsql-start tmp
 ./pgsql "drop table test;" 1>/dev/null 2>&1
diff --git a/sca-cpp/trunk/components/sqldb/sqldb.cpp b/sca-cpp/trunk/components/sqldb/sqldb.cpp
index c2b178f13e..bbf118385e 100644
--- a/sca-cpp/trunk/components/sqldb/sqldb.cpp
+++ b/sca-cpp/trunk/components/sqldb/sqldb.cpp
@@ -49,7 +49,7 @@ const failable<value> post(const list<value>& params, pgsql::PGSql& pg) {
     const value id = append<value>(car(params), mklist(mkuuid()));
     const failable<bool> val = pgsql::post(id, cadr(params), pg);
     if (!hasContent(val))
-        return mkfailure<value>(reason(val));
+        return mkfailure<value>(val);
     return id;
 }
 
@@ -59,7 +59,7 @@ const failable<value> post(const list<value>& params, pgsql::PGSql& pg) {
 const failable<value> put(const list<value>& params, pgsql::PGSql& pg) {
     const failable<bool> val = pgsql::put(car(params), cadr(params), pg);
     if (!hasContent(val))
-        return mkfailure<value>(reason(val));
+        return mkfailure<value>(val);
     return value(content(val));
 }
 
@@ -69,7 +69,7 @@ const failable<value> put(const list<value>& params, pgsql::PGSql& pg) {
 const failable<value> del(const list<value>& params, pgsql::PGSql& pg) {
     const failable<bool> val = pgsql::del(car(params), pg);
     if (!hasContent(val))
-        return mkfailure<value>(reason(val));
+        return mkfailure<value>(val);
     return value(content(val));
 }
 
@@ -91,7 +91,7 @@ public:
             return put(cdr(params), *pg);
         if (func == "delete")
             return del(cdr(params), *pg);
-        return tuscany::mkfailure<tuscany::value>();
+        return mkfailure<value>();
     }
 
 private:
diff --git a/sca-cpp/trunk/components/sqldb/standby-test b/sca-cpp/trunk/components/sqldb/standby-test
index fbb27b5bc3..3c91e477e4 100755
--- a/sca-cpp/trunk/components/sqldb/standby-test
+++ b/sca-cpp/trunk/components/sqldb/standby-test
@@ -18,12 +18,13 @@
 #  under the License.
 
 # Setup
+rm -rf tmp
 ../../modules/http/httpd-conf tmp/master localhost 8090 tmp/master/htdocs
 ../../modules/http/httpd-event-conf tmp
 ./pgsql-conf tmp/master 5432
 ./pgsql-start tmp/master
-./pgsql localhost 5432 "drop table test;" 1>/dev/null 2>&1
-./pgsql localhost 5432 "create table test(key text, value text);" 1>/dev/null 2>&1
+./pgsql localhost 6432 "drop table test;" 1>/dev/null 2>&1
+./pgsql localhost 6432 "create table test(key text, value text);" 1>/dev/null 2>&1
 ../../modules/http/httpd-start tmp/master
 sleep 2
 ./pgsql-standby-conf tmp/standby 5433 localhost 5432 8090