diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:51:23 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:51:23 +0200 |
commit | 1692b3e82521e7d73a908f532eced90491e1eded (patch) | |
tree | c45272faba67485f3702395f43282a81a981cf5f /odb/mysql | |
parent | 4452be925b749572f0e3edcb21e9af818647eb55 (diff) |
Support for automake and VC++ builds
Diffstat (limited to 'odb/mysql')
-rw-r--r-- | odb/mysql/Makefile.am | 15 | ||||
-rw-r--r-- | odb/mysql/connection-factory.cxx | 17 | ||||
-rw-r--r-- | odb/mysql/connection-factory.hxx | 13 | ||||
-rw-r--r-- | odb/mysql/connection.hxx | 19 | ||||
-rw-r--r-- | odb/mysql/database.hxx | 19 | ||||
-rw-r--r-- | odb/mysql/details/config.hxx | 19 | ||||
-rw-r--r-- | odb/mysql/details/export.hxx | 27 | ||||
-rw-r--r-- | odb/mysql/exceptions.cxx | 11 | ||||
-rw-r--r-- | odb/mysql/exceptions.hxx | 21 | ||||
-rw-r--r-- | odb/mysql/forward.hxx | 4 | ||||
-rw-r--r-- | odb/mysql/libodb-mysql-vc10.vcxproj | 174 | ||||
-rw-r--r-- | odb/mysql/libodb-mysql-vc10.vcxproj.filters | 19 | ||||
-rw-r--r-- | odb/mysql/libodb-mysql-vc9.vcproj | 359 | ||||
-rw-r--r-- | odb/mysql/makefile | 40 | ||||
-rw-r--r-- | odb/mysql/query.cxx | 2 | ||||
-rw-r--r-- | odb/mysql/query.hxx | 33 | ||||
-rw-r--r-- | odb/mysql/result.hxx | 4 | ||||
-rw-r--r-- | odb/mysql/statement.cxx | 27 | ||||
-rw-r--r-- | odb/mysql/statement.hxx | 38 | ||||
-rw-r--r-- | odb/mysql/traits.cxx | 90 | ||||
-rw-r--r-- | odb/mysql/traits.hxx | 78 | ||||
-rw-r--r-- | odb/mysql/transaction-impl.cxx | 11 | ||||
-rw-r--r-- | odb/mysql/transaction-impl.hxx | 8 | ||||
-rw-r--r-- | odb/mysql/transaction.hxx | 8 | ||||
-rw-r--r-- | odb/mysql/version.hxx | 12 |
25 files changed, 958 insertions, 110 deletions
diff --git a/odb/mysql/Makefile.am b/odb/mysql/Makefile.am new file mode 100644 index 0000000..3d5c2b3 --- /dev/null +++ b/odb/mysql/Makefile.am @@ -0,0 +1,15 @@ +# file : odb/mysql/Makefile.am +# author : Boris Kolpackov <boris@codesynthesis.com> +# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC +# license : GNU GPL v2; see accompanying LICENSE file + +lib_LTLIBRARIES = libodb-mysql.la +libodb_mysql_la_SOURCES = __path__(sources) + +odbmysqlincludedir = $(includedir)/odb/mysql/ +nobase_odbmysqlinclude_HEADERS = __path__(headers) + +EXTRA_DIST = __file__(extra_dist) + +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +libodb_mysql_la_LDFLAGS = -release __value__(interface_version) diff --git a/odb/mysql/connection-factory.cxx b/odb/mysql/connection-factory.cxx index db7a702..c490048 100644 --- a/odb/mysql/connection-factory.cxx +++ b/odb/mysql/connection-factory.cxx @@ -3,14 +3,25 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <mysql/mysql.h> -#include <mysql/errmsg.h> // CR_UNKNOWN_ERROR +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +# include <errmsg.h> // CR_UNKNOWN_ERROR +#else +# include <mysql/mysql.h> +# include <mysql/errmsg.h> +#endif #include <odb/mysql/connection-factory.hxx> #include <odb/mysql/exceptions.hxx> #include <odb/details/tls.hxx> #include <odb/details/lock.hxx> +#include <odb/details/config.hxx> // ODB_THREADS_NONE using namespace std; @@ -24,6 +35,7 @@ namespace odb { struct mysql_init { +#ifndef ODB_THREADS_NONE mysql_init () { if (my_thread_init ()) @@ -37,6 +49,7 @@ namespace odb { my_thread_end (); } +#endif }; static ODB_TLS_OBJECT (mysql_init) mysql_init_; diff --git a/odb/mysql/connection-factory.hxx b/odb/mysql/connection-factory.hxx index 4d57d75..2cd4184 100644 --- a/odb/mysql/connection-factory.hxx +++ b/odb/mysql/connection-factory.hxx @@ -6,6 +6,8 @@ #ifndef ODB_MYSQL_CONNECTION_FACTORY_HXX #define ODB_MYSQL_CONNECTION_FACTORY_HXX +#include <odb/pre.hxx> + #include <vector> #include <cstddef> // std::size_t @@ -17,11 +19,13 @@ #include <odb/details/condition.hxx> #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { - class connection_factory + class LIBODB_MYSQL_EXPORT connection_factory { public: virtual details::shared_ptr<connection> @@ -37,7 +41,7 @@ namespace odb ~connection_factory (); }; - class new_connection_factory: public connection_factory + class LIBODB_MYSQL_EXPORT new_connection_factory: public connection_factory { public: new_connection_factory () @@ -59,7 +63,8 @@ namespace odb database_type* db_; }; - class connection_pool_factory: public connection_factory + class LIBODB_MYSQL_EXPORT connection_pool_factory: + public connection_factory { public: // The max_connections argument specifies the maximum number of @@ -142,4 +147,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_MYSQL_CONNECTION_FACTORY_HXX diff --git a/odb/mysql/connection.hxx b/odb/mysql/connection.hxx index cc5e5f0..9cbd5c5 100644 --- a/odb/mysql/connection.hxx +++ b/odb/mysql/connection.hxx @@ -6,7 +6,18 @@ #ifndef ODB_MYSQL_CONNECTION_HXX #define ODB_MYSQL_CONNECTION_HXX -#include <mysql/mysql.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <vector> @@ -17,11 +28,13 @@ #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { - class connection: public details::shared_base + class LIBODB_MYSQL_EXPORT connection: public details::shared_base { public: typedef mysql::statement_cache statement_cache_type; @@ -87,4 +100,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_MYSQL_CONNECTION_HXX diff --git a/odb/mysql/database.hxx b/odb/mysql/database.hxx index 3272eda..0344f3c 100644 --- a/odb/mysql/database.hxx +++ b/odb/mysql/database.hxx @@ -6,7 +6,18 @@ #ifndef ODB_MYSQL_DATABASE_HXX #define ODB_MYSQL_DATABASE_HXX -#include <mysql/mysql.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <string> #include <memory> // std::auto_ptr @@ -21,11 +32,13 @@ #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { - class database: public odb::database + class LIBODB_MYSQL_EXPORT database: public odb::database { public: typedef mysql::connection connection_type; @@ -156,4 +169,6 @@ namespace odb #include <odb/mysql/database.ixx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_DATABASE_HXX diff --git a/odb/mysql/details/config.hxx b/odb/mysql/details/config.hxx new file mode 100644 index 0000000..f8418c6 --- /dev/null +++ b/odb/mysql/details/config.hxx @@ -0,0 +1,19 @@ +// file : odb/mysql/details/config.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_MYSQL_DETAILS_CONFIG_HXX +#define ODB_MYSQL_DETAILS_CONFIG_HXX + +// no pre + +#ifndef LIBODB_MYSQL_INCLUDE_SHORT + #ifdef _WIN32 + #define LIBODB_MYSQL_INCLUDE_SHORT 1 + #endif +#endif + +// no post + +#endif // ODB_MYSQL_DETAILS_CONFIG_HXX diff --git a/odb/mysql/details/export.hxx b/odb/mysql/details/export.hxx new file mode 100644 index 0000000..bb3bac5 --- /dev/null +++ b/odb/mysql/details/export.hxx @@ -0,0 +1,27 @@ +// file : odb/mysql/details/export.hxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_MYSQL_DETAILS_EXPORT_HXX +#define ODB_MYSQL_DETAILS_EXPORT_HXX + +#include <odb/pre.hxx> + +#ifdef LIBODB_MYSQL_STATIC_LIB +# define LIBODB_MYSQL_EXPORT +#else +# ifdef _WIN32 +# ifdef LIBODB_MYSQL_DYNAMIC_LIB +# define LIBODB_MYSQL_EXPORT __declspec(dllexport) +# else +# define LIBODB_MYSQL_EXPORT __declspec(dllimport) +# endif +# else +# define LIBODB_MYSQL_EXPORT +# endif +#endif + +#include <odb/post.hxx> + +#endif // ODB_MYSQL_DETAILS_EXPORT_HXX diff --git a/odb/mysql/exceptions.cxx b/odb/mysql/exceptions.cxx index 1373874..b857fb6 100644 --- a/odb/mysql/exceptions.cxx +++ b/odb/mysql/exceptions.cxx @@ -3,7 +3,16 @@ // copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <mysql/errmsg.h> // CR_OUT_OF_MEMORY +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <errmsg.h> // CR_OUT_OF_MEMORY +#else +# include <mysql/errmsg.h> +#endif #include <new> // std::bad_alloc #include <sstream> diff --git a/odb/mysql/exceptions.hxx b/odb/mysql/exceptions.hxx index 86cbb19..6be2d80 100644 --- a/odb/mysql/exceptions.hxx +++ b/odb/mysql/exceptions.hxx @@ -6,19 +6,32 @@ #ifndef ODB_MYSQL_EXCEPTIONS_HXX #define ODB_MYSQL_EXCEPTIONS_HXX -#include <string> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif -#include <mysql/mysql.h> +#include <string> #include <odb/exceptions.hxx> #include <odb/mysql/version.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { - struct database_exception: odb::database_exception + struct LIBODB_MYSQL_EXPORT database_exception: odb::database_exception { database_exception (MYSQL*); database_exception (MYSQL_STMT*); @@ -62,4 +75,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_MYSQL_EXCEPTIONS_HXX diff --git a/odb/mysql/forward.hxx b/odb/mysql/forward.hxx index 54bf7bf..095b857 100644 --- a/odb/mysql/forward.hxx +++ b/odb/mysql/forward.hxx @@ -6,6 +6,8 @@ #ifndef ODB_MYSQL_FORWARD_HXX #define ODB_MYSQL_FORWARD_HXX +#include <odb/pre.hxx> + namespace odb { namespace mysql @@ -22,4 +24,6 @@ namespace odb } } +#include <odb/post.hxx> + #endif // ODB_MYSQL_FORWARD_HXX diff --git a/odb/mysql/libodb-mysql-vc10.vcxproj b/odb/mysql/libodb-mysql-vc10.vcxproj new file mode 100644 index 0000000..bd7eb88 --- /dev/null +++ b/odb/mysql/libodb-mysql-vc10.vcxproj @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>libodb-mysql</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin\</OutDir> + <TargetName>odb-mysql-d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>true</LinkIncremental> + <OutDir>..\..\bin64\</OutDir> + <TargetName>odb-mysql-d-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin\</OutDir> + <TargetName>odb-mysql-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>..\..\bin64\</OutDir> + <TargetName>odb-mysql-__value__(interface_version)-vc10</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib\odb-mysql-d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib64\odb-mysql-d.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib\odb-mysql.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories> + <DisableSpecificWarnings>4355;4800;4290;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <Link> + <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <OutputFile>$(TargetPath)</OutputFile> + <ImportLibrary>..\..\lib64\odb-mysql.lib</ImportLibrary> + </Link> + </ItemDefinitionGroup> + <ItemGroup> +__header_entries__(headers) + </ItemGroup> + <ItemGroup> +__source_entries__(sources) + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --git a/odb/mysql/libodb-mysql-vc10.vcxproj.filters b/odb/mysql/libodb-mysql-vc10.vcxproj.filters new file mode 100644 index 0000000..115907d --- /dev/null +++ b/odb/mysql/libodb-mysql-vc10.vcxproj.filters @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{0347216A-CA2E-4378-8C44-8539C22EE47C}</UniqueIdentifier> + <Extensions>cxx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{EEA5E942-4493-4517-8D9B-660178508331}</UniqueIdentifier> + <Extensions>h;hxx;ixx;txx</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> +__header_filter_entries__(headers) + </ItemGroup> + <ItemGroup> +__source_filter_entries__(sources) + </ItemGroup> +</Project> diff --git a/odb/mysql/libodb-mysql-vc9.vcproj b/odb/mysql/libodb-mysql-vc9.vcproj new file mode 100644 index 0000000..3d578fc --- /dev/null +++ b/odb/mysql/libodb-mysql-vc9.vcproj @@ -0,0 +1,359 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libodb-mysql" + ProjectGUID="{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}" + RootNamespace="libodb-mysql" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="..\.." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib mkdir ..\..\lib" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb-d.lib;libmysql.lib" + OutputFile="$(OutDir)\bin\odb-mysql-d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib\odb-mysql-d.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory="..\.." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="0" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb-d.lib;libmysql.lib" + OutputFile="$(OutDir)\bin64\odb-mysql-d-__value__(interface_version)-vc9.dll" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="2" + ImportLibrary="$(OutDir)\lib64\odb-mysql-d.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="..\.." + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib mkdir ..\..\lib" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb.lib;libmysql.lib" + OutputFile="$(OutDir)\bin\odb-mysql-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib\odb-mysql.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory="..\.." + IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/wd4355 /wd4800 /wd4290" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\.." + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="odb.lib;libmysql.lib" + OutputFile="$(OutDir)\bin64\odb-mysql-__value__(interface_version)-vc9.dll" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + ImportLibrary="$(OutDir)\lib64\odb-mysql.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Source Files" + Filter="cxx" + UniqueIdentifier="{07EA5579-4EE8-4B71-BD72-5FFDFF9D28FC}" + > +__source_entries__(sources) + </Filter> + <Filter + Name="Header Files" + Filter="h;hxx;ixx;txx" + UniqueIdentifier="{11553374-F2B1-4ABC-BB27-07A0C831B938}" + > +__file_entries__(headers) + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/odb/mysql/makefile b/odb/mysql/makefile index 4f1735f..49d42a7 100644 --- a/odb/mysql/makefile +++ b/odb/mysql/makefile @@ -5,7 +5,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make -cxx_tun := \ +cxx := \ connection.cxx \ connection-factory.cxx \ database.cxx \ @@ -13,17 +13,19 @@ exceptions.cxx \ transaction.cxx \ transaction-impl.cxx \ statement.cxx \ -query.cxx +query.cxx \ +traits.cxx -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) +cxx_tun := $(cxx) +cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) +cxx_od := $(cxx_obj:.o=.o.d) odb_mysql.l := $(out_base)/odb-mysql.l odb_mysql.l.cpp-options := $(out_base)/odb-mysql.l.cpp-options -default := $(out_base)/ -install := $(out_base)/.install -clean := $(out_base)/.clean +default := $(out_base)/ +dist := $(out_base)/.dist +clean := $(out_base)/.clean # Import. # @@ -53,12 +55,21 @@ $(call include-dep,$(cxx_od)) # $(out_base)/: $(odb_mysql.l) -# Install. +# Dist. # -$(install): $(odb_mysql.l) - $(call install-lib,$<,$(install_lib_dir)/$(ld_lib_prefix)odb-mysql$(ld_lib_suffix)) - $(call install-dir,$(src_base),$(install_inc_dir)/odb/mysql,\ -'(' -name '*.hxx' -o -name '*.ixx' -o -name '*.txx' ')') +$(dist): export sources := $(cxx) +$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \ +-name '*.hxx' -o -name '*.ixx' -o -name '*.txx')) +$(dist): export extra_dist := libodb-mysql-vc9.vcproj \ +libodb-mysql-vc10.vcxproj libodb-mysql-vc10.vcxproj.filters +$(dist): export interface_version = $(shell sed -e \ +'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version) + +$(dist): + $(call dist-data,$(sources) $(headers)) + $(call meta-vc9proj,$(src_base)/libodb-mysql-vc9.vcproj) + $(call meta-vc10proj,$(src_base)/libodb-mysql-vc10.vcxproj) + $(call meta-automake) # Clean. # @@ -69,6 +80,11 @@ $(clean): $(odb_mysql.l).o.clean \ # How to. # +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/vc9proj.make) +$(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/automake.make) + $(call include,$(bld_root)/cxx/o-l.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) diff --git a/odb/mysql/query.cxx b/odb/mysql/query.cxx index 3d7fb68..b159c2a 100644 --- a/odb/mysql/query.cxx +++ b/odb/mysql/query.cxx @@ -58,6 +58,8 @@ namespace odb binding_.insert ( binding_.end (), q.binding_.begin (), q.binding_.end ()); + + return *this; } void query:: diff --git a/odb/mysql/query.hxx b/odb/mysql/query.hxx index b09442c..5dd4339 100644 --- a/odb/mysql/query.hxx +++ b/odb/mysql/query.hxx @@ -6,7 +6,18 @@ #ifndef ODB_MYSQL_QUERY_HXX #define ODB_MYSQL_QUERY_HXX -#include <mysql/mysql.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <string> #include <vector> @@ -21,6 +32,8 @@ #include <odb/details/buffer.hxx> #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql @@ -45,7 +58,7 @@ namespace odb const T& ref; }; - struct query_param: details::shared_base + struct LIBODB_MYSQL_EXPORT query_param: details::shared_base { virtual ~query_param (); @@ -77,7 +90,7 @@ namespace odb template <typename T, image_id_type ID> struct query_column; - class query + class LIBODB_MYSQL_EXPORT query { public: query () @@ -187,7 +200,7 @@ namespace odb std::vector<MYSQL_BIND> binding_; }; - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const query& x, const query& y) { query r (x); @@ -233,7 +246,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const query& q, const std::string& s) { query r (q); @@ -241,7 +254,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const std::string& s, const query& q) { query r (s); @@ -287,7 +300,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator&& (const query& x, const query& y) { query r ("("); @@ -298,7 +311,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator|| (const query& x, const query& y) { query r ("("); @@ -309,7 +322,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator! (const query& x) { query r ("!("); @@ -1622,4 +1635,6 @@ namespace odb #include <odb/mysql/query.ixx> #include <odb/mysql/query.txx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_QUERY_HXX diff --git a/odb/mysql/result.hxx b/odb/mysql/result.hxx index f800f15..812cb68 100644 --- a/odb/mysql/result.hxx +++ b/odb/mysql/result.hxx @@ -6,6 +6,8 @@ #ifndef ODB_MYSQL_RESULT_HXX #define ODB_MYSQL_RESULT_HXX +#include <odb/pre.hxx> + #include <odb/result.hxx> #include <odb/mysql/version.hxx> @@ -52,4 +54,6 @@ namespace odb #include <odb/mysql/result.txx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_RESULT_HXX diff --git a/odb/mysql/statement.cxx b/odb/mysql/statement.cxx index 14907a9..9cacc4f 100644 --- a/odb/mysql/statement.cxx +++ b/odb/mysql/statement.cxx @@ -3,7 +3,16 @@ // copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <mysql/mysqld_error.h> // ER_DUP_ENTRY, ER_LOCK_DEADLOCK +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysqld_error.h> // ER_DUP_ENTRY, ER_LOCK_DEADLOCK +#else +# include <mysql/mysqld_error.h> +#endif #include <odb/mysql/statement.hxx> #include <odb/mysql/connection.hxx> @@ -117,10 +126,6 @@ namespace odb { return success; } - case 1: - { - throw database_exception (stmt_); - } case MYSQL_NO_DATA: { return no_data; @@ -129,6 +134,10 @@ namespace odb { return truncated; } + default: + { + throw database_exception (stmt_); + } } } @@ -296,10 +305,6 @@ namespace odb { return success; } - case 1: - { - throw database_exception (stmt_); - } case MYSQL_NO_DATA: { free_result (); @@ -309,6 +314,10 @@ namespace odb { return truncated; } + default: + { + throw database_exception (stmt_); + } } } diff --git a/odb/mysql/statement.hxx b/odb/mysql/statement.hxx index 427df3a..7ac9c61 100644 --- a/odb/mysql/statement.hxx +++ b/odb/mysql/statement.hxx @@ -6,7 +6,18 @@ #ifndef ODB_MYSQL_STATEMENT_HXX #define ODB_MYSQL_STATEMENT_HXX -#include <mysql/mysql.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <map> #include <string> @@ -20,13 +31,15 @@ #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { class connection; - class binding + class LIBODB_MYSQL_EXPORT binding { public: binding (MYSQL_BIND* b, std::size_t n) @@ -43,7 +56,7 @@ namespace odb binding& operator= (const binding&); }; - class statement: public details::shared_base + class LIBODB_MYSQL_EXPORT statement: public details::shared_base { public: virtual @@ -63,7 +76,7 @@ namespace odb MYSQL_STMT* stmt_; }; - class query_statement: public statement + class LIBODB_MYSQL_EXPORT query_statement: public statement { public: virtual @@ -106,7 +119,7 @@ namespace odb MYSQL_BIND* parameters_; }; - class persist_statement: public statement + class LIBODB_MYSQL_EXPORT persist_statement: public statement { public: virtual @@ -134,7 +147,7 @@ namespace odb std::size_t version_; }; - class find_statement: public statement + class LIBODB_MYSQL_EXPORT find_statement: public statement { public: virtual @@ -178,7 +191,7 @@ namespace odb std::size_t image_version_; }; - class store_statement: public statement + class LIBODB_MYSQL_EXPORT store_statement: public statement { public: virtual @@ -203,7 +216,7 @@ namespace odb std::size_t image_version_; }; - class erase_statement: public statement + class LIBODB_MYSQL_EXPORT erase_statement: public statement { public: virtual @@ -228,7 +241,8 @@ namespace odb // Statement cache. // - class object_statements_base: public details::shared_base + class LIBODB_MYSQL_EXPORT object_statements_base: + public details::shared_base { public: virtual @@ -364,7 +378,7 @@ namespace odb details::shared_ptr<erase_statement_type> erase_; }; - struct type_info_comparator + struct LIBODB_MYSQL_EXPORT type_info_comparator { bool operator() (const std::type_info* x, const std::type_info* y) const @@ -381,7 +395,7 @@ namespace odb } }; - class statement_cache + class LIBODB_MYSQL_EXPORT statement_cache { public: statement_cache (connection& conn) @@ -418,4 +432,6 @@ namespace odb #include <odb/mysql/statement.txx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_STATEMENT_HXX diff --git a/odb/mysql/traits.cxx b/odb/mysql/traits.cxx new file mode 100644 index 0000000..f90cc0b --- /dev/null +++ b/odb/mysql/traits.cxx @@ -0,0 +1,90 @@ +// file : odb/mysql/traits.cxx +// author : Boris Kolpackov <boris@codesynthesis.com> +// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#include <cstring> // std::memcpy, std::strlen + +#include <odb/mysql/traits.hxx> + +using namespace std; + +namespace odb +{ + namespace mysql + { + // + // value_traits<string> + // + + void value_traits<string>:: + set_image (char* s, + size_t c, + size_t& n, + bool& is_null, + const string& v) + { + is_null = false; + n = v.size (); + + if (n > c) + n = c; + + if (n != 0) + memcpy (s, v.c_str (), n); + } + + void value_traits<string>:: + set_image (details::buffer& b, + size_t& n, + bool& is_null, + const string& v) + { + is_null = false; + n = v.size (); + + if (n > b.capacity ()) + b.capacity (n); + + if (n != 0) + memcpy (b.data (), v.c_str (), n); + } + + // + // value_traits<const char*> + // + + void value_traits<const char*>:: + set_image (char* s, + size_t c, + size_t& n, + bool& is_null, + const char* v) + { + is_null = false; + n = strlen (v); + + if (n > c) + n = c; + + if (n != 0) + memcpy (s, v, n); + } + + void value_traits<const char*>:: + set_image (details::buffer& b, + size_t& n, + bool& is_null, + const char* v) + { + is_null = false; + n = strlen (v); + + if (n > b.capacity ()) + b.capacity (n); + + if (n != 0) + memcpy (b.data (), v, n); + } + } +} diff --git a/odb/mysql/traits.hxx b/odb/mysql/traits.hxx index b415bd1..bf52d78 100644 --- a/odb/mysql/traits.hxx +++ b/odb/mysql/traits.hxx @@ -6,11 +6,21 @@ #ifndef ODB_MYSQL_TRAITS_HXX #define ODB_MYSQL_TRAITS_HXX -#include <mysql/mysql.h> // MYSQL_TIME, used in custom specializations. +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> // MYSQL_TIME, used in custom specializations. +#else +# include <mysql/mysql.h> +#endif #include <string> #include <cstddef> // std::size_t -#include <cstring> // std::memcpy, std::strlen #include <odb/traits.hxx> @@ -18,6 +28,8 @@ #include <odb/details/buffer.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql @@ -175,7 +187,7 @@ namespace odb // String type. // template <> - class value_traits<std::string> + class LIBODB_MYSQL_EXPORT value_traits<std::string> { public: typedef std::string type; @@ -192,37 +204,17 @@ namespace odb } static void - set_image (char* s, + set_image (char*, std::size_t c, std::size_t& n, bool& is_null, - const std::string& v) - { - is_null = false; - n = v.size (); - - if (n > c) - n = c; - - if (n != 0) - std::memcpy (s, v.c_str (), n); - } + const std::string&); static void - set_image (details::buffer& b, + set_image (details::buffer&, std::size_t& n, bool& is_null, - const std::string& v) - { - is_null = false; - n = v.size (); - - if (n > b.capacity ()) - b.capacity (n); - - if (n != 0) - std::memcpy (b.data (), v.c_str (), n); - } + const std::string&); }; // Specialization for const char* which only supports initialization @@ -230,7 +222,7 @@ namespace odb // we can pass such values to the queries. // template <> - class value_traits<const char*> + class LIBODB_MYSQL_EXPORT value_traits<const char*> { public: typedef const char* type; @@ -238,39 +230,21 @@ namespace odb static const image_id_type image_id = id_string; static void - set_image (char* s, + set_image (char*, std::size_t c, std::size_t& n, bool& is_null, - const char* v) - { - is_null = false; - n = std::strlen (v); - - if (n > c) - n = c; - - if (n != 0) - std::memcpy (s, v, n); - } + const char*); static void - set_image (details::buffer& b, + set_image (details::buffer&, std::size_t& n, bool& is_null, - const char* v) - { - is_null = false; - n = std::strlen (v); - - if (n > b.capacity ()) - b.capacity (n); - - if (n != 0) - std::memcpy (b.data (), v, n); - } + const char*); }; } } +#include <odb/post.hxx> + #endif // ODB_MYSQL_TRAITS_HXX diff --git a/odb/mysql/transaction-impl.cxx b/odb/mysql/transaction-impl.cxx index 42bc2aa..946ea23 100644 --- a/odb/mysql/transaction-impl.cxx +++ b/odb/mysql/transaction-impl.cxx @@ -3,7 +3,16 @@ // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include <mysql/mysql.h> +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <odb/mysql/database.hxx> #include <odb/mysql/connection.hxx> diff --git a/odb/mysql/transaction-impl.hxx b/odb/mysql/transaction-impl.hxx index b9df516..8d589a8 100644 --- a/odb/mysql/transaction-impl.hxx +++ b/odb/mysql/transaction-impl.hxx @@ -6,6 +6,8 @@ #ifndef ODB_MYSQL_TRANSACTION_IMPL_HXX #define ODB_MYSQL_TRANSACTION_IMPL_HXX +#include <odb/pre.hxx> + #include <odb/transaction.hxx> #include <odb/mysql/version.hxx> @@ -13,11 +15,13 @@ #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { - class transaction_impl: public odb::transaction_impl + class LIBODB_MYSQL_EXPORT transaction_impl: public odb::transaction_impl { protected: friend class database; @@ -48,4 +52,6 @@ namespace odb #include <odb/mysql/transaction-impl.ixx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_TRANSACTION_IMPL_HXX diff --git a/odb/mysql/transaction.hxx b/odb/mysql/transaction.hxx index 3d36d1d..ce3ed5b 100644 --- a/odb/mysql/transaction.hxx +++ b/odb/mysql/transaction.hxx @@ -6,18 +6,22 @@ #ifndef ODB_MYSQL_TRANSACTION_HXX #define ODB_MYSQL_TRANSACTION_HXX +#include <odb/pre.hxx> + #include <odb/transaction.hxx> #include <odb/mysql/version.hxx> #include <odb/mysql/forward.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql { class transaction_impl; - class transaction: public odb::transaction + class LIBODB_MYSQL_EXPORT transaction: public odb::transaction { public: typedef mysql::database database_type; @@ -51,4 +55,6 @@ namespace odb #include <odb/mysql/transaction.ixx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_TRANSACTION_HXX diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx index 1abbb6c..3ea6fcd 100644 --- a/odb/mysql/version.hxx +++ b/odb/mysql/version.hxx @@ -6,7 +6,15 @@ #ifndef ODB_MYSQL_VERSION_HXX #define ODB_MYSQL_VERSION_HXX -#include <mysql/mysql_version.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# include <mysql_version.h> +#else +# include <mysql/mysql_version.h> +#endif #include <odb/version.hxx> @@ -45,4 +53,6 @@ #define LIBODB_MYSQL_VERSION 999901 #define LIBODB_MYSQL_VERSION_STR "1.0.0.a1" +#include <odb/post.hxx> + #endif // ODB_MYSQL_VERSION_HXX |