odbc.c in ruby-odbc-0.99997

- old
+ new

@@ -6,11 +6,11 @@
  *
  * See the file "COPYING" for information on usage
  * and redistribution of this file and for a
  * DISCLAIMER OF ALL WARRANTIES.
  *
- * $Id: odbc.c,v 1.76 2015/03/25 10:55:52 chw Exp chw $
+ * $Id: odbc.c,v 1.77 2015/04/15 06:03:11 chw Exp chw $
  */
 
 #undef ODBCVER
 
 #if defined(_WIN32) || defined(__CYGWIN32__) || defined(__MINGW32__)
@@ -1238,11 +1238,11 @@
 #define SQLDRIVERCONNECT	SQLDriverConnect
 #define SQLDISCONNECT		SQLDisconnect
 #define SQLTABLES		SQLTables
 #define SQLCOLUMNS		SQLColumns
 #define SQLPRIMARYKEYS		SQLPrimaryKeys
-#define SQLFOREGINKEYS		SQLForeignKeys
+#define SQLFOREIGNKEYS		SQLForeignKeys
 #define SQLPROCEDURES		SQLProcedures
 #define SQLPROCEDURECOLUMNS	SQLProcedureColumns
 #define SQLTABLEPRIVILEGES	SQLTablePrivileges
 #define SQLSTATISTICS		SQLStatistics
 #define SQLSPECIALCOLUMNS	SQLSpecialColumns
@@ -4289,11 +4289,11 @@
 	paraminfo[i].rlen = SQL_NULL_DATA;
 	paraminfo[i].ctype = SQL_C_CHAR;
 #ifdef UNICODE
 	paraminfo[i].outtype = SQL_WCHAR;
 #else
-	paraminfo[i].outtype = SQL_WCHAR;
+	paraminfo[i].outtype = SQL_CHAR;
 #endif
 	paraminfo[i].coldef_max = 0;
 	if (!succeeded(SQL_NULL_HENV, SQL_NULL_HDBC, hstmt,
 		       SQLDescribeParam(hstmt, (SQLUSMALLINT) (i + 1),
 					&paraminfo[i].type,
@@ -4682,12 +4682,12 @@
     VALUE obj;
     int v;
 
     obj = rb_obj_alloc(Cparam);
 #ifdef UNICODE
-    v = q->paraminfo ? q->paraminfo[i].type : SQL_VARCHAR;
-#else
     v = q->paraminfo ? q->paraminfo[i].type : SQL_WVARCHAR;
+#else
+    v = q->paraminfo ? q->paraminfo[i].type : SQL_VARCHAR;
 #endif
     rb_iv_set(obj, "@type", INT2NUM(v));
     v = q->paraminfo ? q->paraminfo[i].coldef : 0;
     rb_iv_set(obj, "@precision", INT2NUM(v));
     v = q->paraminfo ? q->paraminfo[i].scale : 0;