Commit e8e59781 authored by Vadim Zeitlin's avatar Vadim Zeitlin

No real changes, just remove trailing whitespace.

Insignificant trailing whitespace was annoying as it resulted in extra noise
in the diffs, just get rid of it everywhere at once.
parent a90018b6
......@@ -69,5 +69,5 @@ Tomasz Olszewski
Vaclav Slavik
xol
There are a lot of people that help to drive SOCI project forward,
There are a lot of people that help to drive SOCI project forward,
if we have forgot to mention someone in here, send us an email!
......@@ -10,7 +10,7 @@ Version 4.0.0 differs from 3.2.x in the following ways:
Version 3.2.2 differs from 3.2.1 in the following ways:
- Fixed once_temp_type destructor with noexcept(false) specifier for C++11
- Fix uninitialized indicators in conversion_into_type and conversion_use_type specialisations
- Fix uninitialized indicators in conversion_into_type and conversion_use_type specialisations
- Fixed placeholder matching for PostgreSQL-style casts with ORM
- Fixed memory leaking in use binding in case of bind/unbind sequence
- Fixed sscanf formatter for MinGW/MSVC in backends
......@@ -83,7 +83,7 @@ Version 3.2.1 differs from 3.2.0 in the following ways:
---
Version 3.2.0 differs from 3.1.0 in the following ways:
- SOCI is now organization at GitHub
- SOCI is now organization at GitHub
-- Git repository moved to https://github.com/SOCI/soci
-- Opened new bug tracker (SF.net tracker is read-only)
-- Opened Wiki for FAQ and development articles
......@@ -130,7 +130,7 @@ Version 3.2.0 differs from 3.1.0 in the following ways:
-- Fixed issues in binding procedure IN/OUT parameters
- PostgreSQL
-- Add reading of BYTEA data into std::string (not fully-featured binary data support yet)
-- Add reading of BYTEA data into std::string (not fully-featured binary data support yet)
-- Add JSON data type support available in PostgreSQL 9.2+
-- Fixed incorrect assertion in postgresql::get_error_details
-- Fixed premature deallocation of prepared statements
......@@ -303,7 +303,7 @@ Version 2.0.1 differs from 2.0.0 in the following ways:
- A bug fix to correctly handle std::tm in the Oracle backend.
- A bug fix to correctly handle object relational mapping when
Values::set<T>() and Values::get<T>() are called where T is a
Values::set<T>() and Values::get<T>() are called where T is a
TypeConversion-based type.
---
......
......@@ -6,7 +6,7 @@ Website: http://soci.sourceforge.net
GitHub hosts SOCI source code repository, issues tracker and wiki:
https://github.com/SOCI
Downloads and mailing lists at
Downloads and mailing lists at
http://sourceforge.net/projects/soci/
Travis CI service at https://travis-ci.org/SOCI/soci
......@@ -34,7 +34,7 @@ Backend specific client libraries for:
* PostgreSQL
* SQLite 3
See documentation at http://soci.sourceforge.net for details
See documentation at http://soci.sourceforge.net for details
Brief History
-------------
......
......@@ -75,7 +75,7 @@ Additional pair based val/indicator interface?
Consolidate iteration methods?
most radical: do we still need Statement::fetch()? into()?
(Rowset<Row> can currently be used for any query, supports indicators,
defaults, and no need to check for eNodata)
defaults, and no need to check for eNodata)
---
ColumnProperties() more logically belongs to Rowset than to Row
......@@ -121,7 +121,7 @@ Sub-concepts:
- joins are tricky
- boolean operators (<,>,=,<=,=> and <>) and WHERE-like clause support as a query
rowset<Row> rs = (s.prepare << "age > 28") // rows where field 'age' is less than 28
rowset<Row> rs = (s.prepare << "age <> 28") // rows where field 'age' is less or more than 28
rowset<Row> rs = (s.prepare << "firstname='John' AND age > 28") // multi-fields combined queries
......
......@@ -8,7 +8,7 @@ source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
sudo apt-get install -qq firebird2.5-super firebird2.5-dev
# Configure Firebird server
# See: Non-interactive setup for travis-ci.org
# See: Non-interactive setup for travis-ci.org
# http://tech.groups.yahoo.com/group/firebird-support/message/120883
#sudo dpkg-reconfigure -f noninteractive firebird2.5-super
sudo sed /ENABLE_FIREBIRD_SERVER=/s/no/yes/ -i /etc/default/firebird2.5
......
......@@ -6,7 +6,7 @@
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
source ${TRAVIS_BUILD_DIR}/bin/ci/oracle.sh
sudo apt-get install -qq tar bzip2 libaio1
sudo apt-get install -qq tar bzip2 libaio1
wget https://www.dropbox.com/s/30ex7s0d1pru0ur/instantclient_11_2-linux-x64.tar.bz2
tar -jxvf instantclient_11_2-linux-x64.tar.bz2
......
......@@ -7,5 +7,5 @@ source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
mysql --version
mysql -e 'create database soci_test;'
psql --version
psql --version
psql -c 'create database soci_test;' -U postgres
......@@ -5,5 +5,5 @@
#
source ${TRAVIS_BUILD_DIR}/bin/ci/common.sh
psql --version
psql --version
psql -c 'create database soci_test;' -U postgres
......@@ -19,7 +19,7 @@ cmake \
-DSOCI_POSTGRESQL=OFF \
-DSOCI_SQLITE3=OFF \
-DSOCI_DB2_TEST_CONNSTR:STRING="DSN=SOCITEST\;Uid=db2inst1\;Pwd=db2inst1" \
..
..
run_make
run_test
......@@ -18,7 +18,7 @@ cmake \
-DSOCI_POSTGRESQL=OFF \
-DSOCI_SQLITE3=OFF \
-DSOCI_FIREBIRD_TEST_CONNSTR:STRING="service=LOCALHOST:/tmp/soci_test.fdb user=SYSDBA password=masterkey" \
..
..
run_make
run_test
......@@ -18,7 +18,7 @@ cmake \
-DSOCI_POSTGRESQL=OFF \
-DSOCI_SQLITE3=OFF \
-DSOCI_MYSQL_TEST_CONNSTR:STRING="db=soci_test" \
..
..
run_make
run_test
......@@ -26,7 +26,7 @@ cmake \
-DSOCI_POSTGRESQL=OFF \
-DSOCI_SQLITE3=OFF \
-DSOCI_ORACLE_TEST_CONNSTR:STRING="service=brzuchol.loskot.net user=${ORACLE_USER} password=soci_secret" \
..
..
run_make
......
......@@ -18,7 +18,7 @@ cmake \
-DSOCI_POSTGRESQL=ON \
-DSOCI_SQLITE3=OFF \
-DSOCI_POSTGRESQL_TEST_CONNSTR:STRING="dbname=soci_test user=postgres" \
..
..
run_make
run_test
......@@ -28,7 +28,7 @@ function free_restore()
# Install fake free
# http://www.axelog.de/2010/02/7-oracle-ee-refused-to-install-into-openvz/
free_backup
cat <<EOF >> /usr/bin/free
cat <<EOF >> /usr/bin/free
#!/bin/sh
cat <<__eof
total used free shared buffers cached
......
This directory is dedicated for:
- other building systems contributed by SOCI team and users
- other building systems contributed by SOCI team and users
......@@ -10,7 +10,7 @@ proc findOracle {} {
puts "The ORACLE_HOME variable is not set."
return {}
}
set ORACLE_HOME $env(ORACLE_HOME)
set includeDir [file join $ORACLE_HOME "rdbms/public"]
......
......@@ -79,7 +79,7 @@ proc buildSqlite3 {} {
execute "cp ../../src/backends/sqlite3/libsoci_sqlite3.a lib"
eval exec mkdir -p "include"
execute "cp ../../src/backends/sqlite3/soci-sqlite3.h include"
}
proc buildSqlite3So {} {
......
......@@ -8,7 +8,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
################################################################################
# Macros in this module:
#
#
# soci_backend
# - defines project of a database backend for SOCI library
#
......@@ -30,7 +30,7 @@ macro(soci_backend_deps_found NAME DEPS SUCCESS)
foreach(dep ${DEPS})
soci_check_package_found(${dep} DEPEND_FOUND)
if(NOT DEPEND_FOUND)
list(APPEND DEPS_NOT_FOUND ${dep})
list(APPEND DEPS_NOT_FOUND ${dep})
else()
string(TOUPPER "${dep}" DEPU)
list(APPEND DEPS_INCLUDE_DIRS ${${DEPU}_INCLUDE_DIR})
......@@ -41,7 +41,7 @@ macro(soci_backend_deps_found NAME DEPS SUCCESS)
endforeach()
list(LENGTH DEPS_NOT_FOUND NOT_FOUND_COUNT)
if (NOT_FOUND_COUNT GREATER 0)
set(${SUCCESS} False)
else()
......@@ -50,7 +50,7 @@ macro(soci_backend_deps_found NAME DEPS SUCCESS)
set(${NAME}_DEPS_DEFS ${DEPS_DEFS})
set(${SUCCESS} True)
endif()
#message(STATUS "soci_backend_deps_found: ${SUCCESS}=${${SUCCESS}}")
endmacro()
......@@ -104,11 +104,11 @@ macro(soci_backend NAME)
else()
if(${THIS_BACKEND_OPTION})
get_directory_property(THIS_INCLUDE_DIRS INCLUDE_DIRECTORIES)
get_directory_property(THIS_COMPILE_DEFS COMPILE_DEFINITIONS)
# Backend-specific depedencies
# Backend-specific depedencies
set(THIS_BACKEND_DEPENDS_INCLUDE_DIRS ${${NAMEU}_DEPS_INCLUDE_DIRS})
set(THIS_BACKEND_DEPENDS_LIBRARIES ${${NAMEU}_DEPS_LIBRARIES})
set(THIS_BACKEND_DEPENDS_DEFS ${${NAMEU}_DEPS_DEFS})
......@@ -128,7 +128,7 @@ macro(soci_backend NAME)
set(THIS_BACKEND_TARGET ${PROJECTNAMEL}_${NAMEL})
set(THIS_BACKEND_TARGET_VAR ${THIS_BACKEND_VAR}_TARGET)
set(${THIS_BACKEND_TARGET_VAR} ${THIS_BACKEND_TARGET})
soci_target_output_name(${THIS_BACKEND_TARGET} ${THIS_BACKEND_VAR}_OUTPUT_NAME)
set(THIS_BACKEND_OUTPUT_NAME ${${THIS_BACKEND_VAR}_OUTPUT_NAME})
......@@ -293,7 +293,7 @@ macro(soci_backend_test)
list(APPEND THIS_INCLUDE_DIRS ${THIS_TEST_DEPENDS_INCLUDE_DIRS})
list(APPEND THIS_COMPILE_DEFS ${THIS_TEST_DEPENDS_DEFS})
set_directory_properties(PROPERTIES
INCLUDE_DIRECTORIES "${THIS_INCLUDE_DIRS}"
COMPILE_DEFINITIONS "${THIS_COMPILE_DEFS}")
......@@ -305,7 +305,7 @@ macro(soci_backend_test)
set(TEST_CONNSTR_VAR ${TEST_FULL_NAME}_CONNSTR)
set(${TEST_CONNSTR_VAR} ""
CACHE STRING "Connection string for ${BACKENDU} test")
if(NOT ${TEST_CONNSTR_VAR} AND THIS_TEST_CONNSTR)
set(${TEST_CONNSTR_VAR} ${THIS_TEST_CONNSTR})
endif()
......@@ -341,7 +341,7 @@ macro(soci_backend_test)
add_test(${TEST_TARGET_STATIC}
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TEST_TARGET_STATIC}
${${TEST_CONNSTR_VAR}})
soci_backend_test_create_vcxproj_user(${TEST_TARGET_STATIC} "\"${${TEST_CONNSTR_VAR}}\"")
endif(SOCI_STATIC)
......
......@@ -19,20 +19,20 @@ if (MSVC)
add_definitions(-D_CRT_NONSTDC_NO_WARNING)
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif()
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
endif()
else()
set(SOCI_GCC_CLANG_COMMON_FLAGS
"-pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC ${SOCI_GCC_CLANG_COMMON_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
......
......@@ -11,7 +11,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
################################################################################
# Macros in this module:
#
#
# soci_backend - defines a database backend for SOCI library
#
################################################################################
......@@ -38,7 +38,7 @@ set(SOCI_ALL_DEPENDENCIES
#
# Perform checks
#
#
colormsg(_HIBLUE_ "Looking for SOCI dependencies:")
macro(boost_external_report NAME)
......@@ -50,7 +50,7 @@ macro(boost_external_report NAME)
list(REMOVE_AT VARNAMES 0)
# Test both, given original name and uppercase version too
if(NOT SUCCESS)
if(NOT SUCCESS)
string(TOUPPER ${NAME} VARNAME)
set(SUCCESS ${${VARNAME}_FOUND})
if(NOT SUCCESS)
......
......@@ -13,7 +13,7 @@
# SOCI_COMPILER_NAME - name of compiler toolset, follows Boost toolset naming.
# SOCI_PLATFORM_NAME - target platform name: x64, x86 or win32
#
# Based on the Pre-defined Compiler Macros
# Based on the Pre-defined Compiler Macros
# http://sourceforge.net/p/predef/wiki/Compilers/
################################################################################
......@@ -50,11 +50,11 @@ if(WIN32)
set(SOCI_COMPILER_NAME "msvc-11.0") # Visual Studio 2012
endif()
endif(MSVC)
if(MINGW)
set(SOCI_COMPILER_NAME "mingw-${GCC_VERSION}")
endif( MINGW )
if(CMAKE_GENERATOR MATCHES "Win64")
set(SOCI_PLATFORM_NAME "x64")
else()
......
......@@ -5,7 +5,7 @@
################################################################################
# Copyright (C) 2007 Douglas Gregor <doug.gregor@gmail.com>
# Copyright (C) 2007 Troy Straszheim
# Copyright (C) 2010-2013 Mateusz Loskot <mateusz@loskot.net>
# Copyright (C) 2010-2013 Mateusz Loskot <mateusz@loskot.net>
#
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE_1_0.txt or copy at
......@@ -29,7 +29,7 @@
# occurs within a list of strings:
#
# list_contains(result string_to_find arg1 arg2 arg3 ... argn)
#
#
# This macro sets the variable named by result equal to TRUE if
# string_to_find is found anywhere in the following arguments.
macro(list_contains var value)
......@@ -63,16 +63,16 @@ endmacro(cdr)
# list of names, and the third argument is a list of options. Both of
# these lists should be quoted. The rest of parse_arguments are
# arguments from another macro to be parsed.
#
# parse_arguments(prefix arg_names options arg1 arg2...)
#
#
# parse_arguments(prefix arg_names options arg1 arg2...)
#
# For each item in options, parse_arguments will create a variable with
# that name, prefixed with prefix_. So, for example, if prefix is
# MY_MACRO and options is OPTION1;OPTION2, then parse_arguments will
# create the variables MY_MACRO_OPTION1 and MY_MACRO_OPTION2. These
# variables will be set to true if the option exists in the command line
# or false otherwise.
#
#
# For each item in arg_names, parse_arguments will create a variable
# with that name, prefixed with prefix_. Each variable will be filled
# with the arguments that occur after the given arg_name is encountered
......@@ -109,8 +109,8 @@ macro(parse_arguments prefix arg_names option_names)
set(${prefix}_${current_arg_name} ${current_arg_list})
endmacro(parse_arguments)
# Perform a reverse topological sort on the given LIST.
#
# Perform a reverse topological sort on the given LIST.
#
# topological_sort(my_list "MY_" "_EDGES")
#
# LIST is the name of a variable containing a list of elements to be
......@@ -132,7 +132,7 @@ endmacro(parse_arguments)
# using the following variables:
#
# MY_A_EDGES b
# MY_B_EDGES
# MY_B_EDGES
# MY_C_EDGES a b
#
# With the involcation of topological_sort shown above and these
......@@ -153,7 +153,7 @@ function(topological_sort LIST PREFIX SUFFIX)
# search from where.
if (NOT FOUND_${UPPER_VERTEX})
# Push this vertex onto the stack with all of its outgoing edges
string(REPLACE ";" " " NEW_ELEMENT
string(REPLACE ";" " " NEW_ELEMENT
"${VERTEX};${${PREFIX}${UPPER_VERTEX}${SUFFIX}}")
list(APPEND STACK ${NEW_ELEMENT})
......@@ -191,14 +191,14 @@ function(topological_sort LIST PREFIX SUFFIX)
# Push the remaining edges for the current vertex onto the
# stack
string(REPLACE ";" " " NEW_ELEMENT
string(REPLACE ";" " " NEW_ELEMENT
"${SOURCE};${OUT_EDGES}")
list(APPEND STACK ${NEW_ELEMENT})
# Setup the new source and outgoing edges
set(SOURCE ${TARGET})
string(TOUPPER ${SOURCE} UPPER_SOURCE)
set(OUT_EDGES
set(OUT_EDGES
${${PREFIX}${UPPER_SOURCE}${SUFFIX}})
endif(NOT FOUND_${UPPER_TARGET})
......@@ -275,19 +275,19 @@ function (colormsg)
message(STATUS ${str})
endfunction()
# colormsg("Colors:"
# WHITE "white" GRAY "gray" GREEN "green"
# RED "red" YELLOW "yellow" BLUE "blue" MAG "mag" CYAN "cyan"
# _WHITE_ "white" _GRAY_ "gray" _GREEN_ "green"
# _RED_ "red" _YELLOW_ "yellow" _BLUE_ "blue" _MAG_ "mag" _CYAN_ "cyan"
# _HIWHITE_ "white" _HIGRAY_ "gray" _HIGREEN_ "green"
# _HIRED_ "red" _HIYELLOW_ "yellow" _HIBLUE_ "blue" _HIMAG_ "mag" _HICYAN_ "cyan"
# HIWHITE "white" HIGRAY "gray" HIGREEN "green"
# HIRED "red" HIYELLOW "yellow" HIBLUE "blue" HIMAG "mag" HICYAN "cyan"
# colormsg("Colors:"
# WHITE "white" GRAY "gray" GREEN "green"
# RED "red" YELLOW "yellow" BLUE "blue" MAG "mag" CYAN "cyan"
# _WHITE_ "white" _GRAY_ "gray" _GREEN_ "green"
# _RED_ "red" _YELLOW_ "yellow" _BLUE_ "blue" _MAG_ "mag" _CYAN_ "cyan"
# _HIWHITE_ "white" _HIGRAY_ "gray" _HIGREEN_ "green"
# _HIRED_ "red" _HIYELLOW_ "yellow" _HIBLUE_ "blue" _HIMAG_ "mag" _HICYAN_ "cyan"
# HIWHITE "white" HIGRAY "gray" HIGREEN "green"
# HIRED "red" HIYELLOW "yellow" HIBLUE "blue" HIMAG "mag" HICYAN "cyan"
# "right?")
#
# pretty-prints the value of a variable so that the
# pretty-prints the value of a variable so that the
# equals signs align
#
function(boost_report_value NAME)
......@@ -296,7 +296,7 @@ function(boost_report_value NAME)
#message(STATUS "boost_report_value: NAME=${NAME} (${varlen})")
#message(STATUS "boost_report_value: \${NAME}=${${NAME}}")
math(EXPR padding_len 40-${varlen})
string(SUBSTRING " "
string(SUBSTRING " "
0 ${padding_len} varpadding)
colormsg("${NAME}${varpadding} = ${${NAME}}")
endfunction()
......@@ -309,16 +309,16 @@ function(trace NAME)
0 ${padding_len} varpadding)
message("${NAME} ${varpadding} ${${NAME}}")
endif()
endfunction()
endfunction()
#
# pretty-prints the value of a variable so that the
# pretty-prints the value of a variable so that the
# equals signs align
#
function(boost_report_pretty PRETTYNAME VARNAME)
string(LENGTH "${PRETTYNAME}" varlen)
math(EXPR padding_len 30-${varlen})
string(SUBSTRING " "
string(SUBSTRING " "
0 ${padding_len} varpadding)
message(STATUS "${PRETTYNAME}${varpadding} = ${${VARNAME}}")
endfunction()
......@@ -348,7 +348,7 @@ macro(soci_check_package_found NAME SUCCESS)
set(VARNAME_SUCCESS ${${VARNAME}_FOUND})
# Test both, given original name and uppercase version too
if(VARNAME_SUCCESS)
if(VARNAME_SUCCESS)
set(${SUCCESS} TRUE)
else()
string(TOUPPER ${NAME} VARNAME)
......
......@@ -8,7 +8,7 @@
# http://www.boost.org/LICENSE_1_0.txt)
################################################################################
# Macros in this module:
#
#
# soci_version - defines version information for SOCI library
#
################################################################################
......
......@@ -26,7 +26,7 @@ if(UNIX)
else()
set(DB2_LIBDIRS "lib64")
endif()
set(DB2_FIND_INCLUDE_PATHS)
set(DB2_FIND_LIB_PATHS)
foreach(db2_install_path ${DB2_INSTALL_PATHS})
......@@ -45,10 +45,10 @@ if(UNIX)
endforeach(db2_install_path)
elseif(WIN32)
if (CMAKE_CL_64) # 64-bit build, DB2 64-bit installed
set(DB2_FIND_INCLUDE_PATHS $ENV{ProgramW6432}/IBM/SQLLIB/include)
set(DB2_FIND_INCLUDE_PATHS $ENV{ProgramW6432}/IBM/SQLLIB/include)
set(DB2_FIND_LIB_PATHS $ENV{ProgramW6432}/IBM/SQLLIB/lib)
else() # 32-bit build, DB2 64-bit or DB2 32-bit installed
if(EXISTS "$ENV{ProgramW6432}/IBM/SQLLIB/lib")
# On 64-bit Windows with DB2 64-bit installed:
# LIB environment points to {DB2}/IBM/SQLLIB/lib with64-bit db2api.lib,
......@@ -56,8 +56,8 @@ elseif(WIN32)
set(DB2_FIND_LIB_NO_LIB NO_SYSTEM_ENVIRONMENT_PATH)
endif()
set(DB2_FIND_INCLUDE_PATHS
set(DB2_FIND_INCLUDE_PATHS
$ENV{ProgramW6432}/IBM/SQLLIB/include
$ENV{ProgramFiles}/IBM/SQLLIB/include)
set(DB2_FIND_LIB_PATHS
......
......@@ -71,7 +71,7 @@ else(WIN32)
$ENV{MYSQL_DIR}/lib/mysql
/usr/local/mysql/lib
/opt/mysql/mysql/lib
PATH_SUFFIXES
PATH_SUFFIXES
mysql
)
endif(WIN32)
......
#
#
# Find the ODBC driver manager includes and library.
#
#
# ODBC is an open standard for connecting to different databases in a
# semi-vendor-independent fashion. First you install the ODBC driver
# manager. Then you need a driver for each separate database you want
# to connect to (unless a generic one works). VTK includes neither
# the driver manager nor the vendor-specific drivers: you have to find
# those yourself.
#
#
# This module defines
# ODBC_INCLUDE_DIR, where to find sql.h
# ODBC_LIBRARIES, the libraries to link against to use ODBC
......@@ -27,13 +27,13 @@ find_path(ODBC_INCLUDE_DIR sql.h
"C:/Program Files (x86)/Windows Kits/8.0/include/um"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Include"
"C:/Program Files/ODBC/include"
"C:/Program Files/Microsoft SDKs/Windows/v7.0/include"
"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include"
"C:/Program Files/Microsoft SDKs/Windows/v7.0/include"
"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include"
"C:/ODBC/include"
DOC "Specify the directory containing sql.h."
)
find_library(ODBC_LIBRARY
find_library(ODBC_LIBRARY
NAMES iodbc odbc odbcinst odbc32
PATHS
/usr/lib
......
......@@ -54,11 +54,11 @@ if(DEFINED ENV{ORACLE_HOME})
find_library(ORACLE_NNZ_LIBRARY
NAMES ${ORACLE_NNZ_NAMES} PATHS ${ORACLE_LIB_DIR})
set(ORACLE_LIBRARY
${ORACLE_OCI_LIBRARY}
${ORACLE_OCCI_LIBRARY}
set(ORACLE_LIBRARY
${ORACLE_OCI_LIBRARY}
${ORACLE_OCCI_LIBRARY}
${ORACLE_NNZ_LIBRARY})
if(NOT WIN32)
set(ORACLE_LIBRARY ${ORACLE_LIBRARY} ${ORACLE_CLNTSH_LIBRARY})
endif(NOT WIN32)
......
......@@ -31,7 +31,7 @@ if(PG_CONFIG)
exec_program(${PG_CONFIG}
ARGS "--includedir"
OUTPUT_VARIABLE PG_CONFIG_INCLUDEDIR)
OUTPUT_VARIABLE PG_CONFIG_INCLUDEDIR)
exec_program(${PG_CONFIG}
ARGS "--libdir"
......@@ -53,7 +53,7 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h
find_library(POSTGRESQL_LIBRARIES NAMES pq libpq
PATHS
${PG_CONFIG_LIBDIR}
${PG_CONFIG_LIBDIR}
/usr/lib
/usr/local/lib
/usr/lib/postgresql
......
......@@ -46,7 +46,7 @@ find_library(SQLITE3_LIBRARY
${SQLITE_ROOT_DIR}/lib
$ENV{OSGEO4W_ROOT}/lib)
set(SQLITE3_LIBRARIES
set(SQLITE3_LIBRARIES
${SQLITE3_LIBRARIES}
${SQLITE3_LIBRARY})
......
......@@ -408,8 +408,8 @@ internals of the <code>session</code> object.</p>
<li><code>begin</code>, <code>commit</code>, <code>rollback</code>
- Forward-called when the same functions of <code>session</code> are
called by user.</li>
<li><code>get_next_sequence_value</code>, <code>get_last_insert_id</code>
- Called to retrieve sequences or auto-generated values and every backend should
<li><code>get_next_sequence_value</code>, <code>get_last_insert_id</code>
- Called to retrieve sequences or auto-generated values and every backend should
define at least one of them to allow the code using auto-generated values to work.
</li>
<li><code>make_statement_backend</code>, <code>make_rowid_backend</code>,
......
......@@ -19,7 +19,7 @@
<a href="#required">Required Client Libraries</a><br />
</div>
<a href="#connecting">Connecting to the Database</a><br />
<a href="#support">SOCI Feature Support</a><br />
<div class="navigation-indented">
<a href="#dynamic">Dynamic Binding</a><br />
......@@ -61,7 +61,7 @@
<h4 id="connecting">Connecting to the Database</h4>
<p>On Unix, before using the DB2 backend please make sure, that you have sourced
<p>On Unix, before using the DB2 backend please make sure, that you have sourced
DB2 profile into your environment:</p>
<pre>. ~/db2inst1/sqllib/db2profile</pre>
......@@ -96,7 +96,7 @@ soci::session sql(soci::db2, "your DB2 connection string here");
<h4 id="nested">Nested Statements</h4>
<p>Nesting statements are not processed by SOCI in any special way and
<p>Nesting statements are not processed by SOCI in any special way and
they work as implemented by the DB2 database.</p>
<h4 id="procedures">Stored Procedures</h4>
......
......@@ -19,7 +19,7 @@
<a href="#required">Required Client Libraries</a><br />
</div>
<a href="#connecting">Connecting to the Database</a><br />
<a href="#support">SOCI Feature Support</a><br />
<div class="navigation-indented">
<a href="#dynamic">Dynamic Binding</a><br />
......@@ -69,14 +69,14 @@ using the firebird backend factory together with a connection string:</p>
<pre class="example">
BackEndFactory const &amp;backEnd = firebird;
Session sql(backEnd,
Session sql(backEnd,
"service=/usr/local/firbird/db/test.fdb user=SYSDBA password=masterkey");
</pre>
<p>or simply:</p>
<pre class="example">
Session sql(firebird,
Session sql(firebird,
"service=/usr/local/firbird/db/test.fdb user=SYSDBA password=masterkey");
</pre>
......@@ -145,7 +145,7 @@ sql &lt;&lt; "select count(*) from user_tables", into(count);
</tr>
</tbody>
</table>
<p><a name="note1" />&nbsp;<sup>[1]</sup> &nbsp;There is also 64bit integer type for larger values which is
<p><a name="note1" />&nbsp;<sup>[1]</sup> &nbsp;There is also 64bit integer type for larger values which is
currently not supported.</p>
<p>(See the <a href="../exchange.html#dynamic">dynamic resultset binding</a> documentation for general information on using the <code>Row</code> class.)</p>
......@@ -162,11 +162,11 @@ sql &lt;&lt; "select name from person where id = :id", use(id, "id")
<h4 id="bulk">Bulk Operations</h4>
<p>The Firebird backend has full support for SOCI's <a href="../statements.html#bulk">bulk operations</a> interface. This feature is also supported by emulation.</p>
<p>The Firebird backend has full support for SOCI's <a href="../statements.html#bulk">bulk operations</a> interface. This feature is also supported by emulation.</p>
<h4 id="transactions">Transactions</h4>
<p><a href="../statements.html#transactions">Transactions</a> are also fully
<p><a href="../statements.html#transactions">Transactions</a> are also fully
supported by the Firebird backend. In fact, an implicit transaction is always
started when using this backend if one hadn't been started by explicitly calling
<tt>begin()</tt> before. The current transaction is automatically committed in
......@@ -176,7 +176,7 @@ started when using this backend if one hadn't been started by explicitly calling
<h4 id="blob">BLOB Data Type</h4>
<p>The Firebird backend supports working with data stored in columns of type Blob, via SOCI's <a href="../exchange.html#blob"><code>BLOB</code></a> class.</p>
<p>It should by noted, that entire Blob data is fetched from database to allow random read and write access.
<p>It should by noted, that entire Blob data is fetched from database to allow random read and write access.
This is because Firebird itself allows only writing to a new Blob or reading from existing one -
modifications of existing Blob means creating a new one. Firebird backend hides those details from user.</p>
......
......@@ -19,7 +19,7 @@
<a href="#required">Required Client Libraries</a><br />
</div>
<a href="#connecting">Connecting to the Database</a><br />
<a href="#support">SOCI Feature Support</a><br />
<div class="navigation-indented">
<a href="#dynamic">Dynamic Binding</a><br /></