da115115 · da115115 · Dec 26, 2010 · Dec 26, 2010 · Dec 26, 2010 · Dec 26, 2010
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,21 @@
+*~
+*.kdev[0-9]
+*.swp
+aclocal.m4
+autom4te.cache
+confdefs.h
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+m4
+missing
+Makefile
+Makefile.in
 tmp
 
diff --git a/src/AUTHORS → AUTHORS b/src/AUTHORS → AUTHORS
@@ -118,3 +118,7 @@ soci_backend_test_create_vcxproj_user
 ==== Mario Valesco ====
 
 Mario tested building SOCI using MinGW toolset.
+
+==== Gevorg Voskanyan ====
+
+Gevorg submitted new exception type postgresql_soci_error to PostgreSQL backend.
diff --git a/src/CHANGES → CHANGES b/src/CHANGES → CHANGES
@@ -1,5 +1,70 @@
 This file contains the history of changes in the SOCI library.
 
+---
+Version 3.1.0 differs from 3.0.0 in the following ways:
+
+- Added Ada language binding
+
+- Migraded build system from GNU Autotools and Visual Studio projects to CMake
+
+- CMake build tested with Visual Studio, GCC and clang
+
+- Incorporated a compromise for naming versioned shared libraries
+
+- Enhanced and improved integration with Boost libraries:
+-- Boost.DateTime
+-- Boost.Fusion
+-- Boost.Optional
+-- Boost.Tuple
+
+- Bug fixes and improvements in core and backends:
+-- Added soci::values::get_properties accessor useful for composing soci::type_conversion
+-- Export advanced API of backend loader from DLL.
+-- Added static factory registration functions for backends
+-- Added get_affected_rows operation
+-- Fixed thread-safety of connection pool under Windows
+-- Fixed bug with droping const qualifiers when binding to std::vector<soci::indicator>
+-- Fixed bug in default initialization of an object of const backend_factory wihch requires user-provided default constructor (see C++03/C++0x)
+-- Fixes for 64-bit builds
+-- Removed redundant exchange_traits breaking ODR on LP64
+-- Better ODBC support
+-- Type conversion support for unsigned integer types
+-- Bug ID:1971436 - incorrect rowset copy operations
+-- Bug ID:2010367 - memory leak (ODBC)
+-- Bug ID:2010409 - invalid memory allocaton in define by position (ODBC)
+-- Bug ID:2021243 - long long type support in Visual C++
+-- Patch ID:2483066 - 64bit Linux and 64bit integer submitted
+-- Patch ID:2809809 - Fix build with GCC 4.4
+-- Patch ID:2809810 - Fix SQLite3 build with GCC 4.3
+-- Patch ID:2581206 - Windows unicode application
+-- Patch ID:3058275 - install target for cmake build submitted
+-- Patch ID:3069375 - use $(prefix)/lib64 on AMD64 platforms.
+-- Improved performance while accessing query results (MySQL)
+-- Bug fixes for PROCEDURE support (MySQL)
+-- Removed throw statements from mysql_rowid_backend and mysql_blob_backend destructors (MySQL)
+-- Verify that prepared statements survive session::reconnect() operatoin (MySQL)
+-- Improved support for time and date (MySQL, PostgreSQL)
+-- Fixed bug with strings of length exceeding 255 characters (ODBC)
+-- Improved interpretation of the connect string (Oracle)
+-- Added handling of unsigned long long (Oracle, SQLite3, PostgreSQL)
+-- Fixes in integral types support (PostgreSQL)
+-- Support for colon-casts (PostgreSQL)
+-- Added possibility for use BLOB (PostgreSQL)
+-- Added support for connection property "synchronous=on|off" (SQLite3)
+-- Improved BLOB data handling (SQLite3)
+-- Improved boolean type suppport (SQLite3)
+-- Session timeout support (SQLite3)
+-- Improved tests clean-up (SQLite3)
+-- Added missing typedef of sqlite3_destructor_type which has been defined in sqlite3.h but since 3.3.10 (see comment for reference to SQLite ticket)
+
+- Updated tests for various backends and SQL data types
+
+- Migrated from CVS to Git repository
+
+- Changed naming convensions and style across all the source code
+
+- Firebird backend removed from official release as not actively maintained. Available in the Git repository.
+
 ---
 Version 3.0.0 differs from 2.2.0 in the following ways:
 

diff --git a/src/CMakeLists.txt → CMakeLists.txt b/src/CMakeLists.txt → CMakeLists.txt
@@ -1,4 +1,3 @@
-#################################################################################
 #
 # This file is part of CMake configuration for SOCI library
 #
@@ -19,7 +18,7 @@ project(SOCI)
 #################################################################################
 
 # Path to additional CMake modules
-set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
 include(SociUtilities)
@@ -68,7 +67,7 @@ include(SociDependencies)
 # Installation
 #################################################################################
 
-if(UNIX AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
   set(SOCI_LIBDIR "lib")
 else()
   set(SOCI_LIBDIR "lib64")
@@ -82,7 +81,7 @@ set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.")
 #################################################################################
 # Enable CTest support
 #################################################################################
-#include(CTest)
+include(CTest)
 enable_testing()
 
 # Define "make check" as alias for "make test"
@@ -95,5 +94,6 @@ include(SociBackend)
 
 include_directories(${SOCI_SOURCE_DIR}/core)
 
+#
 add_subdirectory(core)
 add_subdirectory(backends)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -0,0 +1,13 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+## # The following are required to uses Dart and the Cdash dashboard
+##   ENABLE_TESTING()
+##   INCLUDE(CTest)
+set(CTEST_PROJECT_NAME "SOCI")
+set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "my.cdash.org")
+set(CTEST_DROP_LOCATION "/submit.php?project=SOCI")
+set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/src/LICENSE_1_0.txt → LICENSE_1_0.txt b/src/LICENSE_1_0.txt → LICENSE_1_0.txt
diff --git a/README b/README
@@ -1,18 +1,26 @@
-SOCI - The C++ Database Access Library
---------------------------------------
+SOCI - The C++ Database Access Library.
 
-Project website:
+Copyright (C) 2004-2008 Maciej Sobczak, Stephen Hutton,
+                        David Courtney, Pawel Aleksander Fedorynski,
+                        Rafal Bobrowski, Mateusz Loskot
 
-http://soci.sourceforge.net
+The homepage of the SOCI library is:
+http://soci.sourceforge.net/
 
+---
 
-Development, Download, Bug Tracking, Mailing Lists:
+You should see the following files and directories here:
 
-http://sourceforge.net/projects/soci/
+- README          - This file.
+- LICENSE_1_0.txt - Full text of the Boost license.
+- CHANGES         - The description of changes.
 
-Git repository of SOCI project
-------------------------------
+That branch corresponds to the 'src' sub-directory of the Git repository.
+
+Reminder: Git repository of SOCI project
+----------------------------------------
 /src - project source code tree
 /doc - project documentation
 /www - project website
 /build - legacy build configurations (to be removed)
+
diff --git a/TODO b/TODO
diff --git a/src/backends/.gitignore → backends/.gitignore b/src/backends/.gitignore → backends/.gitignore
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
@@ -0,0 +1,13 @@
+message(STATUS "")
+colormsg(_HIBLUE_ "Configuring SOCI database backends:")
+
+##############################################################
+# TODO: Scan and add directories automatically --mloskot
+set ( _SUBDIRS_ empty mysql odbc oracle postgresql sqlite3 )
+
+foreach ( subd ${_SUBDIRS_} )
+  add_subdirectory( ${subd} )
+endforeach ()
+
+
+message(STATUS "")
diff --git a/src/backends/empty/CMakeLists.txt → backends/empty/CMakeLists.txt b/src/backends/empty/CMakeLists.txt → backends/empty/CMakeLists.txt
diff --git a/src/backends/empty/Makefile.basic → backends/empty/Makefile.basic b/src/backends/empty/Makefile.basic → backends/empty/Makefile.basic
diff --git a/src/backends/empty/blob.cpp → backends/empty/blob.cpp b/src/backends/empty/blob.cpp → backends/empty/blob.cpp
diff --git a/src/backends/empty/factory.cpp → backends/empty/factory.cpp b/src/backends/empty/factory.cpp → backends/empty/factory.cpp
diff --git a/src/backends/empty/row-id.cpp → backends/empty/row-id.cpp b/src/backends/empty/row-id.cpp → backends/empty/row-id.cpp
diff --git a/src/backends/empty/session.cpp → backends/empty/session.cpp b/src/backends/empty/session.cpp → backends/empty/session.cpp
diff --git a/src/backends/empty/soci-empty.h → backends/empty/soci-empty.h b/src/backends/empty/soci-empty.h → backends/empty/soci-empty.h
@@ -22,9 +22,13 @@
 #ifndef SOCI_EMPTY_DECL
 # define SOCI_EMPTY_DECL
 #endif
-
-#include "soci-backend.h"
-
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-backend.h>
+#else
+#	include <soci-backend.h>
+#endif
+//
 #include <cstddef>
 #include <string>
 

diff --git a/src/backends/empty/standard-into-type.cpp → backends/empty/standard-into-type.cpp b/src/backends/empty/standard-into-type.cpp → backends/empty/standard-into-type.cpp
diff --git a/src/backends/empty/standard-use-type.cpp → backends/empty/standard-use-type.cpp b/src/backends/empty/standard-use-type.cpp → backends/empty/standard-use-type.cpp
diff --git a/src/backends/empty/statement.cpp → backends/empty/statement.cpp b/src/backends/empty/statement.cpp → backends/empty/statement.cpp
diff --git a/src/backends/empty/test/.gitignore → backends/empty/test/.gitignore b/src/backends/empty/test/.gitignore → backends/empty/test/.gitignore
diff --git a/src/backends/empty/test/CMakeLists.txt → backends/empty/test/CMakeLists.txt b/src/backends/empty/test/CMakeLists.txt → backends/empty/test/CMakeLists.txt
diff --git a/src/backends/empty/test/Makefile.basic → backends/empty/test/Makefile.basic b/src/backends/empty/test/Makefile.basic → backends/empty/test/Makefile.basic
diff --git a/src/backends/empty/test/test-empty.cpp → backends/empty/test/test-empty.cpp b/src/backends/empty/test/test-empty.cpp → backends/empty/test/test-empty.cpp
diff --git a/src/backends/empty/vector-into-type.cpp → backends/empty/vector-into-type.cpp b/src/backends/empty/vector-into-type.cpp → backends/empty/vector-into-type.cpp
diff --git a/src/backends/empty/vector-use-type.cpp → backends/empty/vector-use-type.cpp b/src/backends/empty/vector-use-type.cpp → backends/empty/vector-use-type.cpp
diff --git a/src/backends/firebird/Makefile.basic → backends/firebird/Makefile.basic b/src/backends/firebird/Makefile.basic → backends/firebird/Makefile.basic
diff --git a/src/backends/firebird/blob.cpp → backends/firebird/blob.cpp b/src/backends/firebird/blob.cpp → backends/firebird/blob.cpp
diff --git a/src/backends/firebird/common.cpp → backends/firebird/common.cpp b/src/backends/firebird/common.cpp → backends/firebird/common.cpp
diff --git a/src/backends/firebird/common.h → backends/firebird/common.h b/src/backends/firebird/common.h → backends/firebird/common.h
diff --git a/src/backends/firebird/error-firebird.cpp → backends/firebird/error-firebird.cpp b/src/backends/firebird/error-firebird.cpp → backends/firebird/error-firebird.cpp
diff --git a/src/backends/firebird/error-firebird.h → backends/firebird/error-firebird.h b/src/backends/firebird/error-firebird.h → backends/firebird/error-firebird.h
diff --git a/src/backends/firebird/factory.cpp → backends/firebird/factory.cpp b/src/backends/firebird/factory.cpp → backends/firebird/factory.cpp
diff --git a/src/backends/firebird/row-id.cpp → backends/firebird/row-id.cpp b/src/backends/firebird/row-id.cpp → backends/firebird/row-id.cpp
diff --git a/src/backends/firebird/session.cpp → backends/firebird/session.cpp b/src/backends/firebird/session.cpp → backends/firebird/session.cpp
diff --git a/src/backends/firebird/soci-firebird.h → backends/firebird/soci-firebird.h b/src/backends/firebird/soci-firebird.h → backends/firebird/soci-firebird.h
diff --git a/src/backends/firebird/standard-into-type.cpp → backends/firebird/standard-into-type.cpp b/src/backends/firebird/standard-into-type.cpp → backends/firebird/standard-into-type.cpp
diff --git a/src/backends/firebird/standard-use-type.cpp → backends/firebird/standard-use-type.cpp b/src/backends/firebird/standard-use-type.cpp → backends/firebird/standard-use-type.cpp
diff --git a/src/backends/firebird/statement.cpp → backends/firebird/statement.cpp b/src/backends/firebird/statement.cpp → backends/firebird/statement.cpp
diff --git a/src/backends/firebird/test/Makefile.basic → backends/firebird/test/Makefile.basic b/src/backends/firebird/test/Makefile.basic → backends/firebird/test/Makefile.basic
diff --git a/src/backends/firebird/test/test-firebird.cpp → backends/firebird/test/test-firebird.cpp b/src/backends/firebird/test/test-firebird.cpp → backends/firebird/test/test-firebird.cpp
diff --git a/src/backends/firebird/vector-into-type.cpp → backends/firebird/vector-into-type.cpp b/src/backends/firebird/vector-into-type.cpp → backends/firebird/vector-into-type.cpp
diff --git a/src/backends/firebird/vector-use-type.cpp → backends/firebird/vector-use-type.cpp b/src/backends/firebird/vector-use-type.cpp → backends/firebird/vector-use-type.cpp
diff --git a/src/backends/mysql/CMakeLists.txt → backends/mysql/CMakeLists.txt b/src/backends/mysql/CMakeLists.txt → backends/mysql/CMakeLists.txt
diff --git a/src/backends/mysql/Makefile.basic → backends/mysql/Makefile.basic b/src/backends/mysql/Makefile.basic → backends/mysql/Makefile.basic
diff --git a/src/backends/mysql/blob.cpp → backends/mysql/blob.cpp b/src/backends/mysql/blob.cpp → backends/mysql/blob.cpp
diff --git a/src/backends/mysql/common.cpp → backends/mysql/common.cpp b/src/backends/mysql/common.cpp → backends/mysql/common.cpp
@@ -6,7 +6,13 @@
 //
 
 #include "common.h"
-#include "soci-backend.h"
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-backend.h>
+#else
+#	include <soci-backend.h>
+#endif
+//
 #include <ciso646>
 #include <cstdlib>
 #include <cstring>

diff --git a/src/backends/mysql/common.h → backends/mysql/common.h b/src/backends/mysql/common.h → backends/mysql/common.h
@@ -8,7 +8,15 @@
 #ifndef SOCI_MYSQL_COMMON_H_INCLUDED
 #define SOCI_MYSQL_COMMON_H_INCLUDED
 
-#include "soci-mysql.h"
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-platform.h>
+#       include <soci/backends/mysql/soci-mysql.h>
+#else
+#	include <soci-platform.h>
+#	include <soci-mysql.h>
+#endif
+//
 // std
 #include <cstddef>
 #include <ctime>

diff --git a/src/backends/mysql/factory.cpp → backends/mysql/factory.cpp b/src/backends/mysql/factory.cpp → backends/mysql/factory.cpp
diff --git a/src/backends/mysql/row-id.cpp → backends/mysql/row-id.cpp b/src/backends/mysql/row-id.cpp → backends/mysql/row-id.cpp
diff --git a/src/backends/mysql/session.cpp → backends/mysql/session.cpp b/src/backends/mysql/session.cpp → backends/mysql/session.cpp
diff --git a/src/backends/mysql/soci-mysql.h → backends/mysql/soci-mysql.h b/src/backends/mysql/soci-mysql.h → backends/mysql/soci-mysql.h
@@ -23,12 +23,23 @@
 #ifndef SOCI_MYSQL_DECL
 # define SOCI_MYSQL_DECL
 #endif
-
-#include "soci-backend.h"
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-backend.h>
+#else
+#	include <soci-backend.h>
+#endif
+//
 #ifdef _WIN32
 #include <winsock.h> // SOCKET
 #endif // _WIN32
-#include <mysql.h> // MySQL Client
+//
+// MySQL Client
+#if defined(SOCI_MYSQL_HEADERS_BURIED)
+#       include <mysql/mysql.h>
+#else
+#	include <mysql.h>
+#endif
 #include <vector>
 
 

diff --git a/src/backends/mysql/standard-into-type.cpp → backends/mysql/standard-into-type.cpp b/src/backends/mysql/standard-into-type.cpp → backends/mysql/standard-into-type.cpp
@@ -7,12 +7,19 @@
 //
 
 #define SOCI_MYSQL_SOURCE
-#include "soci-mysql.h"
-#include <soci-platform.h>
 #include "common.h"
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-platform.h>
+#       include <soci/backends/mysql/soci-mysql.h>
+#else
+#	include <soci-platform.h>
+#	include <soci-mysql.h>
+#endif
+//
 // std
-#include <cassert>
 #include <ciso646>
+#include <cassert>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>

diff --git a/src/backends/mysql/standard-use-type.cpp → backends/mysql/standard-use-type.cpp b/src/backends/mysql/standard-use-type.cpp → backends/mysql/standard-use-type.cpp
@@ -7,9 +7,16 @@
 //
 
 #define SOCI_MYSQL_SOURCE
-#include "soci-mysql.h"
 #include "common.h"
-#include <soci-platform.h>
+//
+#if defined(SOCI_HEADERS_BURIED)
+#       include <soci/core/soci-platform.h>
+#       include <soci/backends/mysql/soci-mysql.h>
+#else
+#	include <soci-platform.h>
+#	include <soci-mysql.h>
+#endif
+//
 // std
 #include <ciso646>
 #include <cstdio>

diff --git a/src/backends/mysql/statement.cpp → backends/mysql/statement.cpp b/src/backends/mysql/statement.cpp → backends/mysql/statement.cpp
diff --git a/src/backends/mysql/test/.gitignore → backends/mysql/test/.gitignore b/src/backends/mysql/test/.gitignore → backends/mysql/test/.gitignore
diff --git a/src/backends/mysql/test/CMakeLists.txt → backends/mysql/test/CMakeLists.txt b/src/backends/mysql/test/CMakeLists.txt → backends/mysql/test/CMakeLists.txt
diff --git a/src/backends/mysql/test/Makefile.basic → backends/mysql/test/Makefile.basic b/src/backends/mysql/test/Makefile.basic → backends/mysql/test/Makefile.basic