Update odbc driver to current version V.0244

Author: Byron Nikolaidis

src/interfaces/odbc/bind.c

@@ -1,26 +1,26 @@
-
-/* Module:          bind.c
- *
- * Description:     This module contains routines related to binding 
- *                  columns and parameters.
- *
- * Classes:         BindInfoClass, ParameterInfoClass
- *
- * API functions:   SQLBindParameter, SQLBindCol, SQLDescribeParam, SQLNumParams,
- *                  SQLParamOptions(NI)
- *
- * Comments:        See "notice.txt" for copyright and license information.
- *
- */
+
+/* Module:          bind.c
+ *
+ * Description:     This module contains routines related to binding 
+ *                  columns and parameters.
+ *
+ * Classes:         BindInfoClass, ParameterInfoClass
+ *
+ * API functions:   SQLBindParameter, SQLBindCol, SQLDescribeParam, SQLNumParams,
+ *                  SQLParamOptions(NI)
+ *
+ * Comments:        See "notice.txt" for copyright and license information.
+ *
+ */
 #include "bind.h"
 #include "environ.h"
 #include "statement.h"
 #include "qresult.h"
 #include "pgtypes.h"
 #include <stdlib.h>
 #include <malloc.h>
-#include <sql.h>
-#include <sqlext.h>
+#include <sql.h>
+#include <sqlext.h>
 
 //      Bind parameters on a statement handle
 
@@ -77,10 +77,11 @@ StatementClass *stmt = (StatementClass *) hstmt;
 			stmt->parameters[i].CType = 0;
 			stmt->parameters[i].SQLType = 0;
 			stmt->parameters[i].precision = 0;
-			stmt->parameters[i].scale = 0;
-			stmt->parameters[i].data_at_exec = FALSE;
-			stmt->parameters[i].EXEC_used = NULL;
-			stmt->parameters[i].EXEC_buffer = NULL;
+			stmt->parameters[i].scale = 0;
+			stmt->parameters[i].data_at_exec = FALSE;
+			stmt->parameters[i].lobj_oid = 0;
+			stmt->parameters[i].EXEC_used = NULL;
+			stmt->parameters[i].EXEC_buffer = NULL;
 		}
 	}
 
@@ -94,26 +95,28 @@ StatementClass *stmt = (StatementClass *) hstmt;
 	stmt->parameters[ipar].CType = fCType;
 	stmt->parameters[ipar].SQLType = fSqlType;
 	stmt->parameters[ipar].precision = cbColDef;
-	stmt->parameters[ipar].scale = ibScale;
-
-	/*	If rebinding a parameter that had data-at-exec stuff in it,
-		then free that stuff
-	*/
-	if (stmt->parameters[ipar].EXEC_used) {
-		free(stmt->parameters[ipar].EXEC_used);
-		stmt->parameters[ipar].EXEC_used = NULL;
-	}
-
-	if (stmt->parameters[ipar].EXEC_buffer) {
-		free(stmt->parameters[ipar].EXEC_buffer);
-		stmt->parameters[ipar].EXEC_buffer = NULL;
-	}
-
-	if (pcbValue && *pcbValue <= SQL_LEN_DATA_AT_EXEC_OFFSET)
-		stmt->parameters[ipar].data_at_exec = TRUE;
-	else
-		stmt->parameters[ipar].data_at_exec = FALSE;
-
+	stmt->parameters[ipar].scale = ibScale;
+
+	/*	If rebinding a parameter that had data-at-exec stuff in it,
+		then free that stuff
+	*/
+	if (stmt->parameters[ipar].EXEC_used) {
+		free(stmt->parameters[ipar].EXEC_used);
+		stmt->parameters[ipar].EXEC_used = NULL;
+	}
+
+	if (stmt->parameters[ipar].EXEC_buffer) {
+		free(stmt->parameters[ipar].EXEC_buffer);
+		stmt->parameters[ipar].EXEC_buffer = NULL;
+	}
+
+	if (pcbValue && *pcbValue <= SQL_LEN_DATA_AT_EXEC_OFFSET)
+		stmt->parameters[ipar].data_at_exec = TRUE;
+	else
+		stmt->parameters[ipar].data_at_exec = FALSE;
+
+	mylog("SQLBindParamater: ipar = %d, *pcbValue = %d, data_at_exec = %d\n", 
+		ipar, pcbValue ? *pcbValue: -777, stmt->parameters[ipar].data_at_exec);
 
 	return SQL_SUCCESS;
 }
@@ -188,6 +191,8 @@ mylog("**** SQLBindCol: stmt = %u, icol = %d\n", stmt, icol);
 		stmt->bindings[icol].buffer     = rgbValue;
 		stmt->bindings[icol].used       = pcbValue;
 		stmt->bindings[icol].returntype = fCType;
+
+		mylog("       bound buffer[%d] = %u\n", icol, stmt->bindings[icol].buffer);
 	}
 
 	return SQL_SUCCESS;
@@ -228,7 +233,7 @@ StatementClass *stmt = (StatementClass *) hstmt;
 		*pibScale = stmt->parameters[ipar].scale;
 
 	if(pfNullable)
-		*pfNullable = pgtype_nullable(stmt->parameters[ipar].paramType);
+		*pfNullable = pgtype_nullable(stmt, stmt->parameters[ipar].paramType);
 
 	return SQL_SUCCESS;
 }
@@ -247,37 +252,25 @@ RETCODE SQL_API SQLParamOptions(
 
 //      -       -       -       -       -       -       -       -       -
 
-//      Returns the number of parameter markers.
+//      Returns the number of parameters in an SQL statement
 
 RETCODE SQL_API SQLNumParams(
         HSTMT      hstmt,
         SWORD  FAR *pcpar)
 {
 StatementClass *stmt = (StatementClass *) hstmt;
-unsigned int i;
 
-	// I guess this is the number of actual parameter markers
-	// in the statement, not the number of parameters that are bound.
-	// why does this have to be driver-specific?
 
 	if(!stmt)
 		return SQL_INVALID_HANDLE;
 
-	if(!stmt->statement) {
-		// no statement has been allocated
-		*pcpar = 0;
-		stmt->errormsg = "SQLNumParams called with no statement ready.";
-		stmt->errornumber = STMT_SEQUENCE_ERROR;
-		return SQL_ERROR;
-	} else {
-		*pcpar = 0;
-		for(i=0; i < strlen(stmt->statement); i++) {
-			if(stmt->statement[i] == '?')
-				(*pcpar)++;
-		}
+	//	If the statement does not have parameters, it should just return 0.
 
-		return SQL_SUCCESS;
+	if (pcpar) {
+		*pcpar = stmt->parameters_allocated;
 	}
+
+	return SQL_SUCCESS;
 }
 
 /********************************************************************
@@ -309,7 +302,7 @@ extend_bindings(StatementClass *stmt, int num_columns)
 BindInfoClass *new_bindings;
 int i;
 
-	mylog("in extend_bindings\n");
+mylog("in extend_bindings: stmt=%u, bindings_allocated=%d, num_columns=%d\n", stmt, stmt->bindings_allocated, num_columns);
 
 	/* if we have too few, allocate room for more, and copy the old */
 	/* entries into the new structure */
@@ -325,6 +318,7 @@ int i;
 		}
 
 		stmt->bindings = new_bindings;		// null indicates error
+		stmt->bindings_allocated = num_columns;
 
     } else {
 	/* if we have too many, make sure the extra ones are emptied out */

src/interfaces/odbc/bind.h

@@ -1,20 +1,20 @@
-
-/* File:            bind.h
- *
- * Description:     See "bind.c"
- *
- * Comments:        See "notice.txt" for copyright and license information.
- *
- */
+
+/* File:            bind.h
+ *
+ * Description:     See "bind.c"
+ *
+ * Comments:        See "notice.txt" for copyright and license information.
+ *
+ */
 
 #ifndef __BIND_H__
 #define __BIND_H__
 
 #include "psqlodbc.h"
 
-/*
- * BindInfoClass -- stores information about a bound column
- */
+/*
+ * BindInfoClass -- stores information about a bound column
+ */
 struct BindInfoClass_ {
 	Int4 buflen;		/* size of buffer */
 	char *buffer;		/* pointer to the buffer */
@@ -33,10 +33,11 @@ struct ParameterInfoClass_ {
 	Int2 CType;
 	Int2 SQLType;
 	UInt4 precision;
-	Int2 scale;
-	Int4 *EXEC_used;
-	char *EXEC_buffer;
-	char data_at_exec;
+	Int2 scale;
+	Oid  lobj_oid;
+	Int4 *EXEC_used;		/* amount of data OR the oid of the large object */
+	char *EXEC_buffer;		/* the data or the FD of the large object */
+	char data_at_exec;
 };
 
 BindInfoClass *create_empty_bindings(int num_columns);

src/interfaces/odbc/columninfo.c

@@ -1,18 +1,18 @@
-
-/* Module:          columninfo.c
- *
- * Description:     This module contains routines related to 
- *                  reading and storing the field information from a query.
- *
- * Classes:         ColumnInfoClass (Functions prefix: "CI_")
- *
- * API functions:   none
- *
- * Comments:        See "notice.txt" for copyright and license information.
- *
- */
-
-#include "columninfo.h"
+
+/* Module:          columninfo.c
+ *
+ * Description:     This module contains routines related to 
+ *                  reading and storing the field information from a query.
+ *
+ * Classes:         ColumnInfoClass (Functions prefix: "CI_")
+ *
+ * API functions:   none
+ *
+ * Comments:        See "notice.txt" for copyright and license information.
+ *
+ */
+
+#include "columninfo.h"
 #include "socket.h"
 #include <stdlib.h>
 #include <malloc.h>
@@ -29,6 +29,7 @@ ColumnInfoClass *rv;
 		rv->name = NULL;
 		rv->adtid = NULL;
 		rv->adtsize = NULL;
+		rv->display_size = NULL;
 	}
 
 	return rv;
@@ -54,7 +55,7 @@ int new_num_fields;
 Oid new_adtid;
 Int2 new_adtsize;
 char new_field_name[MAX_MESSAGE_LEN+1];
-
+
 
 	/* at first read in the number of fields that are in the query */
 	new_num_fields = (Int2) SOCK_get_int(sock, sizeof(Int2));
@@ -93,11 +94,12 @@ int num_fields = self->num_fields;
 		if( self->name[lf])
 			free (self->name[lf]);
 	}
-
+
 	/*	Safe to call even if null */
 	free(self->name);
 	free(self->adtid);
 	free(self->adtsize);
+	free(self->display_size);
 }
 
 void
@@ -110,6 +112,7 @@ CI_set_num_fields(ColumnInfoClass *self, int new_num_fields)
 	self->name = (char **) malloc (sizeof(char *) * self->num_fields);
 	self->adtid = (Oid *) malloc (sizeof(Oid) * self->num_fields);
 	self->adtsize = (Int2 *) malloc (sizeof(Int2) * self->num_fields);
+	self->display_size = (Int2 *) malloc(sizeof(Int2) * self->num_fields);
 }
 
 void
@@ -126,34 +129,7 @@ CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
 	self->name[field_num] = strdup(new_name);  
 	self->adtid[field_num] = new_adtid;
 	self->adtsize[field_num] = new_adtsize;
-}
 
-char *
-CI_get_fieldname(ColumnInfoClass *self, Int2 which)
-{
-char *rv = NULL;
-    
-	if ( ! self->name)
-		return NULL;
-
-	if ((which >= 0) && (which < self->num_fields))
-		rv = self->name[which];
-
-	return rv;
-}
-
-
-Int2
-CI_get_fieldsize(ColumnInfoClass *self, Int2 which)
-{
-Int2 rv = 0;
-
-	if ( ! self->adtsize)
-		return 0;
-
-	if ((which >= 0) && (which < self->num_fields))
-		rv = self->adtsize[which];
-
-	return rv;
+	self->display_size[field_num] = 0;
 }
 

src/interfaces/odbc/columninfo.h

@@ -1,11 +1,11 @@
-
-/* File:            columninfo.h
- *
- * Description:     See "columninfo.c"
- *
- * Comments:        See "notice.txt" for copyright and license information.
- *
- */
+
+/* File:            columninfo.h
+ *
+ * Description:     See "columninfo.c"
+ *
+ * Comments:        See "notice.txt" for copyright and license information.
+ *
+ */
 
 #ifndef __COLUMNINFO_H__
 #define __COLUMNINFO_H__
@@ -17,14 +17,18 @@ struct ColumnInfoClass_ {
 	char	**name;				/* list of type names */
 	Oid		*adtid;				/* list of type ids */
 	Int2	*adtsize;			/* list type sizes */
+	Int2	*display_size;		/* the display size (longest row) */
 };
 
-#define CI_get_num_fields(self)    (self->num_fields)
-#define CI_get_oid(self, col)		(self->adtid[col])
-
+#define CI_get_num_fields(self)			(self->num_fields)
+#define CI_get_oid(self, col)			(self->adtid[col])
+#define CI_get_fieldname(self, col)		(self->name[col])
+#define CI_get_fieldsize(self, col)		(self->adtsize[col])
+#define CI_get_display_size(self, col)	(self->display_size[col])
 
 ColumnInfoClass *CI_Constructor();
 void CI_Destructor(ColumnInfoClass *self);
+void CI_free_memory(ColumnInfoClass *self);
 char CI_read_fields(ColumnInfoClass *self, SocketClass *sock);
 
 /* functions for setting up the fields from within the program, */
@@ -33,8 +37,5 @@ void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
 void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, 
                        Oid new_adtid, Int2 new_adtsize);
 
-char *CI_get_fieldname(ColumnInfoClass *self, Int2 which);
-Int2 CI_get_fieldsize(ColumnInfoClass *self, Int2 which);
-void CI_free_memory(ColumnInfoClass *self);
 
 #endif