Mon Apr 19 13:50:33 UTC 2010 James H. Hill <hillj at cs dot iupui dot edu>

9 files changed, 115 insertions, 110 deletions

diff --git a/ADBC/ChangeLog b/ADBC/ChangeLog
index 21043c44616..8f39f7add9d 100644
--- a/ADBC/ChangeLog
+++ b/ADBC/ChangeLog
@@ -1,3 +1,19 @@
+Mon Apr 19 13:50:33 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * MPC/config/adbc_odbc.mpb:
+        * MPC/config/adbc_sqlite.mpb:
+
+          Added adbclib as a base project.
+
+        * adbc/SQLite/Query.h:
+        * adbc/SQLite/Query.inl:
+        * adbc/SQLite/Query.cpp:
+        * adbc/SQLite/Record.h:
+        * adbc/SQLite/Record.inl:
+        * adbc/SQLite/Record.cpp:
+
+          Fixed design issues related to circular dependencies.
+
 Thu Feb 18 05:44:41 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * MPC/config/adbc_odbc.mpb:
diff --git a/ADBC/MPC/config/adbc_odbc.mpb b/ADBC/MPC/config/adbc_odbc.mpb
index 7750ed3107b..0585ad26adb 100644
--- a/ADBC/MPC/config/adbc_odbc.mpb
+++ b/ADBC/MPC/config/adbc_odbc.mpb
@@ -1,6 +1,6 @@
 // $Id$
 
-project : odbc, adbc_defaults {
+project : odbc, adbclib {
   libs  += ADBC_ODBC
   after += ADBC_ODBC
 }
diff --git a/ADBC/MPC/config/adbc_sqlite.mpb b/ADBC/MPC/config/adbc_sqlite.mpb
index a7060efd5fa..b49fea78500 100644
--- a/ADBC/MPC/config/adbc_sqlite.mpb
+++ b/ADBC/MPC/config/adbc_sqlite.mpb
@@ -1,6 +1,6 @@
 // $Id$
 
-project : sqlite3, adbc_defaults {
+project : sqlite3, adbclib {
   libs  += ADBC_SQLite
   after += ADBC_SQLite
 }
diff --git a/ADBC/adbc/SQLite/Query.cpp b/ADBC/adbc/SQLite/Query.cpp
index 3a47187c28f..f77c2c9031e 100644
--- a/ADBC/adbc/SQLite/Query.cpp
+++ b/ADBC/adbc/SQLite/Query.cpp
@@ -118,5 +118,21 @@ void Query::reset (void)
   //this->needs_reseting_ = false;
 }
 
+//
+// last_insert_id
+//
+long Query::last_insert_id (void)
+{
+  return static_cast <long> (::sqlite3_last_insert_rowid (this->parent_.conn_));
+}
+
+//
+// count
+//
+size_t Query::count (void) const
+{
+  return ::sqlite3_changes (this->parent_.conn_);
+}
+
 }
 }
diff --git a/ADBC/adbc/SQLite/Query.h b/ADBC/adbc/SQLite/Query.h
index 315eae89a6e..5eb8e65bc79 100644
--- a/ADBC/adbc/SQLite/Query.h
+++ b/ADBC/adbc/SQLite/Query.h
@@ -15,8 +15,8 @@
 
 #include "adbc/Query.h"
 #include "sqlite3.h"
-#include "Record.h"
 #include "Parameter_List.h"
+#include "Record.h"
 
 namespace ADBC
 {
diff --git a/ADBC/adbc/SQLite/Query.inl b/ADBC/adbc/SQLite/Query.inl
index 6b470d0a9d6..738b2526338 100644
--- a/ADBC/adbc/SQLite/Query.inl
+++ b/ADBC/adbc/SQLite/Query.inl
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#include "Connection.h"
+#include "Record.h"
 
 namespace ADBC
 {
@@ -55,23 +55,5 @@ const Parameter_List & Query::parameters (void) const
   return this->params_;
 }
 
-//
-// last_insert_id
-//
-ADBC_INLINE
-long Query::last_insert_id (void)
-{
-  return static_cast <long> (::sqlite3_last_insert_rowid (this->parent_.conn_));
-}
-
-//
-// count
-//
-ADBC_INLINE
-size_t Query::count (void) const
-{
-  return ::sqlite3_changes (this->parent_.conn_);
-}
-
 }
 }
diff --git a/ADBC/adbc/SQLite/Record.cpp b/ADBC/adbc/SQLite/Record.cpp
index bd333b5294a..3ab2e3edda5 100644
--- a/ADBC/adbc/SQLite/Record.cpp
+++ b/ADBC/adbc/SQLite/Record.cpp
@@ -136,5 +136,83 @@ const char * Record::column_name (size_t index)
 
   throw Exception ("index out of range");
 }
+
+//
+// count
+//
+size_t Record::columns (void) const
+{
+  return ::sqlite3_column_count (this->query_.stmt_);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, char & value)
+{
+  value = *::sqlite3_column_text (this->query_.stmt_, column);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, unsigned char & value)
+{
+  value = *::sqlite3_column_text (this->query_.stmt_, column);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, short & value)
+{
+  int val = ::sqlite3_column_int (this->query_.stmt_, column);
+  value = static_cast <short> (val);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, unsigned short & value)
+{
+  int val = ::sqlite3_column_int (this->query_.stmt_, column);
+  value = static_cast <unsigned short> (val);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, long & value)
+{
+  int val = ::sqlite3_column_int (this->query_.stmt_, column);
+  value = static_cast <long> (val);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, unsigned long & value)
+{
+  int val = ::sqlite3_column_int (this->query_.stmt_, column);
+  value = static_cast <unsigned long> (val);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, float & value)
+{
+  double val = ::sqlite3_column_double (this->query_.stmt_, column);
+  value = static_cast <float> (val);
+}
+
+//
+// get_data
+//
+void Record::get_data (size_t column, double & value)
+{
+  value = ::sqlite3_column_double (this->query_.stmt_, column);
+}
+
 }
 }
diff --git a/ADBC/adbc/SQLite/Record.h b/ADBC/adbc/SQLite/Record.h
index a1676db254f..4066ff0cca1 100644
--- a/ADBC/adbc/SQLite/Record.h
+++ b/ADBC/adbc/SQLite/Record.h
@@ -15,6 +15,7 @@
 
 #include "adbc/Record.h"
 #include "SQLite_export.h"
+#include "sqlite3.h"
 
 namespace ADBC
 {
diff --git a/ADBC/adbc/SQLite/Record.inl b/ADBC/adbc/SQLite/Record.inl
index 0b690eb16ca..9155f3a9a67 100644
--- a/ADBC/adbc/SQLite/Record.inl
+++ b/ADBC/adbc/SQLite/Record.inl
@@ -1,7 +1,5 @@
 // $Id$
 
-#include "Query.h"
-
 namespace ADBC
 {
 namespace SQLite
@@ -28,92 +26,6 @@ Record::~Record (void)
 }
 
 //
-// count
-//
-ADBC_INLINE
-size_t Record::columns (void) const
-{
-  return ::sqlite3_column_count (this->query_.stmt_);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, char & value)
-{
-  value = *::sqlite3_column_text (this->query_.stmt_, column);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, unsigned char & value)
-{
-  value = *::sqlite3_column_text (this->query_.stmt_, column);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, short & value)
-{
-  int val = ::sqlite3_column_int (this->query_.stmt_, column);
-  value = static_cast <short> (val);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, unsigned short & value)
-{
-  int val = ::sqlite3_column_int (this->query_.stmt_, column);
-  value = static_cast <unsigned short> (val);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, long & value)
-{
-  int val = ::sqlite3_column_int (this->query_.stmt_, column);
-  value = static_cast <long> (val);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, unsigned long & value)
-{
-  int val = ::sqlite3_column_int (this->query_.stmt_, column);
-  value = static_cast <unsigned long> (val);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, float & value)
-{
-  double val = ::sqlite3_column_double (this->query_.stmt_, column);
-  value = static_cast <float> (val);
-}
-
-//
-// get_data
-//
-ADBC_INLINE
-void Record::get_data (size_t column, double & value)
-{
-  value = ::sqlite3_column_double (this->query_.stmt_, column);
-}
-
-//
 // done
 //
 ADBC_INLINE