From e278b0ad502f4dc71784708211f83cf660a1dda8 Mon Sep 17 00:00:00 2001
From: kishoramballi <kishoramballi>
Date: Wed, 4 Feb 2009 04:57:00 +0000
Subject: [PATCH] freeScan function removed as it is not required since table
 closeScan will delete the iterator.  Earlier freescan was written to reset
 the iterator

---
 include/SqlStatement.h   |  1 -
 include/Statement.h      |  1 -
 src/sql/SelStatement.cxx |  8 ++------
 src/sql/SqlStatement.cxx | 10 +---------
 src/sql/Statement.h      |  1 -
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/include/SqlStatement.h b/include/SqlStatement.h
index e5eacba8..691b90f6 100644
--- a/include/SqlStatement.h
+++ b/include/SqlStatement.h
@@ -109,7 +109,6 @@ class SqlStatement: public AbsSqlStatement
     * @returns DbRetVal
     */
     DbRetVal close();
-    DbRetVal freeScan();
 
     /** get FieldValue->value ptr after fetch is done.
     * @returns address void*
diff --git a/include/Statement.h b/include/Statement.h
index 2c733441..f668a52d 100644
--- a/include/Statement.h
+++ b/include/Statement.h
@@ -159,7 +159,6 @@ class SelStatement : public DmlStatement
     int getFldPos(char *name);
     DbRetVal setNull(int pos){}
     DbRetVal close();
-    DbRetVal freeScan();
     DbRetVal resolve();
 
     void* handleSingleTableAggWithoutGroup();
diff --git a/src/sql/SelStatement.cxx b/src/sql/SelStatement.cxx
index e7482db8..8332a46e 100644
--- a/src/sql/SelStatement.cxx
+++ b/src/sql/SelStatement.cxx
@@ -33,6 +33,7 @@ SelStatement::SelStatement()
 
 SelStatement::~SelStatement()
 {
+    close();
     if (table) { table->close(); table = NULL; }
     if (totalParams) {
         free(params);
@@ -686,12 +687,7 @@ void* SelStatement::fetch(DbRetVal &rv)
 DbRetVal SelStatement::close()
 {
     isPointReturned = false;
-    return table->closeScan();
-}
-
-DbRetVal SelStatement::freeScan()
-{
-    if (table) return table->close();
+    if (table) return table->closeScan();
     else return OK;
 }
 
diff --git a/src/sql/SqlStatement.cxx b/src/sql/SqlStatement.cxx
index f0e60f6f..9be58b9c 100644
--- a/src/sql/SqlStatement.cxx
+++ b/src/sql/SqlStatement.cxx
@@ -185,14 +185,7 @@ DbRetVal SqlStatement::close()
     SelStatement *selStmt = (SelStatement*) stmt; 
     return selStmt->close();
 }
-DbRetVal SqlStatement::freeScan()
-{
-    if (pData.getStmtType() != SelectStatement) return OK;
-    SelStatement *selStmt = (SelStatement*) stmt; 
-    if (stmt) return selStmt->freeScan();
-    return OK;
-    
-}
+
 void* SqlStatement::getParamValuePtr( int pos )
 {
     //if (pData.getStmtType() != SelectStatement) return 0;
@@ -265,7 +258,6 @@ DbRetVal SqlStatement::getParamFldInfo (int parampos, FieldInfo *&fInfo)
 
 DbRetVal SqlStatement::free()
 {
-    freeScan();
     delete stmt;
     stmt = NULL;
     pData.reset();
diff --git a/src/sql/Statement.h b/src/sql/Statement.h
index 2c733441..f668a52d 100644
--- a/src/sql/Statement.h
+++ b/src/sql/Statement.h
@@ -159,7 +159,6 @@ class SelStatement : public DmlStatement
     int getFldPos(char *name);
     DbRetVal setNull(int pos){}
     DbRetVal close();
-    DbRetVal freeScan();
     DbRetVal resolve();
 
     void* handleSingleTableAggWithoutGroup();
-- 
2.11.4.GIT