# HG changeset patch # User nrich@ii.net # Date 1228548931 0 # Node ID b705ba343e94b8077b43846ad121d9c4a1f70b9c # Parent 21c4feaeafe739d698ced24e5616693e68258140 Misc changes. diff -r 21c4feaeafe7 -r b705ba343e94 DBI.lua --- a/DBI.lua Sat Dec 06 00:32:37 2008 +0000 +++ b/DBI.lua Sat Dec 06 07:35:31 2008 +0000 @@ -36,7 +36,7 @@ -- High level DB connection function -- This should be used rather than DBD.{Driver}.New -function Connect(driver, name, username, password, host, port) +function Connect(driver, ...) local modulefile = name_to_module[driver] if not modulefile then @@ -55,7 +55,7 @@ local connection_class = package.loaded[class_str] -- Calls DBD.{Driver}.New(...) - return connection_class.New(name, username, password, host, port) + return connection_class.New(...) end -- Help function to do prepare and execute in diff -r 21c4feaeafe7 -r b705ba343e94 Makefile --- a/Makefile Sat Dec 06 00:32:37 2008 +0000 +++ b/Makefile Sat Dec 06 07:35:31 2008 +0000 @@ -8,7 +8,7 @@ MYSQL_LDFLAGS=$(COMMON_LDFLAGS) -lmysqlclient PSQL_LDFLAGS=$(COMMON_LDFLAGS) -lpq SQLITE3_LDFLAGS=$(COMMON_LDFLAGS) -lsqlite3 -DB2_LDFLAGS=$(COMMON_LDFLAGS) -L/opt/ibm/db2exc/V9.5/lib32 -ldb2 +DB2_LDFLAGS=$(COMMON_LDFLAGS) -L/opt/ibm/db2exc/V9.5/lib64 -L/opt/ibm/db2exc/V9.5/lib32 -ldb2 ORACLE_LDFLAGS=$(COMMON_LDFLAGS) -L/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/lib/ -locixe DBDMYSQL=dbdmysql.so diff -r 21c4feaeafe7 -r b705ba343e94 dbd/oracle/statement.c --- a/dbd/oracle/statement.c Sat Dec 06 00:32:37 2008 +0000 +++ b/dbd/oracle/statement.c Sat Dec 06 07:35:31 2008 +0000 @@ -314,7 +314,7 @@ LUA_PUSH_ARRAY_STRING(d, data); } } else if (lua_push == LUA_PUSH_BOOLEAN) { - int val = 1; + int val = atoi(data); if (named_columns) { LUA_PUSH_ATTRIB_BOOL(name, val);