changeset
* Fix MySQL date/time types
Fri, 18 Sep 2009 12:40:53 +0000
- author
- nrich@ii.net
- date
- Fri, 18 Sep 2009 12:40:53 +0000
- changeset 33
- 6c64c45e7d8f
- parent 32
- 03ed0ca09837
- child 34
- c01b0c6d2f82
* Fix MySQL date/time types
* Add VC++ build projects
* Misc fixes for Windows DLL building
--- a/Makefile Tue Sep 01 13:15:02 2009 +0000 +++ b/Makefile Fri Sep 18 12:40:53 2009 +0000 @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=-g -pedantic -O2 -Wall -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I . +CFLAGS=-g -pedantic -Wall -O2 -shared -fpic -I /usr/include/lua5.1 -I /usr/include/mysql -I /usr/include/postgresql/ -I /opt/ibm/db2exc/V9.5/include/ -I /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms/public/ -I . AR=ar rcu RANLIB=ranlib RM=rm -f
--- a/dbd/common.h Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/common.h Fri Sep 18 12:40:53 2009 +0000 @@ -10,12 +10,22 @@ #include <compat-5.1.h> #endif +#ifdef _WIN32 + #define LUA_EXPORT __declspec(dllexport) +#else + #define LUA_EXPORT +#endif + +#ifdef _MSC_VER /* all MS compilers define this (version) */ + #define snprintf _snprintf +#endif + /* * * Table construction helper functions * * LUA_PUSH_ATTRIB_* creates string indexed (hashmap) - * LUA_PUSH_ATTRIB_* creates integer indexed (array) + * LUA_PUSH_ARRAY_* creates integer indexed (array) * */
--- a/dbd/db2/dbd_db2.h Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/db2/dbd_db2.h Fri Sep 18 12:40:53 2009 +0000 @@ -1,3 +1,5 @@ +#undef UNICODE + #include <sqlcli1.h> #include <sqlutil.h> #include <sqlenv.h>
--- a/dbd/db2/main.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/db2/main.c Fri Sep 18 12:40:53 2009 +0000 @@ -6,7 +6,7 @@ /* * library entry point */ -int luaopen_dbddb2(lua_State *L) { +LUA_EXPORT int luaopen_dbddb2(lua_State *L) { dbd_db2_connection(L); dbd_db2_statement(L);
--- a/dbd/db2/statement.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/db2/statement.c Fri Sep 18 12:40:53 2009 +0000 @@ -83,11 +83,6 @@ int i; int d; - SQLCHAR message[SQL_MAX_MESSAGE_LENGTH + 1]; - SQLCHAR sqlstate[SQL_SQLSTATE_SIZE + 1]; - SQLINTEGER sqlcode; - SQLSMALLINT length; - SQLRETURN rc = SQL_SUCCESS; if (!statement->resultset || !statement->bind) {
--- a/dbd/mysql/dbd_mysql.h Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/mysql/dbd_mysql.h Fri Sep 18 12:40:53 2009 +0000 @@ -1,3 +1,8 @@ +#ifdef _MSC_VER /* all MS compilers define this (version) */ + #include <windows.h> +#endif + + #include <mysql.h> #include <dbd/common.h>
--- a/dbd/mysql/main.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/mysql/main.c Fri Sep 18 12:40:53 2009 +0000 @@ -6,7 +6,7 @@ /* * libabry entry point */ -int luaopen_dbdmysql(lua_State *L) { +LUA_EXPORT int luaopen_dbdmysql(lua_State *L) { dbd_mysql_connection(L); dbd_mysql_statement(L);
--- a/dbd/mysql/statement.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/mysql/statement.c Fri Sep 18 12:40:53 2009 +0000 @@ -9,6 +9,7 @@ break; case MYSQL_TYPE_TINY: + case MYSQL_TYPE_YEAR: case MYSQL_TYPE_SHORT: case MYSQL_TYPE_LONG: lua_type = LUA_PUSH_INTEGER; @@ -26,6 +27,46 @@ return lua_type; } +static size_t mysql_buffer_size(MYSQL_FIELD *field) { + unsigned int mysql_type = field->type; + size_t size = 0; + + switch (mysql_type) { + case MYSQL_TYPE_TINY: + size = 4; + break; + case MYSQL_TYPE_YEAR: + case MYSQL_TYPE_SHORT: + size = 4; + break; + case MYSQL_TYPE_INT24: + size = 4; + break; + case MYSQL_TYPE_LONG: + size = 4; + break; + case MYSQL_TYPE_LONGLONG: + size = 8; + break; + case MYSQL_TYPE_FLOAT: + size = 4; + break; + case MYSQL_TYPE_DOUBLE: + size = 8; + break; + case MYSQL_TYPE_TIME: + case MYSQL_TYPE_DATE: + case MYSQL_TYPE_DATETIME: + case MYSQL_TYPE_TIMESTAMP: + size = sizeof(MYSQL_TIME); + break; + default: + size = field->length; + } + + return size; +} + /* * num_affected_rows = statement:affected() */ @@ -263,8 +304,7 @@ fields = mysql_fetch_fields(statement->metadata); for (i = 0; i < column_count; i++) { - unsigned int length = fields[i].length; - + unsigned int length = mysql_buffer_size(&fields[i]); char *buffer = (char *)malloc(length); memset(buffer, 0, length); @@ -305,10 +345,47 @@ LUA_PUSH_ARRAY_FLOAT(d, *(double *)(bind[i].buffer)); } } else if (lua_push == LUA_PUSH_STRING) { - if (named_columns) { - LUA_PUSH_ATTRIB_STRING(name, bind[i].buffer); + + if (fields[i].type == MYSQL_TYPE_TIMESTAMP || fields[i].type == MYSQL_TYPE_DATETIME) { + char str[20]; + struct st_mysql_time *t = bind[i].buffer; + + snprintf(str, 20, "%d-%02d-%02d %02d:%02d:%02d", t->year, t->month, t->day, t->hour, t->minute, t->second); + + if (named_columns) { + LUA_PUSH_ATTRIB_STRING(name, str); + } else { + LUA_PUSH_ARRAY_STRING(d, str); + } + } else if (fields[i].type == MYSQL_TYPE_TIME) { + char str[9]; + struct st_mysql_time *t = bind[i].buffer; + + snprintf(str, 9, "%02d:%02d:%02d", t->hour, t->minute, t->second); + + if (named_columns) { + LUA_PUSH_ATTRIB_STRING(name, str); + } else { + LUA_PUSH_ARRAY_STRING(d, str); + } + } else if (fields[i].type == MYSQL_TYPE_DATE) { + char str[20]; + struct st_mysql_time *t = bind[i].buffer; + + snprintf(str, 11, "%d-%02d-%02d", t->year, t->month, t->day); + + if (named_columns) { + LUA_PUSH_ATTRIB_STRING(name, str); + } else { + LUA_PUSH_ARRAY_STRING(d, str); + } + } else { - LUA_PUSH_ARRAY_STRING(d, bind[i].buffer); + if (named_columns) { + LUA_PUSH_ATTRIB_STRING(name, bind[i].buffer); + } else { + LUA_PUSH_ARRAY_STRING(d, bind[i].buffer); + } } } else if (lua_push == LUA_PUSH_BOOLEAN) { if (named_columns) { @@ -437,6 +514,10 @@ statement->stmt = stmt; statement->metadata = NULL; + /* + mysql_stmt_attr_set(stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (my_bool*)0); + */ + luaL_getmetatable(L, DBD_MYSQL_STATEMENT); lua_setmetatable(L, -2);
--- a/dbd/oracle/main.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/oracle/main.c Fri Sep 18 12:40:53 2009 +0000 @@ -6,7 +6,7 @@ /* * library entry point */ -int luaopen_dbdoracle(lua_State *L) { +LUA_EXPORT int luaopen_dbdoracle(lua_State *L) { dbd_oracle_connection(L); dbd_oracle_statement(L);
--- a/dbd/postgresql/dbd_postgresql.h Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/postgresql/dbd_postgresql.h Fri Sep 18 12:40:53 2009 +0000 @@ -1,6 +1,5 @@ #include <libpq-fe.h> -#include <postgres.h> -#include <catalog/pg_type.h> +#include <postgres_fe.h> #include <dbd/common.h> /*
--- a/dbd/postgresql/main.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/postgresql/main.c Fri Sep 18 12:40:53 2009 +0000 @@ -6,7 +6,7 @@ /* * library entry point */ -int luaopen_dbdpostgresql(lua_State *L) { +LUA_EXPORT int luaopen_dbdpostgresql(lua_State *L) { dbd_postgresql_connection(L); dbd_postgresql_statement(L);
--- a/dbd/postgresql/statement.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/postgresql/statement.c Fri Sep 18 12:40:53 2009 +0000 @@ -1,5 +1,12 @@ #include "dbd_postgresql.h" +#define BOOLOID 16 +#define INT2OID 21 +#define INT4OID 23 +#define INT8OID 20 +#define FLOAT4OID 700 +#define FLOAT8OID 701 + static lua_push_type_t postgresql_to_lua_push(unsigned int postgresql_type) { lua_push_type_t lua_type; @@ -28,11 +35,11 @@ static int deallocate(statement_t *statement) { char command[IDLEN+11]; - - snprintf(command, IDLEN+11, "DEALLOCATE %s", statement->name); + PGresult *result; + ExecStatusType status; - PGresult *result = PQexec(statement->postgresql, command); - ExecStatusType status; + snprintf(command, IDLEN+11, "DEALLOCATE %s", statement->name); + result = PQexec(statement->postgresql, command); if (!result) return 1;
--- a/dbd/sqlite3/main.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/sqlite3/main.c Fri Sep 18 12:40:53 2009 +0000 @@ -6,7 +6,7 @@ /* * library entry point */ -int luaopen_dbdsqlite3(lua_State *L) { +LUA_EXPORT int luaopen_dbdsqlite3(lua_State *L) { dbd_sqlite3_connection(L); dbd_sqlite3_statement(L);
--- a/dbd/sqlite3/statement.c Tue Sep 01 13:15:02 2009 +0000 +++ b/dbd/sqlite3/statement.c Fri Sep 18 12:40:53 2009 +0000 @@ -123,7 +123,7 @@ /* * reset the handle before binding params - * this wil be a NOP if the handle has not + * this will be a NOP if the handle has not * been executed */ if (sqlite3_reset(statement->stmt) != SQLITE_OK) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/dbddb2/dbddb2.vcproj Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="dbddb2" + ProjectGUID="{9F935BC6-6766-4D60-8C48-9EF607883B7D}" + RootNamespace="dbddb2" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""C:\Program Files\IBM\SQLLIB\include";"C:\Program Files\Lua\5.1\include";../../" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBDDB2_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua51.lib db2api.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Program Files\IBM\SQLLIB\lib";"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + 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|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + 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" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""C:\Program Files\IBM\SQLLIB\include";"C:\Program Files\Lua\5.1\include";../../" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBDDB2_EXPORTS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua51.lib db2api.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\IBM\SQLLIB\lib";"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <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="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\dbd\common.c" + > + </File> + <File + RelativePath="..\..\dbd\db2\connection.c" + > + </File> + <File + RelativePath="..\..\dbd\db2\main.c" + > + </File> + <File + RelativePath="..\..\dbd\db2\statement.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\dbd\common.h" + > + </File> + <File + RelativePath="..\..\dbd\db2\dbd_db2.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/dbdmysql/dbdmysql.vcproj Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="dbdmysql" + ProjectGUID="{C3A5B30E-0471-459E-AFF3-FF54F9F31599}" + RootNamespace="dbdmysql" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="../../;"C:\Program Files\MySQL\MySQL Server 5.1\include";"C:\Program Files\Lua\5.1\include"" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBDMYSQL_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua5.1.lib libmysql.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Program Files\MySQL\MySQL Server 5.1\lib\opt";"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + 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|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + 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" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="../../;"C:\Program Files\MySQL\MySQL Server 5.1\include";"C:\Program Files\Lua\5.1\include"" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBDMYSQL_EXPORTS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua5.1.lib libmysql.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\MySQL\MySQL Server 5.1\lib\opt";"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <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="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\dbd\common.c" + > + </File> + <File + RelativePath="..\..\dbd\mysql\connection.c" + > + </File> + <File + RelativePath="..\..\dbd\mysql\main.c" + > + </File> + <File + RelativePath="..\..\dbd\mysql\statement.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\dbd\common.h" + > + </File> + <File + RelativePath="..\..\dbd\mysql\dbd_mysql.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/dbdoracle/dbdoracle.vcproj Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="dbdoracle" + ProjectGUID="{BD3DE628-23AE-416E-A983-8A0E8D4F0E15}" + RootNamespace="dbdoracle" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""C:\Program Files\Lua\5.1\include";../../;C:\oracle\include" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBDORACLE_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua51.lib oci.lib" + LinkIncremental="2" + AdditionalLibraryDirectories="C:\oracle\lib\msvc;C:\oracle\lib;"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + 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|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + 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" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""C:\Program Files\Lua\5.1\include";../../;C:\oracle\include" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBDORACLE_EXPORTS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="lua51.lib oci.lib" + LinkIncremental="1" + AdditionalLibraryDirectories="C:\oracle\lib\msvc;C:\oracle\lib;"C:\Program Files\Lua\5.1\lib"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <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="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\dbd\common.c" + > + </File> + <File + RelativePath="..\..\dbd\oracle\connection.c" + > + </File> + <File + RelativePath="..\..\dbd\oracle\main.c" + > + </File> + <File + RelativePath="..\..\dbd\oracle\statement.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\dbd\common.h" + > + </File> + <File + RelativePath="..\..\dbd\oracle\dbd_oracle.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/dbdpostgresql/dbdpostgresql.vcproj Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,219 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="dbdpostgresql" + ProjectGUID="{7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}" + RootNamespace="dbdpostgresql" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.3\include\internal";"C:\Program Files\PostgreSQL\8.3\include";"C:\Program Files\Lua\5.1\include";../../" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DBDPOSTGRESQL_EXPORTS;_USE_32BIT_TIME_T;HAVE_INET_ATON" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libpq.lib lua51.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Program Files\Lua\5.1\lib";"C:\Program Files\PostgreSQL\8.3\lib"" + GenerateDebugInformation="true" + SubSystem="2" + 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|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + 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" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories=""C:\Program Files\PostgreSQL\8.3\include\internal";"C:\Program Files\PostgreSQL\8.3\include";"C:\Program Files\Lua\5.1\include";../../" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DBDPOSTGRESQL_EXPORTS;_USE_32BIT_TIME_T;HAVE_INET_ATON" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libpq.lib lua51.lib" + LinkIncremental="1" + AdditionalLibraryDirectories=""C:\Program Files\Lua\5.1\lib";"C:\Program Files\PostgreSQL\8.3\lib"" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <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="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\dbd\common.c" + > + </File> + <File + RelativePath="..\..\dbd\postgresql\connection.c" + > + </File> + <File + RelativePath="..\..\dbd\postgresql\main.c" + > + </File> + <File + RelativePath="..\..\dbd\postgresql\statement.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\dbd\common.h" + > + </File> + <File + RelativePath="..\..\dbd\postgresql\dbd_postgresql.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/dbdsqlite3/dbdsqlite3.vcproj Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,216 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="dbdsqlite3" + ProjectGUID="{7B532158-C67A-490D-80EF-FF5552EE38B1}" + RootNamespace="luadbi" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories=""C:\Program Files\sqlite3\include";"C:\Program Files\Lua\5.1\include";../../" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUADBI_EXPORTS" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="sqlite3.lib lua51.lib" + LinkIncremental="2" + AdditionalLibraryDirectories=""C:\Program Files\Lua\5.1\lib";"C:\Program Files\sqlite3\lib"" + GenerateDebugInformation="true" + SubSystem="2" + 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|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + 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" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LUADBI_EXPORTS" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <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="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath="..\..\dbd\common.c" + > + </File> + <File + RelativePath="..\..\dbd\sqlite3\connection.c" + > + </File> + <File + RelativePath="..\..\dbd\sqlite3\main.c" + > + </File> + <File + RelativePath="..\..\dbd\sqlite3\statement.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath="..\..\dbd\common.h" + > + </File> + <File + RelativePath="..\..\dbd\sqlite3\dbd_sqlite3.h" + > + </File> + </Filter> + <Filter + Name="Resource Files" + Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vc++/luadbi.sln Fri Sep 18 12:40:53 2009 +0000 @@ -0,0 +1,44 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbdpostgresql", "dbdpostgresql\dbdpostgresql.vcproj", "{7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbdmysql", "dbdmysql\dbdmysql.vcproj", "{C3A5B30E-0471-459E-AFF3-FF54F9F31599}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbdoracle", "dbdoracle\dbdoracle.vcproj", "{BD3DE628-23AE-416E-A983-8A0E8D4F0E15}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbddb2", "dbddb2\dbddb2.vcproj", "{9F935BC6-6766-4D60-8C48-9EF607883B7D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbdsqlite3", "dbdsqlite3\dbdsqlite3.vcproj", "{7B532158-C67A-490D-80EF-FF5552EE38B1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}.Debug|Win32.ActiveCfg = Debug|Win32 + {7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}.Debug|Win32.Build.0 = Debug|Win32 + {7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}.Release|Win32.ActiveCfg = Release|Win32 + {7DC4FC36-C3DC-475E-A6DA-CEB4BA237843}.Release|Win32.Build.0 = Release|Win32 + {C3A5B30E-0471-459E-AFF3-FF54F9F31599}.Debug|Win32.ActiveCfg = Debug|Win32 + {C3A5B30E-0471-459E-AFF3-FF54F9F31599}.Debug|Win32.Build.0 = Debug|Win32 + {C3A5B30E-0471-459E-AFF3-FF54F9F31599}.Release|Win32.ActiveCfg = Release|Win32 + {C3A5B30E-0471-459E-AFF3-FF54F9F31599}.Release|Win32.Build.0 = Release|Win32 + {BD3DE628-23AE-416E-A983-8A0E8D4F0E15}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD3DE628-23AE-416E-A983-8A0E8D4F0E15}.Debug|Win32.Build.0 = Debug|Win32 + {BD3DE628-23AE-416E-A983-8A0E8D4F0E15}.Release|Win32.ActiveCfg = Release|Win32 + {BD3DE628-23AE-416E-A983-8A0E8D4F0E15}.Release|Win32.Build.0 = Release|Win32 + {9F935BC6-6766-4D60-8C48-9EF607883B7D}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F935BC6-6766-4D60-8C48-9EF607883B7D}.Debug|Win32.Build.0 = Debug|Win32 + {9F935BC6-6766-4D60-8C48-9EF607883B7D}.Release|Win32.ActiveCfg = Release|Win32 + {9F935BC6-6766-4D60-8C48-9EF607883B7D}.Release|Win32.Build.0 = Release|Win32 + {7B532158-C67A-490D-80EF-FF5552EE38B1}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B532158-C67A-490D-80EF-FF5552EE38B1}.Debug|Win32.Build.0 = Debug|Win32 + {7B532158-C67A-490D-80EF-FF5552EE38B1}.Release|Win32.ActiveCfg = Release|Win32 + {7B532158-C67A-490D-80EF-FF5552EE38B1}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal
