cvs: php-src /ext/odbc config.m4 php_odbc.c php_odbc_includes.h
| From: | Wez Furlong | Date: | Thu, 13 Jan 2005 02:06:39 +0000 |
| Subject: | cvs: php-src /ext/odbc config.m4 php_odbc.c php_odbc_includes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29884@lists.php.net to get a copy of this message | ||
wez Wed Jan 12 21:06:39 2005 EDT
Modified files:
/php-src/ext/odbc config.m4 php_odbc.c php_odbc_includes.h
Log:
Add support for ODBCRouter
http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.67&r2=1.68&ty=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.67 php-src/ext/odbc/config.m4:1.68
--- php-src/ext/odbc/config.m4:1.67 Thu Dec 30 02:08:37 2004
+++ php-src/ext/odbc/config.m4 Wed Jan 12 21:06:39 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.67 2004/12/30 07:08:37 sniper Exp $
+dnl $Id: config.m4,v 1.68 2005/01/13 02:06:39 wez Exp $
dnl
dnl
@@ -210,6 +210,33 @@
fi
if test -z "$ODBC_TYPE"; then
+AC_MSG_CHECKING(for ODBCRouter.com support)
+AC_ARG_WITH(ODBCRouter,
+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support. DIR is ODBCRouter base
+ install directory, defaults to /usr.],
+[
+ PHP_WITH_SHARED
+ if test "$withval" = "yes"; then
+ withval=/usr
+ fi
+ if test "$withval" != "no"; then
+ ODBC_INCDIR=$withval/include
+ ODBC_LIBDIR=$withval/lib
+ ODBC_LFLAGS=-L$ODBC_LIBDIR
+ ODBC_INCLUDE=-I$ODBC_INCDIR
+ ODBC_LIBS=-lodbcsdk
+ ODBC_TYPE=ODBCRouter
+ AC_DEFINE(HAVE_ODBC_ROUTER,1,[ ])
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+],[
+ AC_MSG_RESULT(no)
+])
+fi
+
+if test -z "$ODBC_TYPE"; then
AC_MSG_CHECKING(for Empress support)
AC_ARG_WITH(empress,
[ --with-empress[=DIR] Include Empress support. DIR is the Empress base
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.181&r2=1.182&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.181 php-src/ext/odbc/php_odbc.c:1.182
--- php-src/ext/odbc/php_odbc.c:1.181 Fri Aug 13 15:33:24 2004
+++ php-src/ext/odbc/php_odbc.c Wed Jan 12 21:06:39 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.181 2004/08/13 19:33:24 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.182 2005/01/13 02:06:39 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2073,6 +2073,47 @@
SQLSetConnectOption((*conn)->hdbc, SQL_TRANSLATE_OPTION,
SQL_SOLID_XLATOPT_NOCNV);
#endif
+#ifdef HAVE_ODBC_ROUTER
+ {
+#define CONNSTRSIZE 2048
+ char *lpszConnStr = emalloc(CONNSTRSIZE);
+ if (lpszConnStr && db) {
+ short cbszConnStr;
+ if (strstr(db, ";")) {
+ /* the caller has apparently passed a connection-string */
+ if (strstr(db, "uid") || strstr(db, "UID")) {
+ uid = NULL;
+ }
+ if (strstr(db, "pwd") || strstr(db, "PWD")) {
+ pwd = NULL;
+ }
+ strncpy( lpszConnStr, db, CONNSTRSIZE);
+ }
+ else {
+ strcpy(lpszConnStr, "DSN=");
+ strcat(lpszConnStr, db);
+ }
+ if (uid) {
+ if (uid[0]) {
+ strcat(lpszConnStr, ";UID=");
+ strcat(lpszConnStr, uid);
+ strcat(lpszConnStr, ";");
+ }
+ if (pwd) {
+ if (pwd[0]) {
+ strcat(lpszConnStr, "PWD=");
+ strcat(lpszConnStr, pwd);
+ strcat(lpszConnStr, ";");
+ }
+ }
+ }
+ rc = SQLDriverConnect((*conn)->hdbc, NULL, lpszConnStr, SQL_NTS,
+ lpszConnStr, CONNSTRSIZE, &cbszConnStr,
+ SQL_DRIVER_NOPROMPT);
+ efree(lpszConnStr);
+ }
+ }
+#else
#ifdef HAVE_OPENLINK
{
char dsnbuf[1024];
@@ -2131,6 +2172,7 @@
rc = SQLConnect((*conn)->hdbc, db, SQL_NTS, uid, SQL_NTS, pwd, SQL_NTS);
#endif
#endif
+#endif
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) {
odbc_sql_error(*conn, SQL_NULL_HSTMT, "SQLConnect");
SQLFreeConnect((*conn)->hdbc);
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc_includes.h?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/odbc/php_odbc_includes.h
diff -u php-src/ext/odbc/php_odbc_includes.h:1.9 php-src/ext/odbc/php_odbc_includes.h:1.10
--- php-src/ext/odbc/php_odbc_includes.h:1.9 Thu Jan 8 12:32:34 2004
+++ php-src/ext/odbc/php_odbc_includes.h Wed Jan 12 21:06:39 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc_includes.h,v 1.9 2004/01/08 17:32:34 sniper Exp $ */
+/* $Id: php_odbc_includes.h,v 1.10 2005/01/13 02:06:39 wez Exp $ */
#ifndef PHP_ODBC_INCLUDES_H
#define PHP_ODBC_INCLUDES_H
@@ -126,6 +126,20 @@
#include <sqlext.h>
#define HAVE_SQL_EXTENDED_FETCH 1
+#elif defined(HAVE_ODBC_ROUTER) /* ODBCRouter.com */
+
+#ifdef CHAR
+#undef CHAR
+#endif
+
+#ifdef SQLCHAR
+#undef SQLCHAR
+#endif
+
+#define ODBC_TYPE "ODBCRouter"
+#include <odbcsdk.h>
+#undef HAVE_SQL_EXTENDED_FETCH
+
#elif defined(HAVE_OPENLINK) /* OpenLink ODBC drivers */
#define ODBC_TYPE "Openlink"