Update for version 06-40-0001

Author: Byron Nikolaidis

src/interfaces/odbc/columninfo.c

@@ -13,6 +13,7 @@
  */
 
 #include "columninfo.h"
+#include "connection.h"
 #include "socket.h"
 #include <stdlib.h>
 #include <malloc.h>
@@ -31,6 +32,7 @@ ColumnInfoClass *rv;
 		rv->adtid = NULL;
 		rv->adtsize = NULL;
 		rv->display_size = NULL;
+		rv->atttypmod = NULL;
 	}
 
 	return rv;
@@ -49,14 +51,19 @@ CI_Destructor(ColumnInfoClass *self)
 	If self is null, then just read, don't store.
 */
 char
-CI_read_fields(ColumnInfoClass *self, SocketClass *sock)
+CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
 {
 Int2 lf;
 int new_num_fields;
 Oid new_adtid;
 Int2 new_adtsize;
+Int4 new_atttypmod = -1;
 char new_field_name[MAX_MESSAGE_LEN+1];
+SocketClass *sock;
+ConnInfo *ci;
 
+	sock = CC_get_socket(conn);
+	ci = &conn->connInfo;
 
 	/* at first read in the number of fields that are in the query */
 	new_num_fields = (Int2) SOCK_get_int(sock, sizeof(Int2));
@@ -74,10 +81,23 @@ char new_field_name[MAX_MESSAGE_LEN+1];
 		new_adtid = (Oid) SOCK_get_int(sock, 4);
 		new_adtsize = (Int2) SOCK_get_int(sock, 2);
 
-		mylog("CI_read_fields: fieldname='%s', adtid=%d, adtsize=%d\n", new_field_name, new_adtid, new_adtsize);
+		/*	If 6.4 protocol, then read the atttypmod field */
+		if ( ! PROTOCOL_63(ci) && ! PROTOCOL_62(ci)) {
+
+			mylog("READING ATTTYPMOD\n");
+			new_atttypmod = (Int4) SOCK_get_int(sock, 4);
+
+			/*	Subtract the header length */
+			new_atttypmod -= 4;
+			if (new_atttypmod < 0)
+				new_atttypmod = -1;
+
+		}
+
+		mylog("CI_read_fields: fieldname='%s', adtid=%d, adtsize=%d, atttypmod=%d\n", new_field_name, new_adtid, new_adtsize, new_atttypmod);
 
 		if (self)
-			CI_set_field_info(self, lf, new_field_name, new_adtid, new_adtsize);
+			CI_set_field_info(self, lf, new_field_name, new_adtid, new_adtsize, new_atttypmod);
 	}
 
 	return (SOCK_get_errcode(sock) == 0);
@@ -101,6 +121,8 @@ int num_fields = self->num_fields;
 	free(self->adtid);
 	free(self->adtsize);
 	free(self->display_size);
+
+	free(self->atttypmod);
 }
 
 void
@@ -114,11 +136,12 @@ CI_set_num_fields(ColumnInfoClass *self, int new_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);
+	self->atttypmod = (Int4 *) malloc(sizeof(Int4) * self->num_fields);
 }
 
 void
 CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, 
-                                      Oid new_adtid, Int2 new_adtsize)
+                                      Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod)
 {
 
 	// check bounds
@@ -130,6 +153,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;
+	self->atttypmod[field_num] = new_atttypmod;
 
 	self->display_size[field_num] = 0;
 }

src/interfaces/odbc/columninfo.h

@@ -18,24 +18,26 @@ struct ColumnInfoClass_ {
 	Oid		*adtid;				/* list of type ids */
 	Int2	*adtsize;			/* list type sizes */
 	Int2	*display_size;		/* the display size (longest row) */
+	Int4	*atttypmod;			/* the length of bpchar/varchar */
 };
 
 #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])
+#define CI_get_atttypmod(self, col)		(self->atttypmod[col])
 
 ColumnInfoClass *CI_Constructor(void);
 void CI_Destructor(ColumnInfoClass *self);
 void CI_free_memory(ColumnInfoClass *self);
-char CI_read_fields(ColumnInfoClass *self, SocketClass *sock);
+char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
 
 /* functions for setting up the fields from within the program, */
 /* without reading from a socket */
 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);
+                       Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
 
 
 #endif

src/interfaces/odbc/connection.c

@@ -472,8 +472,9 @@ static char *func="CC_connect";
 			globals.unknown_sizes, 
 			globals.max_varchar_size, 
 			globals.max_longvarchar_size);
-		qlog("                disable_optimizer=%d, unique_index=%d, use_declarefetch=%d\n",
+		qlog("                disable_optimizer=%d, ksqo=%d, unique_index=%d, use_declarefetch=%d\n",
 			globals.disable_optimizer,
+			globals.ksqo,
 			globals.unique_index,
 			globals.use_declarefetch);
 		qlog("                text_as_longvarchar=%d, unknowns_as_longvarchar=%d, bools_as_char=%d\n",
@@ -542,7 +543,11 @@ static char *func="CC_connect";
 			// Send length of Authentication Block
 			SOCK_put_int(sock, 4+sizeof(StartupPacket), 4); 
 
-			sp.protoVersion = (ProtocolVersion) htonl(PG_PROTOCOL_LATEST);
+			if ( PROTOCOL_63(ci))
+				sp.protoVersion = (ProtocolVersion) htonl(PG_PROTOCOL_63);
+			else
+				sp.protoVersion = (ProtocolVersion) htonl(PG_PROTOCOL_LATEST);
+
 			strncpy(sp.database, ci->database, SM_DATABASE);
 			strncpy(sp.user, ci->username, SM_USER);
 
@@ -913,22 +918,41 @@ char cmdbuffer[MAX_MESSAGE_LEN+1];	// QR_set_command() dups this string so dont
 
 				SOCK_put_string(sock, "Q ");
 				SOCK_flush_output(sock);
-				while(!clear) {
-					SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH);
-					mylog("send_query: read command '%s'\n", cmdbuffer);
-					clear = (cmdbuffer[0] == 'I');
-
-					if (cmdbuffer[0] == 'N')
-						qlog("NOTICE from backend during send_query: '%s'\n", &cmdbuffer[1]);
-					else if (cmdbuffer[0] == 'E')
-						qlog("ERROR from backend during send_query: '%s'\n", &cmdbuffer[1]);
-					else if (cmdbuffer[0] == 'C')
-						qlog("Command response: '%s'\n", &cmdbuffer[1]);
-				}
 
+				while( ! clear) {
+					id = SOCK_get_char(sock);
+					switch(id) {
+					case 'I':
+						(void) SOCK_get_char(sock);
+						clear = TRUE;
+						break;
+					case 'Z':
+						break;
+					case 'C':
+						SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH);
+						qlog("Command response: '%s'\n", cmdbuffer);
+						break;
+					case 'N':
+						SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH);
+						qlog("NOTICE from backend during clear: '%s'\n", cmdbuffer);
+						break;
+					case 'E':
+						SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH);
+						qlog("ERROR from backend during clear: '%s'\n", cmdbuffer);
+						break;
+					}
+				}
+				
 				mylog("send_query: returning res = %u\n", res);
 				return res;
 			}
+		case 'K':	/* Secret key (6.4 protocol) */
+			(void)SOCK_get_int(sock, 4); /* pid */
+			(void)SOCK_get_int(sock, 4); /* key */
+
+			break;
+		case 'Z':	/* Backend is ready for new query (6.4) */
+			break;
 		case 'N' : /* NOTICE: */
 			SOCK_get_string(sock, cmdbuffer, ERROR_MSG_LENGTH);
 
@@ -1209,6 +1233,16 @@ static char *func="CC_send_settings";
 
 	}
 
+	/*	KSQO */
+	if (globals.ksqo) {
+		result = SQLExecDirect(hstmt, "set ksqo to 'ON'", SQL_NTS);
+		if((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO))
+			status = FALSE;
+
+		mylog("%s: result %d, status %d from set ksqo\n", func, result, status);
+	
+	}
+
 	/*	Global settings */
 	if (globals.conn_settings[0] != '\0') {
 		cs = strdup(globals.conn_settings);

src/interfaces/odbc/connection.h

@@ -14,6 +14,8 @@
 #include "config.h"
 #endif
 
+#include "psqlodbc.h"
+
 #ifndef WIN32
 #include "iodbc.h"
 #include "isql.h"
@@ -24,7 +26,6 @@
 #include <sqlext.h>
 #endif
 
-#include "psqlodbc.h"
 
 typedef enum {
     CONN_NOT_CONNECTED,      /* Connection has not been established */
@@ -100,10 +101,11 @@ typedef enum {
 typedef unsigned int ProtocolVersion;
 
 #define PG_PROTOCOL(major, minor)	(((major) << 16) | (minor))
-#define PG_PROTOCOL_LATEST		PG_PROTOCOL(1, 0)
-#define PG_PROTOCOL_EARLIEST	PG_PROTOCOL(0, 0)
+#define PG_PROTOCOL_LATEST		PG_PROTOCOL(2, 0)
+#define PG_PROTOCOL_63			PG_PROTOCOL(1, 0)
+#define PG_PROTOCOL_62			PG_PROTOCOL(0, 0)
 
-/*	This startup packet is to support latest Postgres protocol (6.3) */
+/*	This startup packet is to support latest Postgres protocol (6.4, 6.3) */
 typedef struct _StartupPacket
 {
 	ProtocolVersion	protoVersion;
@@ -154,6 +156,8 @@ typedef struct {
 /*	Macro to determine is the connection using 6.2 protocol? */
 #define PROTOCOL_62(conninfo_)		(strncmp((conninfo_)->protocol, PG62, strlen(PG62)) == 0)
 
+/*	Macro to determine is the connection using 6.3 protocol? */
+#define PROTOCOL_63(conninfo_)		(strncmp((conninfo_)->protocol, PG63, strlen(PG63)) == 0)
 
 
 /*	This is used to store cached table information in the connection */

src/interfaces/odbc/convert.c

@@ -24,6 +24,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "psqlodbc.h"
+
 #ifndef WIN32
 #include "iodbc.h"
 #include "isql.h"
@@ -120,7 +122,7 @@ struct tm *tim;
 	st.d = tim->tm_mday;
 	st.y = tim->tm_year + 1900;
 
-	mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, (value==NULL)?"<NULL>":value, cbValueMax);
+	mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, value, cbValueMax);
 
 	if ( ! value) {
         /* handle a null just by returning SQL_NULL_DATA in pcbValue, */

src/interfaces/odbc/dlg_specific.c

@@ -87,6 +87,7 @@ int CALLBACK driver_optionsProc(HWND   hdlg,
 
 		CheckDlgButton(hdlg, DRV_COMMLOG, globals.commlog);
 		CheckDlgButton(hdlg, DRV_OPTIMIZER, globals.disable_optimizer);
+		CheckDlgButton(hdlg, DRV_KSQO, globals.ksqo);
 		CheckDlgButton(hdlg, DRV_UNIQUEINDEX, globals.unique_index);
 		CheckDlgButton(hdlg, DRV_READONLY, globals.readonly);
 		CheckDlgButton(hdlg, DRV_USEDECLAREFETCH, globals.use_declarefetch);
@@ -128,6 +129,7 @@ int CALLBACK driver_optionsProc(HWND   hdlg,
 
 			globals.commlog = IsDlgButtonChecked(hdlg, DRV_COMMLOG);
 			globals.disable_optimizer = IsDlgButtonChecked(hdlg, DRV_OPTIMIZER);
+			globals.ksqo = IsDlgButtonChecked(hdlg, DRV_KSQO);
 			globals.unique_index = IsDlgButtonChecked(hdlg, DRV_UNIQUEINDEX);
 			globals.readonly = IsDlgButtonChecked(hdlg, DRV_READONLY);
 			globals.use_declarefetch = IsDlgButtonChecked(hdlg, DRV_USEDECLAREFETCH);
@@ -168,6 +170,7 @@ int CALLBACK driver_optionsProc(HWND   hdlg,
 		case IDDEFAULTS:
 			CheckDlgButton(hdlg, DRV_COMMLOG, DEFAULT_COMMLOG);
 			CheckDlgButton(hdlg, DRV_OPTIMIZER, DEFAULT_OPTIMIZER);
+			CheckDlgButton(hdlg, DRV_KSQO, DEFAULT_KSQO);
 			CheckDlgButton(hdlg, DRV_UNIQUEINDEX, DEFAULT_UNIQUEINDEX);
 			CheckDlgButton(hdlg, DRV_READONLY, DEFAULT_READONLY);
 			CheckDlgButton(hdlg, DRV_USEDECLAREFETCH, DEFAULT_USEDECLAREFETCH);
@@ -238,8 +241,11 @@ char buf[128];
 		/*	Protocol */
 		if (strncmp(ci->protocol, PG62, strlen(PG62)) == 0)
 			CheckDlgButton(hdlg, DS_PG62, 1);
-		else
-			CheckDlgButton(hdlg, DS_PG62, 0);
+		else if (strncmp(ci->protocol, PG63, strlen(PG63)) == 0)
+			CheckDlgButton(hdlg, DS_PG63, 1);
+		else 
+			CheckDlgButton(hdlg, DS_PG64, 1);
+
 
 
 		CheckDlgButton(hdlg, DS_SHOWOIDCOLUMN, atoi(ci->show_oid_column));
@@ -273,11 +279,11 @@ char buf[128];
 			/*	Protocol */
 			if ( IsDlgButtonChecked(hdlg, DS_PG62))
 				strcpy(ci->protocol, PG62);
-			else 
+			else if ( IsDlgButtonChecked(hdlg, DS_PG63))
+				strcpy(ci->protocol, PG63);
+			else
 				ci->protocol[0] = '\0';
 
-
-
 			sprintf(ci->show_system_tables, "%d", IsDlgButtonChecked(hdlg, DS_SHOWSYSTEMTABLES));
 
 			sprintf(ci->row_versioning, "%d", IsDlgButtonChecked(hdlg, DS_ROWVERSIONING));
@@ -634,6 +640,13 @@ char temp[256];
 	else if ( ! override)
 		globals.disable_optimizer = DEFAULT_OPTIMIZER;
 
+	//	KSQO is stored in the driver section only
+	SQLGetPrivateProfileString(section, INI_KSQO, "", 
+				temp, sizeof(temp), filename);
+	if ( temp[0] ) 
+		globals.ksqo = atoi(temp);
+	else if ( ! override)
+		globals.ksqo = DEFAULT_KSQO;
 
 	//	Recognize Unique Index is stored in the driver section only
 	SQLGetPrivateProfileString(section, INI_UNIQUEINDEX, "", 
@@ -769,6 +782,10 @@ char tmp[128];
 	SQLWritePrivateProfileString(DBMS_NAME,
 		INI_OPTIMIZER, tmp, ODBCINST_INI);
 
+	sprintf(tmp, "%d", globals.ksqo);
+	SQLWritePrivateProfileString(DBMS_NAME,
+		INI_KSQO, tmp, ODBCINST_INI);
+
 	sprintf(tmp, "%d", globals.unique_index);
 	SQLWritePrivateProfileString(DBMS_NAME,
 		INI_UNIQUEINDEX, tmp, ODBCINST_INI);

src/interfaces/odbc/dlg_specific.h

@@ -59,6 +59,7 @@
 #define INI_COMMLOG       "CommLog"			/* Communication to backend logging */
 #define INI_PROTOCOL      "Protocol"		/* What protocol (6.2) */
 #define INI_OPTIMIZER     "Optimizer"		/* Use backend genetic optimizer */
+#define INI_KSQO          "Ksqo"            /* Keyset query optimization */
 #define INI_CONNSETTINGS  "ConnSettings"	/* Anything to send to backend on successful connection */
 #define INI_UNIQUEINDEX   "UniqueIndex"		/* Recognize unique indexes */
 #define INI_UNKNOWNSIZES  "UnknownSizes"	/* How to handle unknown result set sizes */
@@ -93,6 +94,7 @@
 #define DEFAULT_UNKNOWNSASLONGVARCHAR	0
 #define DEFAULT_BOOLSASCHAR				1
 #define DEFAULT_OPTIMIZER				1		// disable
+#define DEFAULT_KSQO					1		// on
 #define DEFAULT_UNIQUEINDEX				0		// dont recognize
 #define DEFAULT_COMMLOG					0		// dont log
 #define DEFAULT_DEBUG					0

src/interfaces/odbc/execute.c

@@ -129,7 +129,7 @@ RETCODE SQL_API SQLExecDirect(
         SDWORD    cbSqlStr)
 {
 StatementClass *stmt = (StatementClass *) hstmt;
-RETCODE SQL_API result;
+RETCODE result;
 static char *func = "SQLExecDirect";
 
 	mylog( "%s: entering...\n", func);

src/interfaces/odbc/misc.c

@@ -44,7 +44,7 @@ generate_filename(char* dirname,char* prefix,char* filename)
 		return;
 
 	strcpy(filename,dirname);
-	strcat(filename,DIRSEPARATOR);
+	strcat(filename,DIRSEPERATOR);
 	if(prefix != 0)
 		strcat(filename,prefix);
 #ifndef WIN32