Update odbc driver to current version V.0244

1 files changed, 22 insertions, 20 deletions

diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h
index 2826589a6a..56f798f8e8 100644
--- a/src/interfaces/odbc/convert.h
+++ b/src/interfaces/odbc/convert.h
@@ -1,11 +1,11 @@
-

-/* File:            convert.h

- *

- * Description:     See "convert.c"

- *

- * Comments:        See "notice.txt" for copyright and license information.

- *

- */

+
+/* File:            convert.h
+ *
+ * Description:     See "convert.c"
+ *
+ * Comments:        See "notice.txt" for copyright and license information.
+ *
+ */
 
 #ifndef __CONVERT_H__
 #define __CONVERT_H__
@@ -13,10 +13,12 @@
 #include "psqlodbc.h"
 
 /* copy_and_convert results */
-#define COPY_OK 0
+#define COPY_OK                      0
 #define COPY_UNSUPPORTED_TYPE        1
 #define COPY_UNSUPPORTED_CONVERSION  2
 #define COPY_RESULT_TRUNCATED        3
+#define COPY_GENERAL_ERROR           4
+#define COPY_NO_DATA_FOUND           5
 
 typedef struct {
 	int m;
@@ -27,21 +29,21 @@ typedef struct {
 	int ss;
 } SIMPLE_TIME;
 
-int copy_and_convert_field_bindinfo(Int4 field_type, void *value, BindInfoClass *bic);
-int copy_and_convert_field(Int4 field_type, void *value,
-                           Int2 fCType, PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue);
+int copy_and_convert_field_bindinfo(StatementClass *stmt, Int4 field_type, void *value, int col);
+int copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 fCType, 
+						   PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue, char multiple);
 
 int copy_statement_with_parameters(StatementClass *stmt);
 char *convert_escape(char *value);
 char *convert_money(char *s);
-int monthToNumber(char *mon);
-char *convert_time(SIMPLE_TIME *st);
 char parse_datetime(char *buf, SIMPLE_TIME *st);
-char *convert_linefeeds(char *s, char *dst, size_t max);

-char *convert_returns(char *si, char *dst, int used);

-

-int convert_pgbinary_to_char(char *value, char *rgbValue, int cbValueMax);

-int convert_from_pgbinary(unsigned char *value, unsigned char *rgbValue, int cbValueMax);

-int convert_to_pgbinary(unsigned char *in, char *out, int len);

+char *convert_linefeeds(char *s, char *dst, size_t max);
+char *convert_special_chars(char *si, char *dst, int used);
+
+int convert_pgbinary_to_char(char *value, char *rgbValue, int cbValueMax);
+int convert_from_pgbinary(unsigned char *value, unsigned char *rgbValue, int cbValueMax);
+int convert_to_pgbinary(unsigned char *in, char *out, int len);
+int convert_lo(StatementClass *stmt, void *value, Int2 fCType, PTR rgbValue, 
+		   SDWORD cbValueMax, SDWORD *pcbValue, char multiple);
 
 #endif