database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Back out all ODBC formatting changes, and back out removal of <6.4

Browse Source 
protocol. I have left in Tom's SOCK_get_next_byte() fix, and the new
win32.mak file addition.  I have also left in the 'X' connection close
fix.
This commit is contained in:
Bruce Momjian 2001-02-14 05:45:46 +00:00
parent 18b04ae131
commit 594e97b72f
45 changed files with 9580 additions and 11060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/odbc/GNUmakefile
View File

@ -2,7 +2,7 @@
# #
# GNUMakefile for psqlodbc (Postgres ODBC driver) # GNUMakefile for psqlodbc (Postgres ODBC driver)
# #
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.12 2001/02/10 16:51:40 petere Exp $ # $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.13 2001/02/14 05:45:38 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -24,6 +24,7 @@ OBJS = info.o bind.o columninfo.o connection.o convert.o drvconn.o \
gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX) gpps.o tuple.o tuplelist.o dlg_specific.o $(OBJX)
SHLIB_LINK = $(filter -lm, $(LIBS)) SHLIB_LINK = $(filter -lm, $(LIBS))
all: all-lib all: all-lib
# Shared library stuff # Shared library stuff
@ -32,7 +33,6 @@ include $(top_srcdir)/src/Makefile.shlib
# Symbols must be resolved to the version in the shared library because # Symbols must be resolved to the version in the shared library because
# the driver manager (e.g., iodbc) provides some symbols with the same # the driver manager (e.g., iodbc) provides some symbols with the same
# names and we don't want those. (This issue is probably ELF specific.) # names and we don't want those. (This issue is probably ELF specific.)
LINK.shared += $(shlib_symbolic) LINK.shared += $(shlib_symbolic)
odbc_headers = isql.h isqlext.h iodbc.h odbc_headers = isql.h isqlext.h iodbc.h

339
src/interfaces/odbc/bind.c
View File

@ -1,14 +1,15 @@
/* Module: bind.c
/* Module: bind.c
* *
* Description: This module contains routines related to binding * Description: This module contains routines related to binding
* columns and parameters. * columns and parameters.
* *
* Classes: BindInfoClass, ParameterInfoClass * Classes: BindInfoClass, ParameterInfoClass
* *
* API functions: SQLBindParameter, SQLBindCol, SQLDescribeParam, SQLNumParams, * API functions: SQLBindParameter, SQLBindCol, SQLDescribeParam, SQLNumParams,
* SQLParamOptions(NI) * SQLParamOptions(NI)
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -33,44 +34,39 @@
#include "sqlext.h" #include "sqlext.h"
#endif #endif
/* Bind parameters on a statement handle */ /* Bind parameters on a statement handle */
RETCODE SQL_API RETCODE SQL_API SQLBindParameter(
SQLBindParameter( HSTMT hstmt,
HSTMT hstmt, UWORD ipar,
UWORD ipar, SWORD fParamType,
SWORD fParamType, SWORD fCType,
SWORD fCType, SWORD fSqlType,
SWORD fSqlType, UDWORD cbColDef,
UDWORD cbColDef, SWORD ibScale,
SWORD ibScale, PTR rgbValue,
PTR rgbValue, SDWORD cbValueMax,
SDWORD cbValueMax, SDWORD FAR *pcbValue)
SDWORD FAR *pcbValue)
{ {
StatementClass *stmt = (StatementClass *) hstmt; StatementClass *stmt = (StatementClass *) hstmt;
static char *func = "SQLBindParameter"; static char *func="SQLBindParameter";
mylog("%s: entering...\n", func); mylog( "%s: entering...\n", func);
if (!stmt) if( ! stmt) {
{
SC_log_error(func, "", NULL); SC_log_error(func, "", NULL);
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
} }
if (stmt->parameters_allocated < ipar) if(stmt->parameters_allocated < ipar) {
{
ParameterInfoClass *old_parameters; ParameterInfoClass *old_parameters;
int i, int i, old_parameters_allocated;
old_parameters_allocated;
old_parameters = stmt->parameters; old_parameters = stmt->parameters;
old_parameters_allocated = stmt->parameters_allocated; old_parameters_allocated = stmt->parameters_allocated;
stmt->parameters = (ParameterInfoClass *) malloc(sizeof(ParameterInfoClass) * (ipar)); stmt->parameters = (ParameterInfoClass *) malloc(sizeof(ParameterInfoClass)*(ipar));
if (!stmt->parameters) if ( ! stmt->parameters) {
{
stmt->errornumber = STMT_NO_MEMORY_ERROR; stmt->errornumber = STMT_NO_MEMORY_ERROR;
stmt->errormsg = "Could not allocate memory for statement parameters"; stmt->errormsg = "Could not allocate memory for statement parameters";
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
@ -80,23 +76,18 @@ SQLBindParameter(
stmt->parameters_allocated = ipar; stmt->parameters_allocated = ipar;
/* copy the old parameters over */ /* copy the old parameters over */
for (i = 0; i < old_parameters_allocated; i++) for(i = 0; i < old_parameters_allocated; i++) {
{
/* a structure copy should work */ /* a structure copy should work */
stmt->parameters[i] = old_parameters[i]; stmt->parameters[i] = old_parameters[i];
} }
/* get rid of the old parameters, if there were any */ /* get rid of the old parameters, if there were any */
if (old_parameters) if(old_parameters)
free(old_parameters); free(old_parameters);
/* /* zero out the newly allocated parameters (in case they skipped some, */
* zero out the newly allocated parameters (in case they skipped
* some,
*/
/* so we don't accidentally try to use them later) */ /* so we don't accidentally try to use them later) */
for (; i < stmt->parameters_allocated; i++) for(; i < stmt->parameters_allocated; i++) {
{
stmt->parameters[i].buflen = 0; stmt->parameters[i].buflen = 0;
stmt->parameters[i].buffer = 0; stmt->parameters[i].buffer = 0;
stmt->parameters[i].used = 0; stmt->parameters[i].used = 0;
@ -112,8 +103,7 @@ SQLBindParameter(
} }
} }
ipar--; /* use zero based column numbers for the ipar--; /* use zero based column numbers for the below part */
* below part */
/* store the given info */ /* store the given info */
stmt->parameters[ipar].buflen = cbValueMax; stmt->parameters[ipar].buflen = cbValueMax;
@ -125,55 +115,50 @@ SQLBindParameter(
stmt->parameters[ipar].precision = cbColDef; stmt->parameters[ipar].precision = cbColDef;
stmt->parameters[ipar].scale = ibScale; stmt->parameters[ipar].scale = ibScale;
/* /* If rebinding a parameter that had data-at-exec stuff in it,
* If rebinding a parameter that had data-at-exec stuff in it, then then free that stuff
* free that stuff */
*/ if (stmt->parameters[ipar].EXEC_used) {
if (stmt->parameters[ipar].EXEC_used)
{
free(stmt->parameters[ipar].EXEC_used); free(stmt->parameters[ipar].EXEC_used);
stmt->parameters[ipar].EXEC_used = NULL; stmt->parameters[ipar].EXEC_used = NULL;
} }
if (stmt->parameters[ipar].EXEC_buffer) if (stmt->parameters[ipar].EXEC_buffer) {
{
if (stmt->parameters[ipar].SQLType != SQL_LONGVARBINARY) if (stmt->parameters[ipar].SQLType != SQL_LONGVARBINARY)
free(stmt->parameters[ipar].EXEC_buffer); free(stmt->parameters[ipar].EXEC_buffer);
stmt->parameters[ipar].EXEC_buffer = NULL; stmt->parameters[ipar].EXEC_buffer = NULL;
} }
/* Data at exec macro only valid for C char/binary data */ /* Data at exec macro only valid for C char/binary data */
if ((fSqlType == SQL_LONGVARBINARY || fSqlType == SQL_LONGVARCHAR) && pcbValue && *pcbValue <= SQL_LEN_DATA_AT_EXEC_OFFSET) if ((fSqlType == SQL_LONGVARBINARY || fSqlType == SQL_LONGVARCHAR) && pcbValue && *pcbValue <= SQL_LEN_DATA_AT_EXEC_OFFSET)
stmt->parameters[ipar].data_at_exec = TRUE; stmt->parameters[ipar].data_at_exec = TRUE;
else else
stmt->parameters[ipar].data_at_exec = FALSE; stmt->parameters[ipar].data_at_exec = FALSE;
mylog("SQLBindParamater: ipar=%d, paramType=%d, fCType=%d, fSqlType=%d, cbColDef=%d, ibScale=%d, rgbValue=%d, *pcbValue = %d, data_at_exec = %d\n", ipar, fParamType, fCType, fSqlType, cbColDef, ibScale, rgbValue, pcbValue ? *pcbValue : -777, stmt->parameters[ipar].data_at_exec); mylog("SQLBindParamater: ipar=%d, paramType=%d, fCType=%d, fSqlType=%d, cbColDef=%d, ibScale=%d, rgbValue=%d, *pcbValue = %d, data_at_exec = %d\n", ipar, fParamType, fCType, fSqlType, cbColDef, ibScale, rgbValue, pcbValue ? *pcbValue: -777, stmt->parameters[ipar].data_at_exec);
return SQL_SUCCESS; return SQL_SUCCESS;
} }
/* - - - - - - - - - */ /* - - - - - - - - - */
/* Associate a user-supplied buffer with a database column. */ /* Associate a user-supplied buffer with a database column. */
RETCODE SQL_API RETCODE SQL_API SQLBindCol(
SQLBindCol( HSTMT hstmt,
HSTMT hstmt, UWORD icol,
UWORD icol, SWORD fCType,
SWORD fCType, PTR rgbValue,
PTR rgbValue, SDWORD cbValueMax,
SDWORD cbValueMax, SDWORD FAR *pcbValue)
SDWORD FAR *pcbValue)
{ {
StatementClass *stmt = (StatementClass *) hstmt; StatementClass *stmt = (StatementClass *) hstmt;
static char *func = "SQLBindCol"; static char *func="SQLBindCol";
mylog("%s: entering...\n", func); mylog( "%s: entering...\n", func);
mylog("**** SQLBindCol: stmt = %u, icol = %d\n", stmt, icol); mylog("**** SQLBindCol: stmt = %u, icol = %d\n", stmt, icol);
if (!stmt) if ( ! stmt) {
{
SC_log_error(func, "", NULL); SC_log_error(func, "", NULL);
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
} }
@ -181,27 +166,23 @@ SQLBindCol(
SC_clear_error(stmt); SC_clear_error(stmt);
if (stmt->status == STMT_EXECUTING) if( stmt->status == STMT_EXECUTING) {
{
stmt->errormsg = "Can't bind columns while statement is still executing."; stmt->errormsg = "Can't bind columns while statement is still executing.";
stmt->errornumber = STMT_SEQUENCE_ERROR; stmt->errornumber = STMT_SEQUENCE_ERROR;
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
return SQL_ERROR; return SQL_ERROR;
} }
/* If the bookmark column is being bound, then just save it */ /* If the bookmark column is being bound, then just save it */
if (icol == 0) if (icol == 0) {
{
if (rgbValue == NULL) if (rgbValue == NULL) {
{
stmt->bookmark.buffer = NULL; stmt->bookmark.buffer = NULL;
stmt->bookmark.used = NULL; stmt->bookmark.used = NULL;
} }
else else {
{ /* Make sure it is the bookmark data type */
/* Make sure it is the bookmark data type */ if ( fCType != SQL_C_BOOKMARK) {
if (fCType != SQL_C_BOOKMARK)
{
stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK"; stmt->errormsg = "Column 0 is not of type SQL_C_BOOKMARK";
stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE; stmt->errornumber = STMT_PROGRAM_TYPE_OUT_OF_RANGE;
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
@ -214,42 +195,37 @@ SQLBindCol(
return SQL_SUCCESS; return SQL_SUCCESS;
} }
/* allocate enough bindings if not already done */ /* allocate enough bindings if not already done */
/* Most likely, execution of a statement would have setup the */ /* Most likely, execution of a statement would have setup the */
/* necessary bindings. But some apps call BindCol before any */ /* necessary bindings. But some apps call BindCol before any */
/* statement is executed. */ /* statement is executed. */
if (icol > stmt->bindings_allocated) if ( icol > stmt->bindings_allocated)
extend_bindings(stmt, icol); extend_bindings(stmt, icol);
/* check to see if the bindings were allocated */ /* check to see if the bindings were allocated */
if (!stmt->bindings) if ( ! stmt->bindings) {
{
stmt->errormsg = "Could not allocate memory for bindings."; stmt->errormsg = "Could not allocate memory for bindings.";
stmt->errornumber = STMT_NO_MEMORY_ERROR; stmt->errornumber = STMT_NO_MEMORY_ERROR;
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
return SQL_ERROR; return SQL_ERROR;
} }
icol--; /* use zero based col numbers from here icol--; /* use zero based col numbers from here out */
* out */
/* Reset for SQLGetData */ /* Reset for SQLGetData */
stmt->bindings[icol].data_left = -1; stmt->bindings[icol].data_left = -1;
if (rgbValue == NULL) if (rgbValue == NULL) {
{
/* we have to unbind the column */ /* we have to unbind the column */
stmt->bindings[icol].buflen = 0; stmt->bindings[icol].buflen = 0;
stmt->bindings[icol].buffer = NULL; stmt->bindings[icol].buffer = NULL;
stmt->bindings[icol].used = NULL; stmt->bindings[icol].used = NULL;
stmt->bindings[icol].returntype = SQL_C_CHAR; stmt->bindings[icol].returntype = SQL_C_CHAR;
} } else {
else
{
/* ok, bind that column */ /* ok, bind that column */
stmt->bindings[icol].buflen = cbValueMax; stmt->bindings[icol].buflen = cbValueMax;
stmt->bindings[icol].buffer = rgbValue; stmt->bindings[icol].buffer = rgbValue;
stmt->bindings[icol].used = pcbValue; stmt->bindings[icol].used = pcbValue;
stmt->bindings[icol].returntype = fCType; stmt->bindings[icol].returntype = fCType;
mylog(" bound buffer[%d] = %u\n", icol, stmt->bindings[icol].buffer); mylog(" bound buffer[%d] = %u\n", icol, stmt->bindings[icol].buffer);
@ -258,37 +234,34 @@ SQLBindCol(
return SQL_SUCCESS; return SQL_SUCCESS;
} }
/* - - - - - - - - - */ /* - - - - - - - - - */
/* Returns the description of a parameter marker. */ /* Returns the description of a parameter marker. */
/* This function is listed as not being supported by SQLGetFunctions() because it is */ /* This function is listed as not being supported by SQLGetFunctions() because it is */
/* used to describe "parameter markers" (not bound parameters), in which case, */ /* used to describe "parameter markers" (not bound parameters), in which case, */
/* the dbms should return info on the markers. Since Postgres doesn't support that, */ /* the dbms should return info on the markers. Since Postgres doesn't support that, */
/* it is best to say this function is not supported and let the application assume a */ /* it is best to say this function is not supported and let the application assume a */
/* data type (most likely varchar). */ /* data type (most likely varchar). */
RETCODE SQL_API RETCODE SQL_API SQLDescribeParam(
SQLDescribeParam( HSTMT hstmt,
HSTMT hstmt, UWORD ipar,
UWORD ipar, SWORD FAR *pfSqlType,
SWORD FAR *pfSqlType, UDWORD FAR *pcbColDef,
UDWORD FAR *pcbColDef, SWORD FAR *pibScale,
SWORD FAR *pibScale, SWORD FAR *pfNullable)
SWORD FAR *pfNullable)
{ {
StatementClass *stmt = (StatementClass *) hstmt; StatementClass *stmt = (StatementClass *) hstmt;
static char *func = "SQLDescribeParam"; static char *func = "SQLDescribeParam";
mylog("%s: entering...\n", func); mylog( "%s: entering...\n", func);
if (!stmt) if( ! stmt) {
{
SC_log_error(func, "", NULL); SC_log_error(func, "", NULL);
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
} }
if ((ipar < 1) || (ipar > stmt->parameters_allocated)) if( (ipar < 1) || (ipar > stmt->parameters_allocated) ) {
{
stmt->errormsg = "Invalid parameter number for SQLDescribeParam."; stmt->errormsg = "Invalid parameter number for SQLDescribeParam.";
stmt->errornumber = STMT_BAD_PARAMETER_NUMBER_ERROR; stmt->errornumber = STMT_BAD_PARAMETER_NUMBER_ERROR;
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
@ -297,45 +270,41 @@ SQLDescribeParam(
ipar--; ipar--;
/* /* This implementation is not very good, since it is supposed to describe */
* This implementation is not very good, since it is supposed to /* parameter markers, not bound parameters. */
* describe if(pfSqlType)
*/
/* parameter markers, not bound parameters. */
if (pfSqlType)
*pfSqlType = stmt->parameters[ipar].SQLType; *pfSqlType = stmt->parameters[ipar].SQLType;
if (pcbColDef) if(pcbColDef)
*pcbColDef = stmt->parameters[ipar].precision; *pcbColDef = stmt->parameters[ipar].precision;
if (pibScale) if(pibScale)
*pibScale = stmt->parameters[ipar].scale; *pibScale = stmt->parameters[ipar].scale;
if (pfNullable) if(pfNullable)
*pfNullable = pgtype_nullable(stmt, stmt->parameters[ipar].paramType); *pfNullable = pgtype_nullable(stmt, stmt->parameters[ipar].paramType);
return SQL_SUCCESS; return SQL_SUCCESS;
} }
/* - - - - - - - - - */ /* - - - - - - - - - */
/* Sets multiple values (arrays) for the set of parameter markers. */ /* Sets multiple values (arrays) for the set of parameter markers. */
RETCODE SQL_API RETCODE SQL_API SQLParamOptions(
SQLParamOptions( HSTMT hstmt,
HSTMT hstmt, UDWORD crow,
UDWORD crow, UDWORD FAR *pirow)
UDWORD FAR *pirow)
{ {
static char *func = "SQLParamOptions"; static char *func = "SQLParamOptions";
mylog("%s: entering...\n", func); mylog( "%s: entering...\n", func);
SC_log_error(func, "Function not implemented", (StatementClass *) hstmt); SC_log_error(func, "Function not implemented", (StatementClass *) hstmt);
return SQL_ERROR; return SQL_ERROR;
} }
/* - - - - - - - - - */ /* - - - - - - - - - */
/* This function should really talk to the dbms to determine the number of */ /* This function should really talk to the dbms to determine the number of */
/* "parameter markers" (not bound parameters) in the statement. But, since */ /* "parameter markers" (not bound parameters) in the statement. But, since */
@ -344,49 +313,43 @@ SQLParamOptions(
/* like it does for SQLDescribeParam is that some applications don't care and try */ /* like it does for SQLDescribeParam is that some applications don't care and try */
/* to call it anyway. */ /* to call it anyway. */
/* If the statement does not have parameters, it should just return 0. */ /* If the statement does not have parameters, it should just return 0. */
RETCODE SQL_API RETCODE SQL_API SQLNumParams(
SQLNumParams( HSTMT hstmt,
HSTMT hstmt, SWORD FAR *pcpar)
SWORD FAR *pcpar)
{ {
StatementClass *stmt = (StatementClass *) hstmt; StatementClass *stmt = (StatementClass *) hstmt;
char in_quote = FALSE; char in_quote = FALSE;
unsigned int i; unsigned int i;
static char *func = "SQLNumParams"; static char *func = "SQLNumParams";
mylog("%s: entering...\n", func); mylog( "%s: entering...\n", func);
if (!stmt) if(!stmt) {
{
SC_log_error(func, "", NULL); SC_log_error(func, "", NULL);
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
} }
if (pcpar) if (pcpar)
*pcpar = 0; *pcpar = 0;
else else {
{
SC_log_error(func, "pcpar was null", stmt); SC_log_error(func, "pcpar was null", stmt);
return SQL_ERROR; return SQL_ERROR;
} }
if (!stmt->statement) if(!stmt->statement) {
{
/* no statement has been allocated */ /* no statement has been allocated */
stmt->errormsg = "SQLNumParams called with no statement ready."; stmt->errormsg = "SQLNumParams called with no statement ready.";
stmt->errornumber = STMT_SEQUENCE_ERROR; stmt->errornumber = STMT_SEQUENCE_ERROR;
SC_log_error(func, "", stmt); SC_log_error(func, "", stmt);
return SQL_ERROR; return SQL_ERROR;
} } else {
else
{ for(i=0; i < strlen(stmt->statement); i++) {
for (i = 0; i < strlen(stmt->statement); i++)
{ if(stmt->statement[i] == '?' && !in_quote)
if (stmt->statement[i] == '?' && !in_quote)
(*pcpar)++; (*pcpar)++;
else else {
{
if (stmt->statement[i] == '\'') if (stmt->statement[i] == '\'')
in_quote = (in_quote ? FALSE : TRUE); in_quote = (in_quote ? FALSE : TRUE);
} }
@ -397,20 +360,20 @@ SQLNumParams(
} }
/******************************************************************** /********************************************************************
* Bindings Implementation * Bindings Implementation
*/ */
BindInfoClass * BindInfoClass *
create_empty_bindings(int num_columns) create_empty_bindings(int num_columns)
{ {
BindInfoClass *new_bindings; BindInfoClass *new_bindings;
int i; int i;
new_bindings = (BindInfoClass *) malloc(num_columns * sizeof(BindInfoClass)); new_bindings = (BindInfoClass *)malloc(num_columns * sizeof(BindInfoClass));
if (!new_bindings) if(!new_bindings) {
return 0; return 0;
}
for (i = 0; i < num_columns; i++) for(i=0; i < num_columns; i++) {
{
new_bindings[i].buflen = 0; new_bindings[i].buflen = 0;
new_bindings[i].buffer = NULL; new_bindings[i].buffer = NULL;
new_bindings[i].used = NULL; new_bindings[i].used = NULL;
@ -423,23 +386,21 @@ create_empty_bindings(int num_columns)
void void
extend_bindings(StatementClass *stmt, int num_columns) extend_bindings(StatementClass *stmt, int num_columns)
{ {
static char *func = "extend_bindings"; static char *func="extend_bindings";
BindInfoClass *new_bindings; BindInfoClass *new_bindings;
int i; int i;
mylog("%s: entering ... stmt=%u, bindings_allocated=%d, num_columns=%d\n", func, stmt, stmt->bindings_allocated, num_columns); mylog("%s: entering ... stmt=%u, bindings_allocated=%d, num_columns=%d\n", func, stmt, stmt->bindings_allocated, num_columns);
/* if we have too few, allocate room for more, and copy the old */ /* if we have too few, allocate room for more, and copy the old */
/* entries into the new structure */ /* entries into the new structure */
if (stmt->bindings_allocated < num_columns) if(stmt->bindings_allocated < num_columns) {
{
new_bindings = create_empty_bindings(num_columns);
if (!new_bindings)
{
mylog("%s: unable to create %d new bindings from %d old bindings\n", func, num_columns, stmt->bindings_allocated);
if (stmt->bindings) new_bindings = create_empty_bindings(num_columns);
{ if ( ! new_bindings) {
mylog("%s: unable to create %d new bindings from %d old bindings\n", func, num_columns, stmt->bindings_allocated);
if (stmt->bindings) {
free(stmt->bindings); free(stmt->bindings);
stmt->bindings = NULL; stmt->bindings = NULL;
} }
@ -447,9 +408,8 @@ extend_bindings(StatementClass *stmt, int num_columns)
return; return;
} }
if (stmt->bindings) if(stmt->bindings) {
{ for(i=0; i<stmt->bindings_allocated; i++)
for (i = 0; i < stmt->bindings_allocated; i++)
new_bindings[i] = stmt->bindings[i]; new_bindings[i] = stmt->bindings[i];
free(stmt->bindings); free(stmt->bindings);
@ -457,14 +417,15 @@ extend_bindings(StatementClass *stmt, int num_columns)
stmt->bindings = new_bindings; stmt->bindings = new_bindings;
stmt->bindings_allocated = num_columns; stmt->bindings_allocated = num_columns;
}
/* There is no reason to zero out extra bindings if there are */
/* more than needed. If an app has allocated extra bindings, */
/* let it worry about it by unbinding those columns. */
/* SQLBindCol(1..) ... SQLBindCol(10...) # got 10 bindings */ }
/* SQLExecDirect(...) # returns 5 cols */ /* There is no reason to zero out extra bindings if there are */
/* SQLExecDirect(...) # returns 10 cols (now OK) */ /* more than needed. If an app has allocated extra bindings, */
/* let it worry about it by unbinding those columns. */
/* SQLBindCol(1..) ... SQLBindCol(10...) # got 10 bindings */
/* SQLExecDirect(...) # returns 5 cols */
/* SQLExecDirect(...) # returns 10 cols (now OK) */
mylog("exit extend_bindings\n"); mylog("exit extend_bindings\n");
} }

53
src/interfaces/odbc/bind.h
View File

@ -1,9 +1,9 @@
/* File: bind.h /* File: bind.h
* *
* Description: See "bind.c" * Description: See "bind.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -15,40 +15,33 @@
/* /*
* BindInfoClass -- stores information about a bound column * BindInfoClass -- stores information about a bound column
*/ */
struct BindInfoClass_ struct BindInfoClass_ {
{ Int4 buflen; /* size of buffer */
Int4 buflen; /* size of buffer */ Int4 data_left; /* amount of data left to read (SQLGetData) */
Int4 data_left; /* amount of data left to read char *buffer; /* pointer to the buffer */
* (SQLGetData) */ Int4 *used; /* used space in the buffer (for strings not counting the '\0') */
char *buffer; /* pointer to the buffer */ Int2 returntype; /* kind of conversion to be applied when returning (SQL_C_DEFAULT, SQL_C_CHAR...) */
Int4 *used; /* used space in the buffer (for strings
* not counting the '\0') */
Int2 returntype; /* kind of conversion to be applied when
* returning (SQL_C_DEFAULT,
* SQL_C_CHAR...) */
}; };
/* /*
* ParameterInfoClass -- stores information about a bound parameter * ParameterInfoClass -- stores information about a bound parameter
*/ */
struct ParameterInfoClass_ struct ParameterInfoClass_ {
{ Int4 buflen;
Int4 buflen; char *buffer;
char *buffer; Int4 *used;
Int4 *used; Int2 paramType;
Int2 paramType; Int2 CType;
Int2 CType; Int2 SQLType;
Int2 SQLType; UInt4 precision;
UInt4 precision; Int2 scale;
Int2 scale; Oid lobj_oid;
Oid lobj_oid; Int4 *EXEC_used; /* amount of data OR the oid of the large object */
Int4 *EXEC_used; /* amount of data OR the oid of the large char *EXEC_buffer; /* the data or the FD of the large object */
* object */ char data_at_exec;
char *EXEC_buffer; /* the data or the FD of the large object */
char data_at_exec;
}; };
BindInfoClass *create_empty_bindings(int num_columns); BindInfoClass *create_empty_bindings(int num_columns);
void extend_bindings(StatementClass *stmt, int num_columns); void extend_bindings(StatementClass *stmt, int num_columns);
#endif #endif

82
src/interfaces/odbc/columninfo.c
View File

@ -1,13 +1,14 @@
/* Module: columninfo.c
/* Module: columninfo.c
* *
* Description: This module contains routines related to * Description: This module contains routines related to
* reading and storing the field information from a query. * reading and storing the field information from a query.
* *
* Classes: ColumnInfoClass (Functions prefix: "CI_") * Classes: ColumnInfoClass (Functions prefix: "CI_")
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -20,12 +21,11 @@
ColumnInfoClass * ColumnInfoClass *
CI_Constructor() CI_Constructor()
{ {
ColumnInfoClass *rv; ColumnInfoClass *rv;
rv = (ColumnInfoClass *) malloc(sizeof(ColumnInfoClass)); rv = (ColumnInfoClass *) malloc(sizeof(ColumnInfoClass));
if (rv) if (rv) {
{
rv->num_fields = 0; rv->num_fields = 0;
rv->name = NULL; rv->name = NULL;
rv->adtid = NULL; rv->adtid = NULL;
@ -45,21 +45,21 @@ CI_Destructor(ColumnInfoClass *self)
free(self); free(self);
} }
/* Read in field descriptions. /* Read in field descriptions.
If self is not null, then also store the information. If self is not null, then also store the information.
If self is null, then just read, don't store. If self is null, then just read, don't store.
*/ */
char char
CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn) CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
{ {
Int2 lf; Int2 lf;
int new_num_fields; int new_num_fields;
Oid new_adtid; Oid new_adtid;
Int2 new_adtsize; Int2 new_adtsize;
Int4 new_atttypmod = -1; Int4 new_atttypmod = -1;
char new_field_name[MAX_MESSAGE_LEN + 1]; char new_field_name[MAX_MESSAGE_LEN+1];
SocketClass *sock; SocketClass *sock;
ConnInfo *ci; ConnInfo *ci;
sock = CC_get_socket(conn); sock = CC_get_socket(conn);
ci = &conn->connInfo; ci = &conn->connInfo;
@ -69,28 +69,28 @@ CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
mylog("num_fields = %d\n", new_num_fields); mylog("num_fields = %d\n", new_num_fields);
if (self) if (self) { /* according to that allocate memory */
{ /* according to that allocate memory */
CI_set_num_fields(self, new_num_fields); CI_set_num_fields(self, new_num_fields);
} }
/* now read in the descriptions */ /* now read in the descriptions */
for (lf = 0; lf < new_num_fields; lf++) for(lf = 0; lf < new_num_fields; lf++) {
{
SOCK_get_string(sock, new_field_name, MAX_MESSAGE_LEN); SOCK_get_string(sock, new_field_name, MAX_MESSAGE_LEN);
new_adtid = (Oid) SOCK_get_int(sock, 4); new_adtid = (Oid) SOCK_get_int(sock, 4);
new_adtsize = (Int2) SOCK_get_int(sock, 2); new_adtsize = (Int2) SOCK_get_int(sock, 2);
/* If 6.4 protocol, then read the atttypmod field */ /* If 6.4 protocol, then read the atttypmod field */
if (PG_VERSION_GE(conn, 6.4)) if (PG_VERSION_GE(conn, 6.4)) {
{
mylog("READING ATTTYPMOD\n"); mylog("READING ATTTYPMOD\n");
new_atttypmod = (Int4) SOCK_get_int(sock, 4); new_atttypmod = (Int4) SOCK_get_int(sock, 4);
/* Subtract the header length */ /* Subtract the header length */
new_atttypmod -= 4; new_atttypmod -= 4;
if (new_atttypmod < 0) if (new_atttypmod < 0)
new_atttypmod = -1; 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); mylog("CI_read_fields: fieldname='%s', adtid=%d, adtsize=%d, atttypmod=%d\n", new_field_name, new_adtid, new_adtsize, new_atttypmod);
@ -107,16 +107,15 @@ CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn)
void void
CI_free_memory(ColumnInfoClass *self) CI_free_memory(ColumnInfoClass *self)
{ {
register Int2 lf; register Int2 lf;
int num_fields = self->num_fields; int num_fields = self->num_fields;
for (lf = 0; lf < num_fields; lf++) for (lf = 0; lf < num_fields; lf++) {
{ if( self->name[lf])
if (self->name[lf]) free (self->name[lf]);
free(self->name[lf]);
} }
/* Safe to call even if null */ /* Safe to call even if null */
free(self->name); free(self->name);
free(self->adtid); free(self->adtid);
free(self->adtsize); free(self->adtsize);
@ -128,24 +127,26 @@ CI_free_memory(ColumnInfoClass *self)
void void
CI_set_num_fields(ColumnInfoClass *self, int new_num_fields) CI_set_num_fields(ColumnInfoClass *self, int new_num_fields)
{ {
CI_free_memory(self); /* always safe to call */ CI_free_memory(self); /* always safe to call */
self->num_fields = new_num_fields; self->num_fields = new_num_fields;
self->name = (char **) malloc(sizeof(char *) * self->num_fields); self->name = (char **) malloc (sizeof(char *) * self->num_fields);
self->adtid = (Oid *) malloc(sizeof(Oid) * self->num_fields); self->adtid = (Oid *) malloc (sizeof(Oid) * self->num_fields);
self->adtsize = (Int2 *) malloc(sizeof(Int2) * self->num_fields); self->adtsize = (Int2 *) malloc (sizeof(Int2) * self->num_fields);
self->display_size = (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); self->atttypmod = (Int4 *) malloc(sizeof(Int4) * self->num_fields);
} }
void void
CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod) Oid new_adtid, Int2 new_adtsize, Int4 new_atttypmod)
{ {
/* check bounds */ /* check bounds */
if ((field_num < 0) || (field_num >= self->num_fields)) if((field_num < 0) || (field_num >= self->num_fields)) {
return; return;
}
/* store the info */ /* store the info */
self->name[field_num] = strdup(new_name); self->name[field_num] = strdup(new_name);
@ -155,3 +156,4 @@ CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
self->display_size[field_num] = 0; self->display_size[field_num] = 0;
} }

31
src/interfaces/odbc/columninfo.h
View File

@ -1,9 +1,9 @@
/* File: columninfo.h /* File: columninfo.h
* *
* Description: See "columninfo.c" * Description: See "columninfo.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -12,14 +12,13 @@
#include "psqlodbc.h" #include "psqlodbc.h"
struct ColumnInfoClass_ struct ColumnInfoClass_ {
{ Int2 num_fields;
Int2 num_fields; char **name; /* list of type names */
char **name; /* list of type names */ Oid *adtid; /* list of type ids */
Oid *adtid; /* list of type ids */ Int2 *adtsize; /* list type sizes */
Int2 *adtsize; /* list type sizes */ Int2 *display_size; /* the display size (longest row) */
Int2 *display_size; /* the display size (longest row) */ Int4 *atttypmod; /* the length of bpchar/varchar */
Int4 *atttypmod; /* the length of bpchar/varchar */
}; };
#define CI_get_num_fields(self) (self->num_fields) #define CI_get_num_fields(self) (self->num_fields)
@ -30,15 +29,15 @@ struct ColumnInfoClass_
#define CI_get_atttypmod(self, col) (self->atttypmod[col]) #define CI_get_atttypmod(self, col) (self->atttypmod[col])
ColumnInfoClass *CI_Constructor(void); ColumnInfoClass *CI_Constructor(void);
void CI_Destructor(ColumnInfoClass *self); void CI_Destructor(ColumnInfoClass *self);
void CI_free_memory(ColumnInfoClass *self); void CI_free_memory(ColumnInfoClass *self);
char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn); char CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
/* functions for setting up the fields from within the program, */ /* functions for setting up the fields from within the program, */
/* without reading from a socket */ /* without reading from a socket */
void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields); void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name, void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
Oid new_adtid, Int2 new_adtsize, Int4 atttypmod); Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
#endif #endif

1361
src/interfaces/odbc/connection.c
View File

File diff suppressed because it is too large Load Diff

253
src/interfaces/odbc/connection.h
View File

@ -1,9 +1,9 @@
/* File: connection.h /* File: connection.h
* *
* Description: See "connection.c" * Description: See "connection.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -27,14 +27,11 @@
#endif #endif
typedef enum typedef enum {
{ CONN_NOT_CONNECTED, /* Connection has not been established */
CONN_NOT_CONNECTED, /* Connection has not been established */ CONN_CONNECTED, /* Connection is up and has been established */
CONN_CONNECTED, /* Connection is up and has been CONN_DOWN, /* Connection is broken */
* established */ CONN_EXECUTING /* the connection is currently executing a statement */
CONN_DOWN, /* Connection is broken */
CONN_EXECUTING /* the connection is currently executing a
* statement */
} CONN_Status; } CONN_Status;
/* These errors have general sql error state */ /* These errors have general sql error state */
@ -93,11 +90,11 @@ typedef enum
#define AUTH_REQ_CRYPT 4 #define AUTH_REQ_CRYPT 4
/* Startup Packet sizes */ /* Startup Packet sizes */
#define SM_DATABASE 64 #define SM_DATABASE 64
#define SM_USER 32 #define SM_USER 32
#define SM_OPTIONS 64 #define SM_OPTIONS 64
#define SM_UNUSED 64 #define SM_UNUSED 64
#define SM_TTY 64 #define SM_TTY 64
/* Old 6.2 protocol defines */ /* Old 6.2 protocol defines */
#define NO_AUTHENTICATION 7 #define NO_AUTHENTICATION 7
@ -109,44 +106,63 @@ typedef unsigned int ProtocolVersion;
#define PG_PROTOCOL(major, minor) (((major) << 16) | (minor)) #define PG_PROTOCOL(major, minor) (((major) << 16) | (minor))
#define PG_PROTOCOL_LATEST PG_PROTOCOL(2, 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 */ /* This startup packet is to support latest Postgres protocol (6.4, 6.3) */
typedef struct _StartupPacket typedef struct _StartupPacket
{ {
ProtocolVersion protoVersion; ProtocolVersion protoVersion;
char database[SM_DATABASE]; char database[SM_DATABASE];
char user[SM_USER]; char user[SM_USER];
char options[SM_OPTIONS]; char options[SM_OPTIONS];
char unused[SM_UNUSED]; char unused[SM_UNUSED];
char tty[SM_TTY]; char tty[SM_TTY];
} StartupPacket; } StartupPacket;
/* This startup packet is to support pre-Postgres 6.3 protocol */
typedef struct _StartupPacket6_2
{
unsigned int authtype;
char database[PATH_SIZE];
char user[NAMEDATALEN];
char options[ARGV_SIZE];
char execfile[ARGV_SIZE];
char tty[PATH_SIZE];
} StartupPacket6_2;
/* Structure to hold all the connection attributes for a specific /* Structure to hold all the connection attributes for a specific
connection (used for both registry and file, DSN and DRIVER) connection (used for both registry and file, DSN and DRIVER)
*/ */
typedef struct typedef struct {
{ char dsn[MEDIUM_REGISTRY_LEN];
char dsn[MEDIUM_REGISTRY_LEN]; char desc[MEDIUM_REGISTRY_LEN];
char desc[MEDIUM_REGISTRY_LEN]; char driver[MEDIUM_REGISTRY_LEN];
char driver[MEDIUM_REGISTRY_LEN]; char server[MEDIUM_REGISTRY_LEN];
char server[MEDIUM_REGISTRY_LEN]; char database[MEDIUM_REGISTRY_LEN];
char database[MEDIUM_REGISTRY_LEN]; char username[MEDIUM_REGISTRY_LEN];
char username[MEDIUM_REGISTRY_LEN]; char password[MEDIUM_REGISTRY_LEN];
char password[MEDIUM_REGISTRY_LEN]; char conn_settings[LARGE_REGISTRY_LEN];
char conn_settings[LARGE_REGISTRY_LEN]; char protocol[SMALL_REGISTRY_LEN];
char protocol[SMALL_REGISTRY_LEN]; char port[SMALL_REGISTRY_LEN];
char port[SMALL_REGISTRY_LEN]; char onlyread[SMALL_REGISTRY_LEN];
char onlyread[SMALL_REGISTRY_LEN]; char fake_oid_index[SMALL_REGISTRY_LEN];
char fake_oid_index[SMALL_REGISTRY_LEN]; char show_oid_column[SMALL_REGISTRY_LEN];
char show_oid_column[SMALL_REGISTRY_LEN]; char row_versioning[SMALL_REGISTRY_LEN];
char row_versioning[SMALL_REGISTRY_LEN]; char show_system_tables[SMALL_REGISTRY_LEN];
char show_system_tables[SMALL_REGISTRY_LEN]; char translation_dll[MEDIUM_REGISTRY_LEN];
char translation_dll[MEDIUM_REGISTRY_LEN]; char translation_option[SMALL_REGISTRY_LEN];
char translation_option[SMALL_REGISTRY_LEN]; char focus_password;
char focus_password;
} ConnInfo; } ConnInfo;
/* 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)
/* /*
* Macros to compare the server's version with a specified version * Macros to compare the server's version with a specified version
* 1st parameter: pointer to a ConnectionClass object * 1st parameter: pointer to a ConnectionClass object
@ -164,15 +180,15 @@ typedef struct
#define SERVER_VERSION_LE(conn, major, minor) (! SERVER_VERSION_GT(conn, major, minor)) #define SERVER_VERSION_LE(conn, major, minor) (! SERVER_VERSION_GT(conn, major, minor))
#define SERVER_VERSION_LT(conn, major, minor) (! SERVER_VERSION_GE(conn, major, minor)) #define SERVER_VERSION_LT(conn, major, minor) (! SERVER_VERSION_GE(conn, major, minor))
/*#if ! defined(HAVE_CONFIG_H) || defined(HAVE_STRINGIZE)*/ /*#if ! defined(HAVE_CONFIG_H) || defined(HAVE_STRINGIZE)*/
#define STRING_AFTER_DOT(string) (strchr(#string, '.') + 1) #define STRING_AFTER_DOT(string) (strchr(#string, '.') + 1)
/*#else /*#else
#define STRING_AFTER_DOT(str) (strchr("str", '.') + 1) #define STRING_AFTER_DOT(str) (strchr("str", '.') + 1)
#endif*/ #endif*/
/* /*
* Simplified macros to compare the server's version with a * Simplified macros to compare the server's version with a
* specified version * specified version
* Note: Never pass a variable as the second parameter. * Note: Never pass a variable as the second parameter.
* It must be a decimal constant of the form %d.%d . * It must be a decimal constant of the form %d.%d .
*/ */
#define PG_VERSION_GT(conn, ver) \ #define PG_VERSION_GT(conn, ver) \
(SERVER_VERSION_GT(conn, (int) ver, atoi(STRING_AFTER_DOT(ver)))) (SERVER_VERSION_GT(conn, (int) ver, atoi(STRING_AFTER_DOT(ver))))
@ -184,10 +200,9 @@ typedef struct
#define PG_VERSION_LT(conn, ver) (! PG_VERSION_GE(conn, ver)) #define PG_VERSION_LT(conn, ver) (! PG_VERSION_GE(conn, ver))
/* This is used to store cached table information in the connection */ /* This is used to store cached table information in the connection */
struct col_info struct col_info {
{ QResultClass *result;
QResultClass *result; char name[MAX_TABLE_LEN+1];
char name[MAX_TABLE_LEN + 1];
}; };
/* Translation DLL entry points */ /* Translation DLL entry points */
@ -199,95 +214,89 @@ struct col_info
#define HINSTANCE void * #define HINSTANCE void *
#endif #endif
typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD, typedef BOOL (FAR WINAPI *DataSourceToDriverProc) (UDWORD,
SWORD, SWORD,
PTR, PTR,
SDWORD, SDWORD,
PTR, PTR,
SDWORD, SDWORD,
SDWORD FAR *, SDWORD FAR *,
UCHAR FAR *, UCHAR FAR *,
SWORD, SWORD,
SWORD FAR *); SWORD FAR *);
typedef BOOL (FAR WINAPI * DriverToDataSourceProc) (UDWORD, typedef BOOL (FAR WINAPI *DriverToDataSourceProc) (UDWORD,
SWORD, SWORD,
PTR, PTR,
SDWORD, SDWORD,
PTR, PTR,
SDWORD, SDWORD,
SDWORD FAR *, SDWORD FAR *,
UCHAR FAR *, UCHAR FAR *,
SWORD, SWORD,
SWORD FAR *); SWORD FAR *);
/******* The Connection handle ************/ /******* The Connection handle ************/
struct ConnectionClass_ struct ConnectionClass_ {
{ HENV henv; /* environment this connection was created on */
HENV henv; /* environment this connection was created
* on */
StatementOptions stmtOptions; StatementOptions stmtOptions;
char *errormsg; char *errormsg;
int errornumber; int errornumber;
CONN_Status status; CONN_Status status;
ConnInfo connInfo; ConnInfo connInfo;
StatementClass **stmts; StatementClass **stmts;
int num_stmts; int num_stmts;
SocketClass *sock; SocketClass *sock;
int lobj_type; int lobj_type;
int ntables; int ntables;
COL_INFO **col_info; COL_INFO **col_info;
long translation_option; long translation_option;
HINSTANCE translation_handle; HINSTANCE translation_handle;
DataSourceToDriverProc DataSourceToDriver; DataSourceToDriverProc DataSourceToDriver;
DriverToDataSourceProc DriverToDataSource; DriverToDataSourceProc DriverToDataSource;
char transact_status;/* Is a transaction is currently in char transact_status; /* Is a transaction is currently in progress */
* progress */ char errormsg_created; /* has an informative error msg been created? */
char errormsg_created; /* has an informative error msg char pg_version[MAX_INFO_STRING]; /* Version of PostgreSQL we're connected to - DJP 25-1-2001 */
* been created? */ float pg_version_number;
char pg_version[MAX_INFO_STRING]; /* Version of PostgreSQL Int2 pg_version_major;
* we're connected to - Int2 pg_version_minor;
* DJP 25-1-2001 */
float pg_version_number;
Int2 pg_version_major;
Int2 pg_version_minor;
}; };
/* Accessor functions */ /* Accessor functions */
#define CC_get_socket(x) (x->sock) #define CC_get_socket(x) (x->sock)
#define CC_get_database(x) (x->connInfo.database) #define CC_get_database(x) (x->connInfo.database)
#define CC_get_server(x) (x->connInfo.server) #define CC_get_server(x) (x->connInfo.server)
#define CC_get_DSN(x) (x->connInfo.dsn) #define CC_get_DSN(x) (x->connInfo.dsn)
#define CC_get_username(x) (x->connInfo.username) #define CC_get_username(x) (x->connInfo.username)
#define CC_is_onlyread(x) (x->connInfo.onlyread[0] == '1') #define CC_is_onlyread(x) (x->connInfo.onlyread[0] == '1')
/* for CC_DSN_info */ /* for CC_DSN_info */
#define CONN_DONT_OVERWRITE 0 #define CONN_DONT_OVERWRITE 0
#define CONN_OVERWRITE 1 #define CONN_OVERWRITE 1
/* prototypes */ /* prototypes */
ConnectionClass *CC_Constructor(void); ConnectionClass *CC_Constructor(void);
char CC_Destructor(ConnectionClass *self); char CC_Destructor(ConnectionClass *self);
int CC_cursor_count(ConnectionClass *self); int CC_cursor_count(ConnectionClass *self);
char CC_cleanup(ConnectionClass *self); char CC_cleanup(ConnectionClass *self);
char CC_abort(ConnectionClass *self); char CC_abort(ConnectionClass *self);
int CC_set_translation(ConnectionClass *self); int CC_set_translation (ConnectionClass *self);
char CC_connect(ConnectionClass *self, char do_password); char CC_connect(ConnectionClass *self, char do_password);
char CC_add_statement(ConnectionClass *self, StatementClass *stmt); char CC_add_statement(ConnectionClass *self, StatementClass *stmt);
char CC_remove_statement(ConnectionClass *self, StatementClass *stmt); char CC_remove_statement(ConnectionClass *self, StatementClass *stmt);
char CC_get_error(ConnectionClass *self, int *number, char **message); char CC_get_error(ConnectionClass *self, int *number, char **message);
QResultClass *CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi); QResultClass *CC_send_query(ConnectionClass *self, char *query, QueryInfo *qi);
void CC_clear_error(ConnectionClass *self); void CC_clear_error(ConnectionClass *self);
char *CC_create_errormsg(ConnectionClass *self); char *CC_create_errormsg(ConnectionClass *self);
int CC_send_function(ConnectionClass *conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *argv, int nargs); int CC_send_function(ConnectionClass *conn, int fnid, void *result_buf, int *actual_result_len, int result_is_int, LO_ARG *argv, int nargs);
char CC_send_settings(ConnectionClass *self); char CC_send_settings(ConnectionClass *self);
void CC_lookup_lo(ConnectionClass *conn); void CC_lookup_lo(ConnectionClass *conn);
void CC_lookup_pg_version(ConnectionClass *conn); void CC_lookup_pg_version(ConnectionClass *conn);
void CC_initialize_pg_version(ConnectionClass *conn); void CC_initialize_pg_version(ConnectionClass *conn);
void CC_log_error(char *func, char *desc, ConnectionClass *self); void CC_log_error(char *func, char *desc, ConnectionClass *self);
#endif #endif

1903
src/interfaces/odbc/convert.c
View File

File diff suppressed because it is too large Load Diff

57
src/interfaces/odbc/convert.h
View File

@ -1,9 +1,9 @@
/* File: convert.h /* File: convert.h
* *
* Description: See "convert.c" * Description: See "convert.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -13,39 +13,38 @@
#include "psqlodbc.h" #include "psqlodbc.h"
/* copy_and_convert results */ /* copy_and_convert results */
#define COPY_OK 0 #define COPY_OK 0
#define COPY_UNSUPPORTED_TYPE 1 #define COPY_UNSUPPORTED_TYPE 1
#define COPY_UNSUPPORTED_CONVERSION 2 #define COPY_UNSUPPORTED_CONVERSION 2
#define COPY_RESULT_TRUNCATED 3 #define COPY_RESULT_TRUNCATED 3
#define COPY_GENERAL_ERROR 4 #define COPY_GENERAL_ERROR 4
#define COPY_NO_DATA_FOUND 5 #define COPY_NO_DATA_FOUND 5
typedef struct typedef struct {
{ int m;
int m; int d;
int d; int y;
int y; int hh;
int hh; int mm;
int mm; int ss;
int ss;
} SIMPLE_TIME; } SIMPLE_TIME;
int copy_and_convert_field_bindinfo(StatementClass *stmt, Int4 field_type, void *value, int col); 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, int copy_and_convert_field(StatementClass *stmt, Int4 field_type, void *value, Int2 fCType,
PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue); PTR rgbValue, SDWORD cbValueMax, SDWORD *pcbValue);
int copy_statement_with_parameters(StatementClass *stmt); int copy_statement_with_parameters(StatementClass *stmt);
char *convert_escape(char *value); char *convert_escape(char *value);
char *convert_money(char *s); char *convert_money(char *s);
char parse_datetime(char *buf, SIMPLE_TIME *st); char parse_datetime(char *buf, SIMPLE_TIME *st);
int convert_linefeeds(char *s, char *dst, size_t max); int convert_linefeeds(char *s, char *dst, size_t max);
char *convert_special_chars(char *si, char *dst, int used); char *convert_special_chars(char *si, char *dst, int used);
int convert_pgbinary_to_char(char *value, char *rgbValue, int cbValueMax); 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_from_pgbinary(unsigned char *value, unsigned char *rgbValue, int cbValueMax);
int convert_to_pgbinary(unsigned char *in, char *out, int len); int convert_to_pgbinary(unsigned char *in, char *out, int len);
void encode(char *in, char *out); void encode(char *in, char *out);
void decode(char *in, char *out); void decode(char *in, char *out);
int convert_lo(StatementClass *stmt, void *value, Int2 fCType, PTR rgbValue, int convert_lo(StatementClass *stmt, void *value, Int2 fCType, PTR rgbValue,
SDWORD cbValueMax, SDWORD *pcbValue); SDWORD cbValueMax, SDWORD *pcbValue);

905
src/interfaces/odbc/dlg_specific.c
View File

File diff suppressed because it is too large Load Diff

125
src/interfaces/odbc/dlg_specific.h
View File

@ -1,9 +1,9 @@
/* File: dlg_specific.h /* File: dlg_specific.h
* *
* Description: See "dlg_specific.c" * Description: See "dlg_specific.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -31,50 +31,41 @@
/* INI File Stuff */ /* INI File Stuff */
#ifndef WIN32 #ifndef WIN32
#define ODBC_INI ".odbc.ini" # define ODBC_INI ".odbc.ini"
#ifdef ODBCINSTDIR # ifdef ODBCINSTDIR
#define ODBCINST_INI ODBCINSTDIR "/odbcinst.ini" # define ODBCINST_INI ODBCINSTDIR "/odbcinst.ini"
#else # else
#define ODBCINST_INI "/etc/odbcinst.ini" # define ODBCINST_INI "/etc/odbcinst.ini"
#warning "location of odbcinst.ini file defaulted to /etc" # warning "location of odbcinst.ini file defaulted to /etc"
#endif # endif
#else /* WIN32 */ #else /* WIN32 */
#define ODBC_INI "ODBC.INI" /* ODBC initialization file */ # define ODBC_INI "ODBC.INI" /* ODBC initialization file */
#define ODBCINST_INI "ODBCINST.INI" /* ODBC Installation file */ # define ODBCINST_INI "ODBCINST.INI" /* ODBC Installation file */
#endif /* WIN32 */ #endif /* WIN32 */
#define INI_DSN DBMS_NAME /* Name of default Datasource in #define INI_DSN DBMS_NAME /* Name of default Datasource in ini file (not used?) */
* ini file (not used?) */ #define INI_KDESC "Description" /* Data source description */
#define INI_KDESC "Description" /* Data source description */ #define INI_SERVER "Servername" /* Name of Server running the Postgres service */
#define INI_SERVER "Servername" /* Name of Server running #define INI_PORT "Port" /* Port on which the Postmaster is listening */
* the Postgres service */ #define INI_DATABASE "Database" /* Database Name */
#define INI_PORT "Port" /* Port on which the Postmaster is #define INI_USER "Username" /* Default User Name */
* listening */ #define INI_PASSWORD "Password" /* Default Password */
#define INI_DATABASE "Database" /* Database Name */ #define INI_DEBUG "Debug" /* Debug flag */
#define INI_USER "Username" /* Default User Name */ #define INI_FETCH "Fetch" /* Fetch Max Count */
#define INI_PASSWORD "Password" /* Default Password */ #define INI_SOCKET "Socket" /* Socket buffer size */
#define INI_DEBUG "Debug" /* Debug flag */ #define INI_READONLY "ReadOnly" /* Database is read only */
#define INI_FETCH "Fetch" /* Fetch Max Count */ #define INI_COMMLOG "CommLog" /* Communication to backend logging */
#define INI_SOCKET "Socket" /* Socket buffer size */ #define INI_PROTOCOL "Protocol" /* What protocol (6.2) */
#define INI_READONLY "ReadOnly" /* Database is read only */ #define INI_OPTIMIZER "Optimizer" /* Use backend genetic optimizer */
#define INI_COMMLOG "CommLog" /* Communication to backend #define INI_KSQO "Ksqo" /* Keyset query optimization */
* logging */ #define INI_CONNSETTINGS "ConnSettings" /* Anything to send to backend on successful connection */
#define INI_PROTOCOL "Protocol" /* What protocol (6.2) */ #define INI_UNIQUEINDEX "UniqueIndex" /* Recognize unique indexes */
#define INI_OPTIMIZER "Optimizer" /* Use backend genetic optimizer */ #define INI_UNKNOWNSIZES "UnknownSizes" /* How to handle unknown result set sizes */
#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 */
#define INI_CANCELASFREESTMT "CancelAsFreeStmt" #define INI_CANCELASFREESTMT "CancelAsFreeStmt"
#define INI_USEDECLAREFETCH "UseDeclareFetch" /* Use Declare/Fetch #define INI_USEDECLAREFETCH "UseDeclareFetch" /* Use Declare/Fetch cursors */
* cursors */
/* More ini stuff */ /* More ini stuff */
#define INI_TEXTASLONGVARCHAR "TextAsLongVarchar" #define INI_TEXTASLONGVARCHAR "TextAsLongVarchar"
@ -91,16 +82,15 @@
#define INI_PARSE "Parse" #define INI_PARSE "Parse"
#define INI_EXTRASYSTABLEPREFIXES "ExtraSysTablePrefixes" #define INI_EXTRASYSTABLEPREFIXES "ExtraSysTablePrefixes"
#define INI_TRANSLATIONNAME "TranslationName" #define INI_TRANSLATIONNAME "TranslationName"
#define INI_TRANSLATIONDLL "TranslationDLL" #define INI_TRANSLATIONDLL "TranslationDLL"
#define INI_TRANSLATIONOPTION "TranslationOption" #define INI_TRANSLATIONOPTION "TranslationOption"
/* Connection Defaults */ /* Connection Defaults */
#define DEFAULT_PORT "5432" #define DEFAULT_PORT "5432"
#define DEFAULT_READONLY 1 #define DEFAULT_READONLY 1
#define DEFAULT_PROTOCOL "6.4" /* the latest protocol is #define DEFAULT_PROTOCOL "6.4" /* the latest protocol is the default */
* the default */
#define DEFAULT_USEDECLAREFETCH 0 #define DEFAULT_USEDECLAREFETCH 0
#define DEFAULT_TEXTASLONGVARCHAR 1 #define DEFAULT_TEXTASLONGVARCHAR 1
#define DEFAULT_UNKNOWNSASLONGVARCHAR 0 #define DEFAULT_UNKNOWNSASLONGVARCHAR 0
@ -124,30 +114,29 @@
#define DEFAULT_EXTRASYSTABLEPREFIXES "dd_;" #define DEFAULT_EXTRASYSTABLEPREFIXES "dd_;"
/* prototypes */ /* prototypes */
void getGlobalDefaults(char *section, char *filename, char override); void getGlobalDefaults(char *section, char *filename, char override);
#ifdef WIN32 #ifdef WIN32
void SetDlgStuff(HWND hdlg, ConnInfo *ci); void SetDlgStuff(HWND hdlg, ConnInfo *ci);
void GetDlgStuff(HWND hdlg, ConnInfo *ci); void GetDlgStuff(HWND hdlg, ConnInfo *ci);
int CALLBACK driver_optionsProc(HWND hdlg, int CALLBACK driver_optionsProc(HWND hdlg,
WORD wMsg, WORD wMsg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam); LPARAM lParam);
int CALLBACK ds_optionsProc(HWND hdlg, int CALLBACK ds_optionsProc(HWND hdlg,
WORD wMsg, WORD wMsg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam); LPARAM lParam);
#endif /* WIN32 */
#endif /* WIN32 */ void updateGlobals(void);
void writeDSNinfo(ConnInfo *ci);
void updateGlobals(void); void getDSNdefaults(ConnInfo *ci);
void writeDSNinfo(ConnInfo *ci); void getDSNinfo(ConnInfo *ci, char overwrite);
void getDSNdefaults(ConnInfo *ci); void makeConnectString(char *connect_string, ConnInfo *ci);
void getDSNinfo(ConnInfo *ci, char overwrite); void copyAttributes(ConnInfo *ci, char *attribute, char *value);
void makeConnectString(char *connect_string, ConnInfo *ci);
void copyAttributes(ConnInfo *ci, char *attribute, char *value);
#endif #endif

359
src/interfaces/odbc/drvconn.c
View File

@ -1,13 +1,14 @@
/* Module: drvconn.c
/* Module: drvconn.c
* *
* Description: This module contains only routines related to * Description: This module contains only routines related to
* implementing SQLDriverConnect. * implementing SQLDriverConnect.
* *
* Classes: n/a * Classes: n/a
* *
* API functions: SQLDriverConnect * API functions: SQLDriverConnect
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -52,50 +53,45 @@
#include "dlg_specific.h" #include "dlg_specific.h"
/* prototypes */ /* prototypes */
void dconn_get_connect_attributes(UCHAR FAR *connect_string, ConnInfo *ci); void dconn_get_connect_attributes(UCHAR FAR *connect_string, ConnInfo *ci);
#ifdef WIN32 #ifdef WIN32
BOOL FAR PASCAL dconn_FDriverConnectProc(HWND hdlg, UINT wMsg, WPARAM wParam, LPARAM lParam); BOOL FAR PASCAL dconn_FDriverConnectProc(HWND hdlg, UINT wMsg, WPARAM wParam, LPARAM lParam);
RETCODE dconn_DoDialog(HWND hwnd, ConnInfo *ci); RETCODE dconn_DoDialog(HWND hwnd, ConnInfo *ci);
extern HINSTANCE NEAR s_hModule;/* Saved module handle. */
extern HINSTANCE NEAR s_hModule; /* Saved module handle. */
#endif #endif
extern GLOBAL_VALUES globals; extern GLOBAL_VALUES globals;
RETCODE SQL_API RETCODE SQL_API SQLDriverConnect(
SQLDriverConnect( HDBC hdbc,
HDBC hdbc, HWND hwnd,
HWND hwnd, UCHAR FAR *szConnStrIn,
UCHAR FAR *szConnStrIn, SWORD cbConnStrIn,
SWORD cbConnStrIn, UCHAR FAR *szConnStrOut,
UCHAR FAR *szConnStrOut, SWORD cbConnStrOutMax,
SWORD cbConnStrOutMax, SWORD FAR *pcbConnStrOut,
SWORD FAR *pcbConnStrOut, UWORD fDriverCompletion)
UWORD fDriverCompletion)
{ {
static char *func = "SQLDriverConnect"; static char *func = "SQLDriverConnect";
ConnectionClass *conn = (ConnectionClass *) hdbc; ConnectionClass *conn = (ConnectionClass *) hdbc;
ConnInfo *ci; ConnInfo *ci;
#ifdef WIN32 #ifdef WIN32
RETCODE dialog_result; RETCODE dialog_result;
#endif #endif
RETCODE result; RETCODE result;
char connStrIn[MAX_CONNECT_STRING]; char connStrIn[MAX_CONNECT_STRING];
char connStrOut[MAX_CONNECT_STRING]; char connStrOut[MAX_CONNECT_STRING];
int retval; int retval;
char password_required = FALSE; char password_required = FALSE;
int len = 0; int len = 0;
mylog("%s: entering...\n", func); mylog("%s: entering...\n", func);
if (!conn) if ( ! conn) {
{
CC_log_error(func, "", NULL); CC_log_error(func, "", NULL);
return SQL_INVALID_HANDLE; return SQL_INVALID_HANDLE;
} }
@ -107,17 +103,17 @@ SQLDriverConnect(
ci = &(conn->connInfo); ci = &(conn->connInfo);
/* Parse the connect string and fill in conninfo for this hdbc. */ /* Parse the connect string and fill in conninfo for this hdbc. */
dconn_get_connect_attributes(connStrIn, ci); dconn_get_connect_attributes(connStrIn, ci);
/* If the ConnInfo in the hdbc is missing anything, */ /* If the ConnInfo in the hdbc is missing anything, */
/* this function will fill them in from the registry (assuming */ /* this function will fill them in from the registry (assuming */
/* of course there is a DSN given -- if not, it does nothing!) */ /* of course there is a DSN given -- if not, it does nothing!) */
getDSNinfo(ci, CONN_DONT_OVERWRITE); getDSNinfo(ci, CONN_DONT_OVERWRITE);
/* Fill in any default parameters if they are not there. */ /* Fill in any default parameters if they are not there. */
getDSNdefaults(ci); getDSNdefaults(ci);
/* initialize pg_version */ /* initialize pg_version */
CC_initialize_pg_version(conn); CC_initialize_pg_version(conn);
#ifdef WIN32 #ifdef WIN32
@ -125,53 +121,51 @@ dialog:
#endif #endif
ci->focus_password = password_required; ci->focus_password = password_required;
switch (fDriverCompletion) switch(fDriverCompletion) {
{
#ifdef WIN32 #ifdef WIN32
case SQL_DRIVER_PROMPT: case SQL_DRIVER_PROMPT:
dialog_result = dconn_DoDialog(hwnd, ci);
if(dialog_result != SQL_SUCCESS) {
return dialog_result;
}
break;
case SQL_DRIVER_COMPLETE_REQUIRED:
/* Fall through */
case SQL_DRIVER_COMPLETE:
/* Password is not a required parameter. */
if( ci->username[0] == '\0' ||
ci->server[0] == '\0' ||
ci->database[0] == '\0' ||
ci->port[0] == '\0' ||
password_required) {
dialog_result = dconn_DoDialog(hwnd, ci); dialog_result = dconn_DoDialog(hwnd, ci);
if (dialog_result != SQL_SUCCESS) if(dialog_result != SQL_SUCCESS) {
return dialog_result; return dialog_result;
break;
case SQL_DRIVER_COMPLETE_REQUIRED:
/* Fall through */
case SQL_DRIVER_COMPLETE:
/* Password is not a required parameter. */
if (ci->username[0] == '\0' ||
ci->server[0] == '\0' ||
ci->database[0] == '\0' ||
ci->port[0] == '\0' ||
password_required)
{
dialog_result = dconn_DoDialog(hwnd, ci);
if (dialog_result != SQL_SUCCESS)
return dialog_result;
} }
break; }
break;
#else #else
case SQL_DRIVER_PROMPT: case SQL_DRIVER_PROMPT:
case SQL_DRIVER_COMPLETE: case SQL_DRIVER_COMPLETE:
case SQL_DRIVER_COMPLETE_REQUIRED: case SQL_DRIVER_COMPLETE_REQUIRED:
#endif #endif
case SQL_DRIVER_NOPROMPT: case SQL_DRIVER_NOPROMPT:
break; break;
} }
/* /* Password is not a required parameter unless authentication asks for it.
* Password is not a required parameter unless authentication asks for For now, I think it's better to just let the application ask over and over until
* it. For now, I think it's better to just let the application ask a password is entered (the user can always hit Cancel to get out)
* over and over until a password is entered (the user can always hit */
* Cancel to get out) if( ci->username[0] == '\0' ||
*/
if (ci->username[0] == '\0' ||
ci->server[0] == '\0' || ci->server[0] == '\0' ||
ci->database[0] == '\0' || ci->database[0] == '\0' ||
ci->port[0] == '\0') ci->port[0] == '\0') {
{
/* (password_required && ci->password[0] == '\0')) */ /* (password_required && ci->password[0] == '\0')) */
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
@ -180,16 +174,12 @@ dialog:
/* do the actual connect */ /* do the actual connect */
retval = CC_connect(conn, password_required); retval = CC_connect(conn, password_required);
if (retval < 0) if (retval < 0) { /* need a password */
{ /* need a password */ if (fDriverCompletion == SQL_DRIVER_NOPROMPT) {
if (fDriverCompletion == SQL_DRIVER_NOPROMPT)
{
CC_log_error(func, "Need password but Driver_NoPrompt", conn); CC_log_error(func, "Need password but Driver_NoPrompt", conn);
return SQL_ERROR; /* need a password but not allowed to return SQL_ERROR; /* need a password but not allowed to prompt so error */
* prompt so error */
} }
else else {
{
#ifdef WIN32 #ifdef WIN32
password_required = TRUE; password_required = TRUE;
goto dialog; goto dialog;
@ -198,44 +188,39 @@ dialog:
#endif #endif
} }
} }
else if (retval == 0) else if (retval == 0) {
{ /* error msg filled in above */
/* error msg filled in above */
CC_log_error(func, "Error from CC_Connect", conn); CC_log_error(func, "Error from CC_Connect", conn);
return SQL_ERROR; return SQL_ERROR;
} }
/*********************************************/ /*********************************************/
/* Create the Output Connection String */ /* Create the Output Connection String */
/*********************************************/ /*********************************************/
result = SQL_SUCCESS; result = SQL_SUCCESS;
makeConnectString(connStrOut, ci); makeConnectString(connStrOut, ci);
len = strlen(connStrOut); len = strlen(connStrOut);
if (szConnStrOut) if(szConnStrOut) {
{
/* /* Return the completed string to the caller. The correct method is to
* Return the completed string to the caller. The correct method only construct the connect string if a dialog was put up, otherwise,
* is to only construct the connect string if a dialog was put up, it should just copy the connection input string to the output.
* otherwise, it should just copy the connection input string to However, it seems ok to just always construct an output string. There
* the output. However, it seems ok to just always construct an are possible bad side effects on working applications (Access) by
* output string. There are possible bad side effects on working implementing the correct behavior, anyway.
* applications (Access) by implementing the correct behavior, */
* anyway.
*/
strncpy_null(szConnStrOut, connStrOut, cbConnStrOutMax); strncpy_null(szConnStrOut, connStrOut, cbConnStrOutMax);
if (len >= cbConnStrOutMax) if (len >= cbConnStrOutMax) {
{
result = SQL_SUCCESS_WITH_INFO; result = SQL_SUCCESS_WITH_INFO;
conn->errornumber = CONN_TRUNCATED; conn->errornumber = CONN_TRUNCATED;
conn->errormsg = "The buffer was too small for the result."; conn->errormsg = "The buffer was too small for the result.";
} }
} }
if (pcbConnStrOut) if(pcbConnStrOut)
*pcbConnStrOut = len; *pcbConnStrOut = len;
mylog("szConnStrOut = '%s'\n", szConnStrOut); mylog("szConnStrOut = '%s'\n", szConnStrOut);
@ -247,117 +232,108 @@ dialog:
} }
#ifdef WIN32 #ifdef WIN32
RETCODE RETCODE dconn_DoDialog(HWND hwnd, ConnInfo *ci)
dconn_DoDialog(HWND hwnd, ConnInfo *ci)
{ {
int dialog_result; int dialog_result;
mylog("dconn_DoDialog: ci = %u\n", ci); mylog("dconn_DoDialog: ci = %u\n", ci);
if (hwnd) if(hwnd) {
{
dialog_result = DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_CONFIG), dialog_result = DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_CONFIG),
hwnd, dconn_FDriverConnectProc, (LPARAM) ci); hwnd, dconn_FDriverConnectProc, (LPARAM) ci);
if (!dialog_result || (dialog_result == -1)) if(!dialog_result || (dialog_result == -1)) {
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
else } else {
return SQL_SUCCESS; return SQL_SUCCESS;
}
} }
return SQL_ERROR; return SQL_ERROR;
} }
BOOL FAR PASCAL BOOL FAR PASCAL dconn_FDriverConnectProc(
dconn_FDriverConnectProc( HWND hdlg,
HWND hdlg, UINT wMsg,
UINT wMsg, WPARAM wParam,
WPARAM wParam, LPARAM lParam)
LPARAM lParam)
{ {
ConnInfo *ci; ConnInfo *ci;
switch (wMsg) switch (wMsg) {
{ case WM_INITDIALOG:
case WM_INITDIALOG: ci = (ConnInfo *) lParam;
ci = (ConnInfo *) lParam;
/* Change the caption for the setup dialog */ /* Change the caption for the setup dialog */
SetWindowText(hdlg, "PostgreSQL Connection"); SetWindowText(hdlg, "PostgreSQL Connection");
SetWindowText(GetDlgItem(hdlg, IDC_DATASOURCE), "Connection"); SetWindowText(GetDlgItem(hdlg, IDC_DATASOURCE), "Connection");
/* Hide the DSN and description fields */ /* Hide the DSN and description fields */
ShowWindow(GetDlgItem(hdlg, IDC_DSNAMETEXT), SW_HIDE); ShowWindow(GetDlgItem(hdlg, IDC_DSNAMETEXT), SW_HIDE);
ShowWindow(GetDlgItem(hdlg, IDC_DSNAME), SW_HIDE); ShowWindow(GetDlgItem(hdlg, IDC_DSNAME), SW_HIDE);
ShowWindow(GetDlgItem(hdlg, IDC_DESCTEXT), SW_HIDE); ShowWindow(GetDlgItem(hdlg, IDC_DESCTEXT), SW_HIDE);
ShowWindow(GetDlgItem(hdlg, IDC_DESC), SW_HIDE); ShowWindow(GetDlgItem(hdlg, IDC_DESC), SW_HIDE);
SetWindowLong(hdlg, DWL_USER, lParam); /* Save the ConnInfo for SetWindowLong(hdlg, DWL_USER, lParam);/* Save the ConnInfo for the "OK" */
* the "OK" */
SetDlgStuff(hdlg, ci); SetDlgStuff(hdlg, ci);
if (ci->database[0] == '\0') if (ci->database[0] == '\0')
; /* default focus */ ; /* default focus */
else if (ci->server[0] == '\0') else if (ci->server[0] == '\0')
SetFocus(GetDlgItem(hdlg, IDC_SERVER)); SetFocus(GetDlgItem(hdlg, IDC_SERVER));
else if (ci->port[0] == '\0') else if (ci->port[0] == '\0')
SetFocus(GetDlgItem(hdlg, IDC_PORT)); SetFocus(GetDlgItem(hdlg, IDC_PORT));
else if (ci->username[0] == '\0') else if (ci->username[0] == '\0')
SetFocus(GetDlgItem(hdlg, IDC_USER)); SetFocus(GetDlgItem(hdlg, IDC_USER));
else if (ci->focus_password) else if (ci->focus_password)
SetFocus(GetDlgItem(hdlg, IDC_PASSWORD)); SetFocus(GetDlgItem(hdlg, IDC_PASSWORD));
break;
case WM_COMMAND:
switch (GET_WM_COMMAND_ID(wParam, lParam)) {
case IDOK:
ci = (ConnInfo *) GetWindowLong(hdlg, DWL_USER);
GetDlgStuff(hdlg, ci);
case IDCANCEL:
EndDialog(hdlg, GET_WM_COMMAND_ID(wParam, lParam) == IDOK);
return TRUE;
case IDC_DRIVER:
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV),
hdlg, driver_optionsProc, (LPARAM) NULL);
break; break;
case WM_COMMAND: case IDC_DATASOURCE:
switch (GET_WM_COMMAND_ID(wParam, lParam))
{
case IDOK:
ci = (ConnInfo *) GetWindowLong(hdlg, DWL_USER); ci = (ConnInfo *) GetWindowLong(hdlg, DWL_USER);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DS),
hdlg, ds_optionsProc, (LPARAM) ci);
GetDlgStuff(hdlg, ci); break;
}
case IDCANCEL:
EndDialog(hdlg, GET_WM_COMMAND_ID(wParam, lParam) == IDOK);
return TRUE;
case IDC_DRIVER:
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV),
hdlg, driver_optionsProc, (LPARAM) NULL);
break;
case IDC_DATASOURCE:
ci = (ConnInfo *) GetWindowLong(hdlg, DWL_USER);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DS),
hdlg, ds_optionsProc, (LPARAM) ci);
break;
}
} }
return FALSE; return FALSE;
} }
#endif /* WIN32 */ #endif /* WIN32 */
void void dconn_get_connect_attributes(UCHAR FAR *connect_string, ConnInfo *ci)
dconn_get_connect_attributes(UCHAR FAR *connect_string, ConnInfo *ci)
{ {
char *our_connect_string; char *our_connect_string;
char *pair, char *pair, *attribute, *value, *equals;
*attribute, char *strtok_arg;
*value,
*equals;
char *strtok_arg;
memset(ci, 0, sizeof(ConnInfo)); memset(ci, 0, sizeof(ConnInfo));
@ -366,31 +342,34 @@ dconn_get_connect_attributes(UCHAR FAR *connect_string, ConnInfo *ci)
mylog("our_connect_string = '%s'\n", our_connect_string); mylog("our_connect_string = '%s'\n", our_connect_string);
while (1) while(1) {
{
pair = strtok(strtok_arg, ";"); pair = strtok(strtok_arg, ";");
if (strtok_arg) if(strtok_arg) {
strtok_arg = 0; strtok_arg = 0;
if (!pair) }
if(!pair) {
break; break;
}
equals = strchr(pair, '='); equals = strchr(pair, '=');
if (!equals) if ( ! equals)
continue; continue;
*equals = '\0'; *equals = '\0';
attribute = pair; /* ex. DSN */ attribute = pair; /* ex. DSN */
value = equals + 1; /* ex. 'CEO co1' */ value = equals + 1; /* ex. 'CEO co1' */
mylog("attribute = '%s', value = '%s'\n", attribute, value); mylog("attribute = '%s', value = '%s'\n", attribute, value);
if (!attribute || !value) if( !attribute || !value)
continue; continue;
/* Copy the appropriate value to the conninfo */ /* Copy the appropriate value to the conninfo */
copyAttributes(ci, attribute, value); copyAttributes(ci, attribute, value);
} }
free(our_connect_string); free(our_connect_string);
} }

655
src/interfaces/odbc/environ.c
View File

@ -1,14 +1,15 @@
/* Module: environ.c
/* Module: environ.c
* *
* Description: This module contains routines related to * Description: This module contains routines related to
* the environment, such as storing connection handles, * the environment, such as storing connection handles,
* and returning errors. * and returning errors.
* *
* Classes: EnvironmentClass (Functions prefix: "EN_") * Classes: EnvironmentClass (Functions prefix: "EN_")
* *
* API functions: SQLAllocEnv, SQLFreeEnv, SQLError * API functions: SQLAllocEnv, SQLFreeEnv, SQLError
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -22,16 +23,14 @@
ConnectionClass *conns[MAX_CONNECTIONS]; ConnectionClass *conns[MAX_CONNECTIONS];
RETCODE SQL_API RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv)
SQLAllocEnv(HENV FAR *phenv)
{ {
static char *func = "SQLAllocEnv"; static char *func = "SQLAllocEnv";
mylog("**** in SQLAllocEnv ** \n"); mylog("**** in SQLAllocEnv ** \n");
*phenv = (HENV) EN_Constructor(); *phenv = (HENV) EN_Constructor();
if (!*phenv) if ( ! *phenv) {
{
*phenv = SQL_NULL_HENV; *phenv = SQL_NULL_HENV;
EN_log_error(func, "Error allocating environment", NULL); EN_log_error(func, "Error allocating environment", NULL);
return SQL_ERROR; return SQL_ERROR;
@ -41,16 +40,14 @@ SQLAllocEnv(HENV FAR *phenv)
return SQL_SUCCESS; return SQL_SUCCESS;
} }
RETCODE SQL_API RETCODE SQL_API SQLFreeEnv(HENV henv)
SQLFreeEnv(HENV henv)
{ {
static char *func = "SQLFreeEnv"; static char *func = "SQLFreeEnv";
EnvironmentClass *env = (EnvironmentClass *) henv; EnvironmentClass *env = (EnvironmentClass *) henv;
mylog("**** in SQLFreeEnv: env = %u ** \n", env); mylog("**** in SQLFreeEnv: env = %u ** \n", env);
if (env && EN_Destructor(env)) if (env && EN_Destructor(env)) {
{
mylog(" ok\n"); mylog(" ok\n");
return SQL_SUCCESS; return SQL_SUCCESS;
} }
@ -60,345 +57,321 @@ SQLFreeEnv(HENV henv)
return SQL_ERROR; return SQL_ERROR;
} }
/* Returns the next SQL error information. */ /* Returns the next SQL error information. */
RETCODE SQL_API RETCODE SQL_API SQLError(
SQLError( HENV henv,
HENV henv, HDBC hdbc,
HDBC hdbc, HSTMT hstmt,
HSTMT hstmt, UCHAR FAR *szSqlState,
UCHAR FAR *szSqlState, SDWORD FAR *pfNativeError,
SDWORD FAR *pfNativeError, UCHAR FAR *szErrorMsg,
UCHAR FAR *szErrorMsg, SWORD cbErrorMsgMax,
SWORD cbErrorMsgMax, SWORD FAR *pcbErrorMsg)
SWORD FAR *pcbErrorMsg)
{ {
char *msg; char *msg;
int status; int status;
mylog("**** SQLError: henv=%u, hdbc=%u, hstmt=%u\n", henv, hdbc, hstmt); mylog("**** SQLError: henv=%u, hdbc=%u, hstmt=%u\n", henv, hdbc, hstmt);
if (SQL_NULL_HSTMT != hstmt) if (SQL_NULL_HSTMT != hstmt) {
{ /* CC: return an error of a hstmt */
/* CC: return an error of a hstmt */ StatementClass *stmt = (StatementClass *) hstmt;
StatementClass *stmt = (StatementClass *) hstmt;
if (SC_get_error(stmt, &status, &msg)) if (SC_get_error(stmt, &status, &msg)) {
{
mylog("SC_get_error: status = %d, msg = #%s#\n", status, msg); mylog("SC_get_error: status = %d, msg = #%s#\n", status, msg);
if (NULL == msg) if (NULL == msg) {
{ if (NULL != szSqlState)
if (NULL != szSqlState) strcpy(szSqlState, "00000");
strcpy(szSqlState, "00000"); if (NULL != pcbErrorMsg)
if (NULL != pcbErrorMsg) *pcbErrorMsg = 0;
*pcbErrorMsg = 0; if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) szErrorMsg[0] = '\0';
szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
if (NULL != pcbErrorMsg) if (NULL != pcbErrorMsg)
*pcbErrorMsg = (SWORD) strlen(msg); *pcbErrorMsg = (SWORD)strlen(msg);
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
strncpy_null(szErrorMsg, msg, cbErrorMsgMax); strncpy_null(szErrorMsg, msg, cbErrorMsgMax);
if (NULL != pfNativeError) if (NULL != pfNativeError)
*pfNativeError = status; *pfNativeError = status;
if (NULL != szSqlState) if (NULL != szSqlState)
switch (status) switch (status) {
{ /* now determine the SQLSTATE to be returned */
/* now determine the SQLSTATE to be returned */ case STMT_TRUNCATED:
case STMT_TRUNCATED: strcpy(szSqlState, "01004");
strcpy(szSqlState, "01004"); /* data truncated */
/* data truncated */ break;
break; case STMT_INFO_ONLY:
case STMT_INFO_ONLY: strcpy(szSqlState, "00000");
strcpy(szSqlState, "00000"); /* just information that is returned, no error */
/* just information that is returned, no error */ break;
break; case STMT_BAD_ERROR:
case STMT_BAD_ERROR: strcpy(szSqlState, "08S01");
strcpy(szSqlState, "08S01"); /* communication link failure */
/* communication link failure */ break;
break; case STMT_CREATE_TABLE_ERROR:
case STMT_CREATE_TABLE_ERROR: strcpy(szSqlState, "S0001");
strcpy(szSqlState, "S0001"); /* table already exists */
/* table already exists */ break;
break; case STMT_STATUS_ERROR:
case STMT_STATUS_ERROR: case STMT_SEQUENCE_ERROR:
case STMT_SEQUENCE_ERROR: strcpy(szSqlState, "S1010");
strcpy(szSqlState, "S1010"); /* Function sequence error */
/* Function sequence error */ break;
break; case STMT_NO_MEMORY_ERROR:
case STMT_NO_MEMORY_ERROR: strcpy(szSqlState, "S1001");
strcpy(szSqlState, "S1001"); /* memory allocation failure */
/* memory allocation failure */ break;
break; case STMT_COLNUM_ERROR:
case STMT_COLNUM_ERROR: strcpy(szSqlState, "S1002");
strcpy(szSqlState, "S1002"); /* invalid column number */
/* invalid column number */ break;
break; case STMT_NO_STMTSTRING:
case STMT_NO_STMTSTRING: strcpy(szSqlState, "S1001");
strcpy(szSqlState, "S1001"); /* having no stmtstring is also a malloc problem */
/* having no stmtstring is also a malloc problem */ break;
break; case STMT_ERROR_TAKEN_FROM_BACKEND:
case STMT_ERROR_TAKEN_FROM_BACKEND: strcpy(szSqlState, "S1000");
strcpy(szSqlState, "S1000"); /* general error */
/* general error */ break;
break; case STMT_INTERNAL_ERROR:
case STMT_INTERNAL_ERROR: strcpy(szSqlState, "S1000");
strcpy(szSqlState, "S1000"); /* general error */
/* general error */ break;
break; case STMT_ROW_OUT_OF_RANGE:
case STMT_ROW_OUT_OF_RANGE: strcpy(szSqlState, "S1107");
strcpy(szSqlState, "S1107"); break;
break;
case STMT_OPERATION_CANCELLED: case STMT_OPERATION_CANCELLED:
strcpy(szSqlState, "S1008"); strcpy(szSqlState, "S1008");
break; break;
case STMT_NOT_IMPLEMENTED_ERROR: case STMT_NOT_IMPLEMENTED_ERROR:
strcpy(szSqlState, "S1C00"); /* == 'driver not strcpy(szSqlState, "S1C00"); /* == 'driver not capable' */
* capable' */ break;
break; case STMT_OPTION_OUT_OF_RANGE_ERROR:
case STMT_OPTION_OUT_OF_RANGE_ERROR: strcpy(szSqlState, "S1092");
strcpy(szSqlState, "S1092"); break;
break; case STMT_BAD_PARAMETER_NUMBER_ERROR:
case STMT_BAD_PARAMETER_NUMBER_ERROR: strcpy(szSqlState, "S1093");
strcpy(szSqlState, "S1093"); break;
break; case STMT_INVALID_COLUMN_NUMBER_ERROR:
case STMT_INVALID_COLUMN_NUMBER_ERROR: strcpy(szSqlState, "S1002");
strcpy(szSqlState, "S1002"); break;
break; case STMT_RESTRICTED_DATA_TYPE_ERROR:
case STMT_RESTRICTED_DATA_TYPE_ERROR: strcpy(szSqlState, "07006");
strcpy(szSqlState, "07006"); break;
break; case STMT_INVALID_CURSOR_STATE_ERROR:
case STMT_INVALID_CURSOR_STATE_ERROR: strcpy(szSqlState, "24000");
strcpy(szSqlState, "24000"); break;
break; case STMT_OPTION_VALUE_CHANGED:
case STMT_OPTION_VALUE_CHANGED: strcpy(szSqlState, "01S02");
strcpy(szSqlState, "01S02"); break;
break; case STMT_INVALID_CURSOR_NAME:
case STMT_INVALID_CURSOR_NAME: strcpy(szSqlState, "34000");
strcpy(szSqlState, "34000"); break;
break; case STMT_NO_CURSOR_NAME:
case STMT_NO_CURSOR_NAME: strcpy(szSqlState, "S1015");
strcpy(szSqlState, "S1015"); break;
break; case STMT_INVALID_ARGUMENT_NO:
case STMT_INVALID_ARGUMENT_NO: strcpy(szSqlState, "S1009");
strcpy(szSqlState, "S1009"); /* invalid argument value */
/* invalid argument value */ break;
break; case STMT_INVALID_CURSOR_POSITION:
case STMT_INVALID_CURSOR_POSITION: strcpy(szSqlState, "S1109");
strcpy(szSqlState, "S1109"); break;
break;
case STMT_VALUE_OUT_OF_RANGE: case STMT_VALUE_OUT_OF_RANGE:
strcpy(szSqlState, "22003"); strcpy(szSqlState, "22003");
break; break;
case STMT_OPERATION_INVALID: case STMT_OPERATION_INVALID:
strcpy(szSqlState, "S1011"); strcpy(szSqlState, "S1011");
break; break;
case STMT_EXEC_ERROR: case STMT_EXEC_ERROR:
default: default:
strcpy(szSqlState, "S1000"); strcpy(szSqlState, "S1000");
/* also a general error */ /* also a general error */
break; break;
} }
mylog(" szSqlState = '%s', szError='%s'\n", szSqlState, szErrorMsg); mylog(" szSqlState = '%s', szError='%s'\n", szSqlState, szErrorMsg);
}
else } else {
{ if (NULL != szSqlState)
if (NULL != szSqlState) strcpy(szSqlState, "00000");
strcpy(szSqlState, "00000"); if (NULL != pcbErrorMsg)
if (NULL != pcbErrorMsg) *pcbErrorMsg = 0;
*pcbErrorMsg = 0; if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) szErrorMsg[0] = '\0';
szErrorMsg[0] = '\0';
mylog(" returning NO_DATA_FOUND\n"); mylog(" returning NO_DATA_FOUND\n");
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
return SQL_SUCCESS; return SQL_SUCCESS;
}
else if (SQL_NULL_HDBC != hdbc) } else if (SQL_NULL_HDBC != hdbc) {
{ ConnectionClass *conn = (ConnectionClass *) hdbc;
ConnectionClass *conn = (ConnectionClass *) hdbc;
mylog("calling CC_get_error\n"); mylog("calling CC_get_error\n");
if (CC_get_error(conn, &status, &msg)) if (CC_get_error(conn, &status, &msg)) {
{
mylog("CC_get_error: status = %d, msg = #%s#\n", status, msg); mylog("CC_get_error: status = %d, msg = #%s#\n", status, msg);
if (NULL == msg) if (NULL == msg) {
{ if (NULL != szSqlState)
if (NULL != szSqlState) strcpy(szSqlState, "00000");
strcpy(szSqlState, "00000"); if (NULL != pcbErrorMsg)
if (NULL != pcbErrorMsg) *pcbErrorMsg = 0;
*pcbErrorMsg = 0; if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) szErrorMsg[0] = '\0';
szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
if (NULL != pcbErrorMsg) if (NULL != pcbErrorMsg)
*pcbErrorMsg = (SWORD) strlen(msg); *pcbErrorMsg = (SWORD)strlen(msg);
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
strncpy_null(szErrorMsg, msg, cbErrorMsgMax); strncpy_null(szErrorMsg, msg, cbErrorMsgMax);
if (NULL != pfNativeError) if (NULL != pfNativeError)
*pfNativeError = status; *pfNativeError = status;
if (NULL != szSqlState) if (NULL != szSqlState)
switch (status) switch(status) {
{ case STMT_OPTION_VALUE_CHANGED:
case STMT_OPTION_VALUE_CHANGED: case CONN_OPTION_VALUE_CHANGED:
case CONN_OPTION_VALUE_CHANGED: strcpy(szSqlState, "01S02");
strcpy(szSqlState, "01S02"); break;
break; case STMT_TRUNCATED:
case STMT_TRUNCATED: case CONN_TRUNCATED:
case CONN_TRUNCATED: strcpy(szSqlState, "01004");
strcpy(szSqlState, "01004"); /* data truncated */
/* data truncated */ break;
break; case CONN_INIREAD_ERROR:
case CONN_INIREAD_ERROR: strcpy(szSqlState, "IM002");
strcpy(szSqlState, "IM002"); /* data source not found */
/* data source not found */ break;
break; case CONN_OPENDB_ERROR:
case CONN_OPENDB_ERROR: strcpy(szSqlState, "08001");
strcpy(szSqlState, "08001"); /* unable to connect to data source */
/* unable to connect to data source */ break;
break; case CONN_INVALID_AUTHENTICATION:
case CONN_INVALID_AUTHENTICATION: case CONN_AUTH_TYPE_UNSUPPORTED:
case CONN_AUTH_TYPE_UNSUPPORTED: strcpy(szSqlState, "28000");
strcpy(szSqlState, "28000"); break;
break; case CONN_STMT_ALLOC_ERROR:
case CONN_STMT_ALLOC_ERROR: strcpy(szSqlState, "S1001");
strcpy(szSqlState, "S1001"); /* memory allocation failure */
/* memory allocation failure */ break;
break; case CONN_IN_USE:
case CONN_IN_USE: strcpy(szSqlState, "S1000");
strcpy(szSqlState, "S1000"); /* general error */
/* general error */ break;
break; case CONN_UNSUPPORTED_OPTION:
case CONN_UNSUPPORTED_OPTION: strcpy(szSqlState, "IM001");
strcpy(szSqlState, "IM001"); /* driver does not support this function */
/* driver does not support this function */ case CONN_INVALID_ARGUMENT_NO:
case CONN_INVALID_ARGUMENT_NO: strcpy(szSqlState, "S1009");
strcpy(szSqlState, "S1009"); /* invalid argument value */
/* invalid argument value */ break;
break; case CONN_TRANSACT_IN_PROGRES:
case CONN_TRANSACT_IN_PROGRES: strcpy(szSqlState, "S1010");
strcpy(szSqlState, "S1010"); /* when the user tries to switch commit mode in a transaction */
/* -> function sequence error */
break;
case CONN_NO_MEMORY_ERROR:
strcpy(szSqlState, "S1001");
break;
case CONN_NOT_IMPLEMENTED_ERROR:
case STMT_NOT_IMPLEMENTED_ERROR:
strcpy(szSqlState, "S1C00");
break;
/* case CONN_VALUE_OUT_OF_RANGE:
* when the user tries to switch commit mode in a case STMT_VALUE_OUT_OF_RANGE:
* transaction strcpy(szSqlState, "22003");
*/ break;
/* -> function sequence error */
break;
case CONN_NO_MEMORY_ERROR:
strcpy(szSqlState, "S1001");
break;
case CONN_NOT_IMPLEMENTED_ERROR:
case STMT_NOT_IMPLEMENTED_ERROR:
strcpy(szSqlState, "S1C00");
break;
case CONN_VALUE_OUT_OF_RANGE: default:
case STMT_VALUE_OUT_OF_RANGE: strcpy(szSqlState, "S1000");
strcpy(szSqlState, "22003"); /* general error */
break; break;
}
default: } else {
strcpy(szSqlState, "S1000");
/* general error */
break;
}
}
else
{
mylog("CC_Get_error returned nothing.\n"); mylog("CC_Get_error returned nothing.\n");
if (NULL != szSqlState) if (NULL != szSqlState)
strcpy(szSqlState, "00000"); strcpy(szSqlState, "00000");
if (NULL != pcbErrorMsg) if (NULL != pcbErrorMsg)
*pcbErrorMsg = 0; *pcbErrorMsg = 0;
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
szErrorMsg[0] = '\0'; szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
return SQL_SUCCESS; return SQL_SUCCESS;
}
else if (SQL_NULL_HENV != henv)
{
EnvironmentClass *env = (EnvironmentClass *) henv;
if (EN_get_error(env, &status, &msg)) } else if (SQL_NULL_HENV != henv) {
{ EnvironmentClass *env = (EnvironmentClass *)henv;
if(EN_get_error(env, &status, &msg)) {
mylog("EN_get_error: status = %d, msg = #%s#\n", status, msg); mylog("EN_get_error: status = %d, msg = #%s#\n", status, msg);
if (NULL == msg) if (NULL == msg) {
{ if (NULL != szSqlState)
if (NULL != szSqlState) strcpy(szSqlState, "00000");
strcpy(szSqlState, "00000"); if (NULL != pcbErrorMsg)
if (NULL != pcbErrorMsg) *pcbErrorMsg = 0;
*pcbErrorMsg = 0; if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) szErrorMsg[0] = '\0';
szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
if (NULL != pcbErrorMsg) if (NULL != pcbErrorMsg)
*pcbErrorMsg = (SWORD) strlen(msg); *pcbErrorMsg = (SWORD)strlen(msg);
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
strncpy_null(szErrorMsg, msg, cbErrorMsgMax); strncpy_null(szErrorMsg, msg, cbErrorMsgMax);
if (NULL != pfNativeError) if (NULL != pfNativeError)
*pfNativeError = status; *pfNativeError = status;
if (szSqlState) if(szSqlState) {
{ switch(status) {
switch (status) case ENV_ALLOC_ERROR:
{ /* memory allocation failure */
case ENV_ALLOC_ERROR: strcpy(szSqlState, "S1001");
/* memory allocation failure */ break;
strcpy(szSqlState, "S1001"); default:
break; strcpy(szSqlState, "S1000");
default: /* general error */
strcpy(szSqlState, "S1000"); break;
/* general error */ }
break; }
} } else {
} if (NULL != szSqlState)
} strcpy(szSqlState, "00000");
else if (NULL != pcbErrorMsg)
{ *pcbErrorMsg = 0;
if (NULL != szSqlState) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
strcpy(szSqlState, "00000"); szErrorMsg[0] = '\0';
if (NULL != pcbErrorMsg)
*pcbErrorMsg = 0;
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
return SQL_SUCCESS; return SQL_SUCCESS;
} }
if (NULL != szSqlState) if (NULL != szSqlState)
strcpy(szSqlState, "00000"); strcpy(szSqlState, "00000");
if (NULL != pcbErrorMsg) if (NULL != pcbErrorMsg)
*pcbErrorMsg = 0; *pcbErrorMsg = 0;
if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0)) if ((NULL != szErrorMsg) && (cbErrorMsgMax > 0))
szErrorMsg[0] = '\0'; szErrorMsg[0] = '\0';
return SQL_NO_DATA_FOUND; return SQL_NO_DATA_FOUND;
} }
@ -410,27 +383,25 @@ SQLError(
EnvironmentClass EnvironmentClass
* *EN_Constructor(void)
EN_Constructor(void)
{ {
EnvironmentClass *rv; EnvironmentClass *rv;
rv = (EnvironmentClass *) malloc(sizeof(EnvironmentClass)); rv = (EnvironmentClass *) malloc(sizeof(EnvironmentClass));
if (rv) if( rv) {
{
rv->errormsg = 0; rv->errormsg = 0;
rv->errornumber = 0; rv->errornumber = 0;
} }
return rv; return rv;
} }
char char
EN_Destructor(EnvironmentClass *self) EN_Destructor(EnvironmentClass *self)
{ {
int lf; int lf;
char rv = 1; char rv = 1;
mylog("in EN_Destructor, self=%u\n", self); mylog("in EN_Destructor, self=%u\n", self);
@ -438,8 +409,7 @@ EN_Destructor(EnvironmentClass *self)
/* the source--they should not be freed */ /* the source--they should not be freed */
/* Free any connections belonging to this environment */ /* Free any connections belonging to this environment */
for (lf = 0; lf < MAX_CONNECTIONS; lf++) for (lf = 0; lf < MAX_CONNECTIONS; lf++) {
{
if (conns[lf] && conns[lf]->henv == self) if (conns[lf] && conns[lf]->henv == self)
rv = rv && CC_Destructor(conns[lf]); rv = rv && CC_Destructor(conns[lf]);
} }
@ -451,29 +421,26 @@ EN_Destructor(EnvironmentClass *self)
char char
EN_get_error(EnvironmentClass *self, int *number, char **message) EN_get_error(EnvironmentClass *self, int *number, char **message)
{ {
if (self && self->errormsg && self->errornumber) if(self && self->errormsg && self->errornumber) {
{
*message = self->errormsg; *message = self->errormsg;
*number = self->errornumber; *number = self->errornumber;
self->errormsg = 0; self->errormsg = 0;
self->errornumber = 0; self->errornumber = 0;
return 1; return 1;
} } else {
else
return 0; return 0;
}
} }
char char
EN_add_connection(EnvironmentClass *self, ConnectionClass *conn) EN_add_connection(EnvironmentClass *self, ConnectionClass *conn)
{ {
int i; int i;
mylog("EN_add_connection: self = %u, conn = %u\n", self, conn); mylog("EN_add_connection: self = %u, conn = %u\n", self, conn);
for (i = 0; i < MAX_CONNECTIONS; i++) for (i = 0; i < MAX_CONNECTIONS; i++) {
{ if ( ! conns[i]) {
if (!conns[i])
{
conn->henv = self; conn->henv = self;
conns[i] = conn; conns[i] = conn;
@ -489,11 +456,10 @@ EN_add_connection(EnvironmentClass *self, ConnectionClass *conn)
char char
EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn) EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn)
{ {
int i; int i;
for (i = 0; i < MAX_CONNECTIONS; i++) for (i = 0; i < MAX_CONNECTIONS; i++)
if (conns[i] == conn && conns[i]->status != CONN_EXECUTING) if (conns[i] == conn && conns[i]->status != CONN_EXECUTING) {
{
conns[i] = NULL; conns[i] = NULL;
return TRUE; return TRUE;
} }
@ -504,8 +470,9 @@ EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn)
void void
EN_log_error(char *func, char *desc, EnvironmentClass *self) EN_log_error(char *func, char *desc, EnvironmentClass *self)
{ {
if (self) if (self) {
qlog("ENVIRON ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->errornumber, self->errormsg); qlog("ENVIRON ERROR: func=%s, desc='%s', errnum=%d, errmsg='%s'\n", func, desc, self->errornumber, self->errormsg);
}
else else
qlog("INVALID ENVIRON HANDLE ERROR: func=%s, desc='%s'\n", func, desc); qlog("INVALID ENVIRON HANDLE ERROR: func=%s, desc='%s'\n", func, desc);
} }

23
src/interfaces/odbc/environ.h
View File

@ -1,9 +1,9 @@
/* File: environ.h /* File: environ.h
* *
* Description: See "environ.c" * Description: See "environ.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -29,18 +29,17 @@
#define ENV_ALLOC_ERROR 1 #define ENV_ALLOC_ERROR 1
/********** Environment Handle *************/ /********** Environment Handle *************/
struct EnvironmentClass_ struct EnvironmentClass_ {
{ char *errormsg;
char *errormsg; int errornumber;
int errornumber;
}; };
/* Environment prototypes */ /* Environment prototypes */
EnvironmentClass *EN_Constructor(void); EnvironmentClass *EN_Constructor(void);
char EN_Destructor(EnvironmentClass *self); char EN_Destructor(EnvironmentClass *self);
char EN_get_error(EnvironmentClass *self, int *number, char **message); char EN_get_error(EnvironmentClass *self, int *number, char **message);
char EN_add_connection(EnvironmentClass *self, ConnectionClass *conn); char EN_add_connection(EnvironmentClass *self, ConnectionClass *conn);
char EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn); char EN_remove_connection(EnvironmentClass *self, ConnectionClass *conn);
void EN_log_error(char *func, char *desc, EnvironmentClass *self); void EN_log_error(char *func, char *desc, EnvironmentClass *self);
#endif #endif

605
src/interfaces/odbc/execute.c
View File

File diff suppressed because it is too large Load Diff

348
src/interfaces/odbc/gpps.c
View File

@ -13,7 +13,7 @@
#ifndef WIN32 #ifndef WIN32
#if HAVE_CONFIG_H #if HAVE_CONFIG_H
#include "config.h" /* produced by configure */ #include "config.h" /* produced by configure */
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -38,87 +38,83 @@
DWORD DWORD
GetPrivateProfileString(char *theSection, /* section name */ GetPrivateProfileString(char *theSection, /* section name */
char *theKey, /* search key name */ char *theKey, /* search key name */
char *theDefault, /* default value if not char *theDefault, /* default value if not found */
* found */ char *theReturnBuffer, /* return value stored here */
char *theReturnBuffer, /* return value stored size_t theReturnBufferLength, /* byte length of return buffer */
* here */ char *theIniFileName) /* pathname of ini file to search */
size_t theReturnBufferLength, /* byte length of return
* buffer */
char *theIniFileName) /* pathname of ini file to
* search */
{ {
char buf[MAXPGPATH]; char buf[MAXPGPATH];
char *ptr = 0; char* ptr = 0;
FILE *aFile = 0; FILE* aFile = 0;
size_t aLength; size_t aLength;
char aLine[2048]; char aLine[2048];
char *aValue; char *aValue;
char *aStart; char *aStart;
char *aString; char *aString;
size_t aLineLength; size_t aLineLength;
size_t aReturnLength = 0; size_t aReturnLength = 0;
BOOL aSectionFound = FALSE; BOOL aSectionFound = FALSE;
BOOL aKeyFound = FALSE; BOOL aKeyFound = FALSE;
int j = 0; int j = 0;
j = strlen(theIniFileName) + 1; j = strlen(theIniFileName) + 1;
ptr = (char *) getpwuid(getuid()); /* get user info */ ptr = (char*)getpwuid(getuid()); /* get user info */
if (ptr == NULL) if( ptr == NULL)
{ {
if (MAXPGPATH - 1 < j) if( MAXPGPATH-1 < j )
theIniFileName[MAXPGPATH - 1] = '\0'; theIniFileName[MAXPGPATH-1] = '\0';
sprintf(buf, "%s", theIniFileName); sprintf(buf,"%s",theIniFileName);
} }
ptr = ((struct passwd *) ptr)->pw_dir; /* get user home dir */ ptr = ((struct passwd*)ptr)->pw_dir; /* get user home dir */
if (ptr == NULL || *ptr == '\0') if( ptr == NULL || *ptr == '\0' )
ptr = "/home"; ptr = "/home";
/* /* This doesn't make it so we find an ini file but allows normal
* This doesn't make it so we find an ini file but allows normal * processing to continue further on down. The likelihood is that
* processing to continue further on down. The likelihood is that the * the file won't be found and thus the default value will be
* file won't be found and thus the default value will be returned. * returned.
*/ */
if (MAXPGPATH - 1 < strlen(ptr) + j) if( MAXPGPATH-1 < strlen(ptr) + j )
{ {
if (MAXPGPATH - 1 < strlen(ptr)) if( MAXPGPATH-1 < strlen(ptr) )
ptr[MAXPGPATH - 1] = '\0'; ptr[MAXPGPATH-1] = '\0';
else else
theIniFileName[MAXPGPATH - 1 - strlen(ptr)] = '\0'; theIniFileName[MAXPGPATH-1-strlen(ptr)] = '\0';
} }
sprintf(buf, "%s/%s", ptr, theIniFileName); sprintf( buf, "%s/%s",ptr,theIniFileName );
/* /* This code makes it so that a file in the users home dir
* This code makes it so that a file in the users home dir overrides a * overrides a the "default" file as passed in
* the "default" file as passed in */
*/ aFile = (FILE*)(buf ? fopen(buf, PG_BINARY_R) : NULL);
aFile = (FILE *) (buf ? fopen(buf, PG_BINARY_R) : NULL); if(!aFile) {
if (!aFile) sprintf(buf,"%s",theIniFileName);
{ aFile = (FILE*)(buf ? fopen(buf, PG_BINARY_R) : NULL);
sprintf(buf, "%s", theIniFileName);
aFile = (FILE *) (buf ? fopen(buf, PG_BINARY_R) : NULL);
} }
aLength = (theDefault == NULL) ? 0 : strlen(theDefault); aLength = (theDefault == NULL) ? 0 : strlen(theDefault);
if (theReturnBufferLength == 0 || theReturnBuffer == NULL) if(theReturnBufferLength == 0 || theReturnBuffer == NULL)
{ {
if (aFile) if(aFile)
{
fclose(aFile); fclose(aFile);
}
return 0; return 0;
} }
if (aFile == NULL) if(aFile == NULL)
{ {
/* no ini file specified, return the default */ /* no ini file specified, return the default */
++aLength; /* room for NULL char */ ++aLength; /* room for NULL char */
aLength = theReturnBufferLength < aLength ? aLength = theReturnBufferLength < aLength ?
theReturnBufferLength : aLength; theReturnBufferLength : aLength;
strncpy(theReturnBuffer, theDefault, aLength); strncpy(theReturnBuffer, theDefault, aLength);
@ -127,77 +123,86 @@ GetPrivateProfileString(char *theSection, /* section name */
} }
while (fgets(aLine, sizeof(aLine), aFile) != NULL) while(fgets(aLine, sizeof(aLine), aFile) != NULL)
{ {
aLineLength = strlen(aLine); aLineLength = strlen(aLine);
/* strip final '\n' */ /* strip final '\n' */
if (aLineLength > 0 && aLine[aLineLength - 1] == '\n') if(aLineLength > 0 && aLine[aLineLength - 1] == '\n')
aLine[aLineLength - 1] = '\0';
switch (*aLine)
{ {
case ' ': /* blank line */ aLine[aLineLength - 1] = '\0';
case ';': /* comment line */ }
switch(*aLine)
{
case ' ': /* blank line */
case ';': /* comment line */
continue; continue;
break; break;
case '[': /* section marker */ case '[': /* section marker */
if ((aString = strchr(aLine, ']'))) if( (aString = strchr(aLine, ']')) )
{ {
aStart = aLine + 1; aStart = aLine + 1;
aString--; aString--;
while (isspace((unsigned char) *aStart)) while (isspace((unsigned char) *aStart)) aStart++;
aStart++; while (isspace((unsigned char) *aString)) aString--;
while (isspace((unsigned char) *aString)) *(aString+1) = '\0';
aString--;
*(aString + 1) = '\0';
/* accept as matched if NULL key or exact match */ /* accept as matched if NULL key or exact match */
if (!theSection || !strcmp(aStart, theSection)) if(!theSection || !strcmp(aStart, theSection))
{
aSectionFound = TRUE; aSectionFound = TRUE;
}
} }
break; break;
default: default:
/* try to match value keys if in proper section */ /* try to match value keys if in proper section */
if (aSectionFound) if(aSectionFound)
{ {
/* try to match requested key */ /* try to match requested key */
if ((aString = aValue = strchr(aLine, '='))) if( (aString = aValue = strchr(aLine, '=')) )
{ {
*aValue = '\0'; *aValue = '\0';
++aValue; ++aValue;
/* strip leading blanks in value field */ /* strip leading blanks in value field */
while (*aValue == ' ' && aValue < aLine + sizeof(aLine)) while(*aValue == ' ' && aValue < aLine + sizeof(aLine))
{
*aValue++ = '\0'; *aValue++ = '\0';
if (aValue >= aLine + sizeof(aLine)) }
if(aValue >= aLine + sizeof(aLine))
{
aValue = ""; aValue = "";
}
} }
else else
{
aValue = ""; aValue = "";
}
aStart = aLine; aStart = aLine;
while (isspace((unsigned char) *aStart)) while (isspace((unsigned char) *aStart)) aStart++;
aStart++;
/* strip trailing blanks from key */ /* strip trailing blanks from key */
if (aString) if(aString)
{ {
while (--aString >= aStart && *aString == ' ') while(--aString >= aStart && *aString == ' ')
{
*aString = '\0'; *aString = '\0';
}
} }
/* see if key is matched */ /* see if key is matched */
if (theKey == NULL || !strcmp(theKey, aStart)) if(theKey == NULL || !strcmp(theKey, aStart))
{ {
/* matched -- first, terminate value part */ /* matched -- first, terminate value part */
@ -208,7 +213,7 @@ GetPrivateProfileString(char *theSection, /* section name */
aString = aValue + aLength - 1; aString = aValue + aLength - 1;
while (--aString > aValue && *aString == ' ') while(--aString > aValue && *aString == ' ')
{ {
*aString = '\0'; *aString = '\0';
--aLength; --aLength;
@ -216,7 +221,7 @@ GetPrivateProfileString(char *theSection, /* section name */
/* unquote value if quoted */ /* unquote value if quoted */
if (aLength >= 2 && aValue[0] == '"' && if(aLength >= 2 && aValue[0] == '"' &&
aValue[aLength - 1] == '"') aValue[aLength - 1] == '"')
{ {
/* string quoted with double quotes */ /* string quoted with double quotes */
@ -229,7 +234,7 @@ GetPrivateProfileString(char *theSection, /* section name */
{ {
/* single quotes allowed also... */ /* single quotes allowed also... */
if (aLength >= 2 && aValue[0] == '\'' && if(aLength >= 2 && aValue[0] == '\'' &&
aValue[aLength - 1] == '\'') aValue[aLength - 1] == '\'')
{ {
aValue[aLength - 1] = '\0'; aValue[aLength - 1] = '\0';
@ -241,23 +246,23 @@ GetPrivateProfileString(char *theSection, /* section name */
/* compute maximum length copyable */ /* compute maximum length copyable */
aLineLength = (aLength < aLineLength = (aLength <
theReturnBufferLength - aReturnLength) ? aLength : theReturnBufferLength - aReturnLength) ? aLength :
theReturnBufferLength - aReturnLength; theReturnBufferLength - aReturnLength;
/* do the copy to return buffer */ /* do the copy to return buffer */
if (aLineLength) if(aLineLength)
{ {
strncpy(&theReturnBuffer[aReturnLength], strncpy(&theReturnBuffer[aReturnLength],
aValue, aLineLength); aValue, aLineLength);
aReturnLength += aLineLength; aReturnLength += aLineLength;
if (aReturnLength < theReturnBufferLength) if(aReturnLength < theReturnBufferLength)
{ {
theReturnBuffer[aReturnLength] = '\0'; theReturnBuffer[aReturnLength] = '\0';
++aReturnLength; ++aReturnLength;
} }
} }
if (aFile) if(aFile)
{ {
fclose(aFile); fclose(aFile);
aFile = NULL; aFile = NULL;
@ -267,16 +272,17 @@ GetPrivateProfileString(char *theSection, /* section name */
} }
} }
break; break;
} }
} }
if (aFile) if(aFile)
{
fclose(aFile); fclose(aFile);
}
if (!aKeyFound) if(!aKeyFound) { /* key wasn't found return default */
{ /* key wasn't found return default */ ++aLength; /* room for NULL char */
++aLength; /* room for NULL char */
aLength = theReturnBufferLength < aLength ? aLength = theReturnBufferLength < aLength ?
theReturnBufferLength : aLength; theReturnBufferLength : aLength;
strncpy(theReturnBuffer, theDefault, aLength); strncpy(theReturnBuffer, theDefault, aLength);
@ -287,11 +293,10 @@ GetPrivateProfileString(char *theSection, /* section name */
} }
DWORD DWORD
WritePrivateProfileString(char *theSection, /* section name */ WritePrivateProfileString(char *theSection, /* section name */
char *theKey, /* write key name */ char *theKey, /* write key name */
char *theBuffer, /* input buffer */ char *theBuffer, /* input buffer */
char *theIniFileName) /* pathname of ini file to char *theIniFileName) /* pathname of ini file to write */
* write */
{ {
return 0; return 0;
} }
@ -302,74 +307,69 @@ WritePrivateProfileString(char *theSection, /* section name */
* I find out different. * I find out different.
*/ */
DWORD DWORD
WritePrivateProfileString(char *theSection, /* section name */ WritePrivateProfileString(char *theSection, /* section name */
char *theKey, /* write key name */ char *theKey, /* write key name */
char *theBuffer, /* input buffer */ char *theBuffer, /* input buffer */
char *theIniFileName) /* pathname of ini file to char *theIniFileName) /* pathname of ini file to write */
* write */
{ {
char buf[MAXPGPATH]; char buf[MAXPGPATH];
char *ptr = 0; char* ptr = 0;
FILE *aFile = 0; FILE* aFile = 0;
size_t aLength; size_t aLength;
char aLine[2048]; char aLine[2048];
char *aValue; char *aValue;
char *aString; char *aString;
size_t aLineLength; size_t aLineLength;
size_t aReturnLength = 0; size_t aReturnLength = 0;
BOOL aSectionFound = FALSE; BOOL aSectionFound = FALSE;
BOOL keyFound = FALSE; BOOL keyFound = FALSE;
int j = 0; int j = 0;
/* If this isn't correct processing we'll change it later */ /* If this isn't correct processing we'll change it later */
if (theSection == NULL || theKey == NULL || theBuffer == NULL || if(theSection == NULL || theKey == NULL || theBuffer == NULL ||
theIniFileName == NULL) theIniFileName == NULL) return 0;
return 0;
aLength = strlen(theBuffer); aLength = strlen(theBuffer);
if (aLength == 0) if(aLength == 0) return 0;
return 0;
j = strlen(theIniFileName) + 1; j = strlen(theIniFileName) + 1;
ptr = (char *) getpwuid(getuid()); /* get user info */ ptr = (char*)getpwuid(getuid()); /* get user info */
if (ptr == NULL) if( ptr == NULL)
{ {
if (MAXPGPATH - 1 < j) if( MAXPGPATH-1 < j )
theIniFileName[MAXPGPATH - 1] = '\0'; theIniFileName[MAXPGPATH-1] = '\0';
sprintf(buf, "%s", theIniFileName); sprintf(buf,"%s",theIniFileName);
} }
ptr = ((struct passwd *) ptr)->pw_dir; /* get user home dir */ ptr = ((struct passwd*)ptr)->pw_dir; /* get user home dir */
if (ptr == NULL || *ptr == '\0') if( ptr == NULL || *ptr == '\0' )
ptr = "/home"; ptr = "/home";
/* This doesn't make it so we find an ini file but allows normal */ /* This doesn't make it so we find an ini file but allows normal */
/* processing to continue further on down. The likelihood is that */ /* processing to continue further on down. The likelihood is that */
/* the file won't be found and thus the default value will be */ /* the file won't be found and thus the default value will be */
/* returned. */ /* returned. */
/* */ /* */
if (MAXPGPATH - 1 < strlen(ptr) + j) if( MAXPGPATH-1 < strlen(ptr) + j )
{ {
if (MAXPGPATH - 1 < strlen(ptr)) if( MAXPGPATH-1 < strlen(ptr) )
ptr[MAXPGPATH - 1] = '\0'; ptr[MAXPGPATH-1] = '\0';
else else
theIniFileName[MAXPGPATH - 1 - strlen(ptr)] = '\0'; theIniFileName[MAXPGPATH-1-strlen(ptr)] = '\0';
} }
sprintf(buf, "%s/%s", ptr, theIniFileName); sprintf( buf, "%s/%s",ptr,theIniFileName );
/* This code makes it so that a file in the users home dir */ /* This code makes it so that a file in the users home dir */
/* overrides a the "default" file as passed in */ /* overrides a the "default" file as passed in */
/* */ /* */
aFile = (FILE *) (buf ? fopen(buf, "r+") : NULL); aFile = (FILE*)(buf ? fopen(buf, "r+") : NULL);
if (!aFile) if(!aFile) {
{ sprintf(buf,"%s",theIniFileName);
sprintf(buf, "%s", theIniFileName); aFile = (FILE*)(buf ? fopen(buf, "r+") : NULL);
aFile = (FILE *) (buf ? fopen(buf, "r+") : NULL); if(!aFile) return 0;
if (!aFile)
return 0;
} }
@ -379,92 +379,104 @@ WritePrivateProfileString(char *theSection, /* section name */
/* exists we have to overwrite it. If it doesn't exist */ /* exists we have to overwrite it. If it doesn't exist */
/* we just write a new line to the file. */ /* we just write a new line to the file. */
/* */ /* */
while (fgets(aLine, sizeof(aLine), aFile) != NULL) while(fgets(aLine, sizeof(aLine), aFile) != NULL)
{ {
aLineLength = strlen(aLine); aLineLength = strlen(aLine);
/* strip final '\n' */ /* strip final '\n' */
if (aLineLength > 0 && aLine[aLineLength - 1] == '\n') if(aLineLength > 0 && aLine[aLineLength - 1] == '\n')
aLine[aLineLength - 1] = '\0';
switch (*aLine)
{ {
case ' ': /* blank line */ aLine[aLineLength - 1] = '\0';
case ';': /* comment line */ }
switch(*aLine)
{
case ' ': /* blank line */
case ';': /* comment line */
continue; continue;
break; break;
case '[': /* section marker */ case '[': /* section marker */
if ((aString = strchr(aLine, ']'))) if( (aString = strchr(aLine, ']')) )
{ {
*aString = '\0'; *aString = '\0';
/* accept as matched if key exact match */ /* accept as matched if key exact match */
if (!strcmp(aLine + 1, theSection)) if(!strcmp(aLine + 1, theSection))
{
aSectionFound = TRUE; aSectionFound = TRUE;
}
} }
break; break;
default: default:
/* try to match value keys if in proper section */ /* try to match value keys if in proper section */
if (aSectionFound) if(aSectionFound)
{ {
/* try to match requested key */ /* try to match requested key */
if ((aString = aValue = strchr(aLine, '='))) if( (aString = aValue = strchr(aLine, '=')) )
{ {
*aValue = '\0'; *aValue = '\0';
++aValue; ++aValue;
/* strip leading blanks in value field */ /* strip leading blanks in value field */
while (*aValue == ' ' && aValue < aLine + sizeof(aLine)) while(*aValue == ' ' && aValue < aLine + sizeof(aLine))
{
*aValue++ = '\0'; *aValue++ = '\0';
if (aValue >= aLine + sizeof(aLine)) }
if(aValue >= aLine + sizeof(aLine))
{
aValue = ""; aValue = "";
}
} }
else else
{
aValue = ""; aValue = "";
}
/* strip trailing blanks from key */ /* strip trailing blanks from key */
if (aString) if(aString)
{ {
while (--aString >= aLine && *aString == ' ') while(--aString >= aLine && *aString == ' ')
{
*aString = '\0'; *aString = '\0';
}
} }
/* see if key is matched */ /* see if key is matched */
if (!strcmp(theKey, aLine)) if(!strcmp(theKey, aLine))
{ {
keyFound = TRUE; keyFound = TRUE;
/* matched -- first, terminate value part */ /* matched -- first, terminate value part */
/* overwrite current value */ /* overwrite current value */
fseek(aFile, -aLineLength, SEEK_CUR); fseek(aFile,-aLineLength,SEEK_CUR);
/* overwrite key and value */ /* overwrite key and value */
sprintf(aLine, "%s = %s\n", theKey, theBuffer); sprintf(aLine,"%s = %s\n",theKey,theBuffer);
fputs(aLine, aFile); fputs(aLine,aFile);
}
} }
} }
break;
} }
break;
} }
}
if (!keyFound) if(!keyFound) { /* theKey wasn't in file so */
{ /* theKey wasn't in file so */ if(aFile)
if (aFile) {
fclose(aFile); fclose(aFile);
}
return aReturnLength > 0 ? aReturnLength - 1 : 0; return aReturnLength > 0 ? aReturnLength - 1 : 0;
} }
#endif #endif

31
src/interfaces/odbc/gpps.h
View File

@ -13,30 +13,25 @@
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{
#endif #endif
DWORD GetPrivateProfileString(char *theSection, /* section name */ DWORD
char *theKey, /* search key name */ GetPrivateProfileString(char *theSection, /* section name */
char *theDefault, /* default value if not char *theKey, /* search key name */
* found */ char *theDefault, /* default value if not found */
char *theReturnBuffer, /* return valuse stored char *theReturnBuffer, /* return valuse stored here */
* here */ size_t theBufferLength, /* byte length of return buffer */
size_t theBufferLength, /* byte length of return char *theIniFileName); /* pathname of ini file to search */
* buffer */
char *theIniFileName); /* pathname of ini file
* to search */
DWORD WritePrivateProfileString(char *theSection, /* section name */ DWORD
char *theKey, /* write key name */ WritePrivateProfileString(char *theSection, /* section name */
char *theBuffer, /* input buffer */ char *theKey, /* write key name */
char *theIniFileName); /* pathname of ini file char *theBuffer, /* input buffer */
* to write */ char *theIniFileName); /* pathname of ini file to write */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#ifndef WIN32 #ifndef WIN32

3516
src/interfaces/odbc/info.c
View File

File diff suppressed because it is too large Load Diff

98
src/interfaces/odbc/iodbc.h
View File

@ -1,66 +1,66 @@
#ifndef _IODBC_H #ifndef _IODBC_H
#define _IODBC_H #define _IODBC_H
#if !defined(WIN32) && !defined(WIN32_SYSTEM) # if !defined(WIN32) && !defined(WIN32_SYSTEM)
#define _UNIX_ # define _UNIX_
#include <stdlib.h> # include <stdlib.h>
#include <sys/types.h> # include <sys/types.h>
#define MEM_ALLOC(size) (malloc((size_t)(size))) # define MEM_ALLOC(size) (malloc((size_t)(size)))
#define MEM_FREE(ptr) {if(ptr) free(ptr);} # define MEM_FREE(ptr) {if(ptr) free(ptr);}
#define STRCPY(t, s) (strcpy((char*)(t), (char*)(s))) # define STRCPY(t, s) (strcpy((char*)(t), (char*)(s)))
#define STRNCPY(t,s,n) (strncpy((char*)(t), (char*)(s), (size_t)(n))) # define STRNCPY(t,s,n) (strncpy((char*)(t), (char*)(s), (size_t)(n)))
#define STRCAT(t, s) (strcat((char*)(t), (char*)(s))) # define STRCAT(t, s) (strcat((char*)(t), (char*)(s)))
#define STRNCAT(t,s,n) (strncat((char*)(t), (char*)(s), (size_t)(n))) # define STRNCAT(t,s,n) (strncat((char*)(t), (char*)(s), (size_t)(n)))
#define STREQ(a, b) (strcmp((char*)(a), (char*)(b)) == 0) # define STREQ(a, b) (strcmp((char*)(a), (char*)(b)) == 0)
#define STRLEN(str) ((str)? strlen((char*)(str)):0) # define STRLEN(str) ((str)? strlen((char*)(str)):0)
#define EXPORT # define EXPORT
#define CALLBACK # define CALLBACK
#define FAR # define FAR
typedef signed short SSHOR; typedef signed short SSHOR;
typedef short WORD; typedef short WORD;
typedef long DWORD; typedef long DWORD;
typedef WORD WPARAM; typedef WORD WPARAM;
typedef DWORD LPARAM; typedef DWORD LPARAM;
typedef void *HWND; typedef void* HWND;
typedef int BOOL; typedef int BOOL;
#endif /* _UNIX_ */ # endif /* _UNIX_ */
#if defined(WIN32) || defined(WIN32_SYSTEM) # if defined(WIN32) || defined(WIN32_SYSTEM)
#include <windows.h> # include <windows.h>
#include <windowsx.h> # include <windowsx.h>
#ifdef _MSVC_ # ifdef _MSVC_
#define MEM_ALLOC(size) (fmalloc((size_t)(size))) # define MEM_ALLOC(size) (fmalloc((size_t)(size)))
#define MEM_FREE(ptr) ((ptr)? ffree((PTR)(ptr)):0)) # define MEM_FREE(ptr) ((ptr)? ffree((PTR)(ptr)):0))
#define STRCPY(t, s) (fstrcpy((char FAR*)(t), (char FAR*)(s))) # define STRCPY(t, s) (fstrcpy((char FAR*)(t), (char FAR*)(s)))
#define STRNCPY(t,s,n) (fstrncpy((char FAR*)(t), (char FAR*)(s), (size_t)(n))) # define STRNCPY(t,s,n) (fstrncpy((char FAR*)(t), (char FAR*)(s), (size_t)(n)))
#define STRLEN(str) ((str)? fstrlen((char FAR*)(str)):0) # define STRLEN(str) ((str)? fstrlen((char FAR*)(str)):0)
#define STREQ(a, b) (fstrcmp((char FAR*)(a), (char FAR*)(b) == 0) # define STREQ(a, b) (fstrcmp((char FAR*)(a), (char FAR*)(b) == 0)
#endif # endif
#ifdef _BORLAND_ # ifdef _BORLAND_
#define MEM_ALLOC(size) (farmalloc((unsigned long)(size)) # define MEM_ALLOC(size) (farmalloc((unsigned long)(size))
#define MEM_FREE(ptr) ((ptr)? farfree((void far*)(ptr)):0) # define MEM_FREE(ptr) ((ptr)? farfree((void far*)(ptr)):0)
#define STRCPY(t, s) (_fstrcpy((char FAR*)(t), (char FAR*)(s))) # define STRCPY(t, s) (_fstrcpy((char FAR*)(t), (char FAR*)(s)))
#define STRNCPY(t,s,n) (_fstrncpy((char FAR*)(t), (char FAR*)(s), (size_t)(n))) # define STRNCPY(t,s,n) (_fstrncpy((char FAR*)(t), (char FAR*)(s), (size_t)(n)))
#define STRLEN(str) ((str)? _fstrlen((char FAR*)(str)):0) # define STRLEN(str) ((str)? _fstrlen((char FAR*)(str)):0)
#define STREQ(a, b) (_fstrcmp((char FAR*)(a), (char FAR*)(b) == 0) # define STREQ(a, b) (_fstrcmp((char FAR*)(a), (char FAR*)(b) == 0)
#endif # endif
#endif /* WIN32 */ # endif /* WIN32 */
#define SYSERR (-1) # define SYSERR (-1)
#ifndef NULL # ifndef NULL
#define NULL ((void FAR*)0UL) # define NULL ((void FAR*)0UL)
#endif # endif
#endif #endif

308
src/interfaces/odbc/isql.h
View File

@ -2,108 +2,108 @@
* include path to be used to create ODBC compliant applications. * include path to be used to create ODBC compliant applications.
*/ */
#ifndef _INTRINSIC_SQL_H #ifndef _INTRINSIC_SQL_H
#define _INTRINSIC_SQL_H # define _INTRINSIC_SQL_H
typedef unsigned char UCHAR; typedef unsigned char UCHAR;
typedef long int SDWORD; typedef long int SDWORD;
typedef short int SWORD; typedef short int SWORD;
typedef unsigned long int UDWORD; typedef unsigned long int UDWORD;
typedef unsigned short int UWORD; typedef unsigned short int UWORD;
typedef void FAR *PTR; typedef void FAR* PTR;
typedef void FAR *HENV; typedef void FAR* HENV;
typedef void FAR *HDBC; typedef void FAR* HDBC;
typedef void FAR *HSTMT; typedef void FAR* HSTMT;
typedef signed short RETCODE; typedef signed short RETCODE;
#ifdef WIN32 # ifdef WIN32
#define SQL_API __stdcall # define SQL_API __stdcall
#else # else
#define SQL_API EXPORT CALLBACK # define SQL_API EXPORT CALLBACK
#endif # endif
#define ODBCVER 0x0250 # define ODBCVER 0x0250
#define SQL_MAX_MESSAGE_LENGTH 512 # define SQL_MAX_MESSAGE_LENGTH 512
#define SQL_MAX_DSN_LENGTH 32 # define SQL_MAX_DSN_LENGTH 32
/* return code */ /* return code */
#define SQL_INVALID_HANDLE (-2) # define SQL_INVALID_HANDLE (-2)
#define SQL_ERROR (-1) # define SQL_ERROR (-1)
#define SQL_SUCCESS 0 # define SQL_SUCCESS 0
#define SQL_SUCCESS_WITH_INFO 1 # define SQL_SUCCESS_WITH_INFO 1
#define SQL_NO_DATA_FOUND 100 # define SQL_NO_DATA_FOUND 100
/* standard SQL datatypes (agree with ANSI type numbering) */ /* standard SQL datatypes (agree with ANSI type numbering) */
#define SQL_CHAR 1 # define SQL_CHAR 1
#define SQL_NUMERIC 2 # define SQL_NUMERIC 2
#define SQL_DECIMAL 3 # define SQL_DECIMAL 3
#define SQL_INTEGER 4 # define SQL_INTEGER 4
#define SQL_SMALLINT 5 # define SQL_SMALLINT 5
#define SQL_FLOAT 6 # define SQL_FLOAT 6
#define SQL_REAL 7 # define SQL_REAL 7
#define SQL_DOUBLE 8 # define SQL_DOUBLE 8
#define SQL_VARCHAR 12 # define SQL_VARCHAR 12
#define SQL_TYPE_MIN SQL_CHAR # define SQL_TYPE_MIN SQL_CHAR
#define SQL_TYPE_NUL 0 # define SQL_TYPE_NULL 0
#define SQL_TYPE_MAX SQL_VARCHAR # define SQL_TYPE_MAX SQL_VARCHAR
/* C to SQL datatype mapping */ /* C to SQL datatype mapping */
#define SQL_C_CHAR SQL_CHAR # define SQL_C_CHAR SQL_CHAR
#define SQL_C_LONG SQL_INTEGER # define SQL_C_LONG SQL_INTEGER
#define SQL_C_SHORT SQL_SMALLINT # define SQL_C_SHORT SQL_SMALLINT
#define SQL_C_FLOAT SQL_REAL # define SQL_C_FLOAT SQL_REAL
#define SQL_C_DOUBLE SQL_DOUBLE # define SQL_C_DOUBLE SQL_DOUBLE
#define SQL_C_DEFAULT 99 # define SQL_C_DEFAULT 99
#define SQL_NO_NULLS 0 # define SQL_NO_NULLS 0
#define SQL_NULLABLE 1 # define SQL_NULLABLE 1
#define SQL_NULLABLE_UNKNOWN 2 # define SQL_NULLABLE_UNKNOWN 2
/* some special length values */ /* some special length values */
#define SQL_NULL_DATA (-1) # define SQL_NULL_DATA (-1)
#define SQL_DATA_AT_EXEC (-2) # define SQL_DATA_AT_EXEC (-2)
#define SQL_NTS (-3) # define SQL_NTS (-3)
/* SQLFreeStmt flag values */ /* SQLFreeStmt flag values */
#define SQL_CLOSE 0 # define SQL_CLOSE 0
#define SQL_DROP 1 # define SQL_DROP 1
#define SQL_UNBIND 2 # define SQL_UNBIND 2
#define SQL_RESET_PARAMS 3 # define SQL_RESET_PARAMS 3
/* SQLTransact flag values */ /* SQLTransact flag values */
#define SQL_COMMIT 0 # define SQL_COMMIT 0
#define SQL_ROLLBACK 1 # define SQL_ROLLBACK 1
/* SQLColAttributes flag values */ /* SQLColAttributes flag values */
#define SQL_COLUMN_COUNT 0 # define SQL_COLUMN_COUNT 0
#define SQL_COLUMN_LABEL 18 # define SQL_COLUMN_LABEL 18
#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL # define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL
#define SQL_COLUMN_DRIVER_START 1000 # define SQL_COLUMN_DRIVER_START 1000
#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT # define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT
/* Null handles */ /* Null handles */
#define SQL_NULL_HENV 0 # define SQL_NULL_HENV 0
#define SQL_NULL_HDBC 0 # define SQL_NULL_HDBC 0
#define SQL_NULL_HSTMT 0 # define SQL_NULL_HSTMT 0
/* All code below has been added to the original isql.h coming from iodbc */ /* All code below has been added to the original isql.h coming from iodbc */
typedef unsigned char BYTE; typedef unsigned char BYTE;
/* More SQLColAttributes flag values */ /* More SQLColAttributes flag values */
#define SQL_COLUMN_NAME 1 #define SQL_COLUMN_NAME 1
#define SQL_COLUMN_TYPE 2 #define SQL_COLUMN_TYPE 2
#define SQL_COLUMN_LENGTH 3 #define SQL_COLUMN_LENGTH 3
#define SQL_COLUMN_PRECISION 4 #define SQL_COLUMN_PRECISION 4
#define SQL_COLUMN_SCALE 5 #define SQL_COLUMN_SCALE 5
#define SQL_COLUMN_DISPLAY_SIZE 6 #define SQL_COLUMN_DISPLAY_SIZE 6
#define SQL_COLUMN_NULLABLE 7 #define SQL_COLUMN_NULLABLE 7
#define SQL_COLUMN_UNSIGNED 8 #define SQL_COLUMN_UNSIGNED 8
#define SQL_COLUMN_MONEY 9 #define SQL_COLUMN_MONEY 9
#define SQL_COLUMN_UPDATABLE 10 #define SQL_COLUMN_UPDATABLE 10
#define SQL_COLUMN_AUTO_INCREMENT 11 #define SQL_COLUMN_AUTO_INCREMENT 11
#define SQL_COLUMN_CASE_SENSITIVE 12 #define SQL_COLUMN_CASE_SENSITIVE 12
@ -114,118 +114,124 @@ typedef unsigned char BYTE;
#define SQL_COLUMN_QUALIFIER_NAME 17 #define SQL_COLUMN_QUALIFIER_NAME 17
/* SQLColAttributes Searchable flags */ /* SQLColAttributes Searchable flags */
#define SQL_UNSEARCHABLE 0 #define SQL_UNSEARCHABLE 0
#define SQL_LIKE_ONLY 1 #define SQL_LIKE_ONLY 1
#define SQL_ALL_EXCEPT_LIKE 2 #define SQL_ALL_EXCEPT_LIKE 2
#define SQL_SEARCHABLE 3 #define SQL_SEARCHABLE 3
#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE #define SQL_PRED_SEARCHABLE SQL_SEARCHABLE
/* SQLColAttributes Updateable flags */ /* SQLColAttributes Updateable flags */
#define SQL_ATTR_READONLY 0 #define SQL_ATTR_READONLY 0
#define SQL_ATTR_WRITE 1 #define SQL_ATTR_WRITE 1
#define SQL_ATTR_READWRITE_UNKNOWN 2 #define SQL_ATTR_READWRITE_UNKNOWN 2
/* /*
* function prototypes previously not contained in isql.h * function prototypes previously not contained in isql.h
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif #endif
RETCODE SQL_API SQLAllocConnect(HENV henv, HDBC FAR *phdbc); RETCODE SQL_API SQLAllocConnect (HENV henv,
RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv); HDBC FAR * phdbc);
RETCODE SQL_API SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt); RETCODE SQL_API SQLAllocEnv (HENV FAR * phenv);
RETCODE SQL_API SQLBindCol(HSTMT hstmt, RETCODE SQL_API SQLAllocStmt (HDBC hdbc,
UWORD icol, HSTMT FAR * phstmt);
SWORD fCType, RETCODE SQL_API SQLBindCol (HSTMT hstmt,
PTR rgbValue, UWORD icol,
SDWORD cbValueMax, SWORD fCType,
SDWORD FAR *pcbValue); PTR rgbValue,
SDWORD cbValueMax,
SDWORD FAR * pcbValue);
RETCODE SQL_API SQLCancel(HSTMT hstmt); RETCODE SQL_API SQLCancel (HSTMT hstmt);
RETCODE SQL_API SQLColAttributes(HSTMT hstmt, RETCODE SQL_API SQLColAttributes (HSTMT hstmt,
UWORD icol, UWORD icol,
UWORD fDescType, UWORD fDescType,
PTR rgbDesc, PTR rgbDesc,
SWORD cbDescMax, SWORD cbDescMax,
SWORD FAR *pcbDesc, SWORD FAR * pcbDesc,
SDWORD FAR *pfDesc); SDWORD FAR * pfDesc);
RETCODE SQL_API SQLConnect(HDBC hdbc, RETCODE SQL_API SQLConnect (HDBC hdbc,
UCHAR FAR *szDSN, UCHAR FAR * szDSN,
SWORD cbDSN, SWORD cbDSN,
UCHAR FAR *szUID, UCHAR FAR * szUID,
SWORD cbUID, SWORD cbUID,
UCHAR FAR *szAuthStr, UCHAR FAR * szAuthStr,
SWORD cbAuthStr); SWORD cbAuthStr);
RETCODE SQL_API SQLDescribeCol(HSTMT hstmt, RETCODE SQL_API SQLDescribeCol (HSTMT hstmt,
UWORD icol, UWORD icol,
UCHAR FAR *szColName, UCHAR FAR * szColName,
SWORD cbColNameMax, SWORD cbColNameMax,
SWORD FAR *pcbColName, SWORD FAR * pcbColName,
SWORD FAR *pfSqlType, SWORD FAR * pfSqlType,
UDWORD FAR *pcbColDef, UDWORD FAR * pcbColDef,
SWORD FAR *pibScale, SWORD FAR * pibScale,
SWORD FAR *pfNullable); SWORD FAR * pfNullable);
RETCODE SQL_API SQLDisconnect(HDBC hdbc); RETCODE SQL_API SQLDisconnect (HDBC hdbc);
RETCODE SQL_API SQLError(HENV henv, RETCODE SQL_API SQLError (HENV henv,
HDBC hdbc, HDBC hdbc,
HSTMT hstmt, HSTMT hstmt,
UCHAR FAR *szSqlState, UCHAR FAR * szSqlState,
SDWORD FAR *pfNativeError, SDWORD FAR * pfNativeError,
UCHAR FAR *szErrorMsg, UCHAR FAR * szErrorMsg,
SWORD cbErrorMsgMax, SWORD cbErrorMsgMax,
SWORD FAR *pcbErrorMsg); SWORD FAR * pcbErrorMsg);
RETCODE SQL_API SQLExecDirect(HSTMT hstmt, RETCODE SQL_API SQLExecDirect (HSTMT hstmt,
UCHAR FAR *szSqlStr, UCHAR FAR * szSqlStr,
SDWORD cbSqlStr); SDWORD cbSqlStr);
RETCODE SQL_API SQLExecute(HSTMT hstmt); RETCODE SQL_API SQLExecute (HSTMT hstmt);
RETCODE SQL_API SQLFetch(HSTMT hstmt); RETCODE SQL_API SQLFetch (HSTMT hstmt);
RETCODE SQL_API SQLFreeConnect(HDBC hdbc); RETCODE SQL_API SQLFreeConnect (HDBC hdbc);
RETCODE SQL_API SQLFreeEnv(HENV henv); RETCODE SQL_API SQLFreeEnv (HENV henv);
RETCODE SQL_API SQLFreeStmt(HSTMT hstmt, RETCODE SQL_API SQLFreeStmt (HSTMT hstmt,
UWORD fOption); UWORD fOption);
RETCODE SQL_API SQLGetCursorName(HSTMT hstmt, RETCODE SQL_API SQLGetCursorName (HSTMT hstmt,
UCHAR FAR *szCursor, UCHAR FAR * szCursor,
SWORD cbCursorMax, SWORD cbCursorMax,
SWORD FAR *pcbCursor); SWORD FAR * pcbCursor);
RETCODE SQL_API SQLNumResultCols(HSTMT hstmt, SWORD FAR *pccol); RETCODE SQL_API SQLNumResultCols (HSTMT hstmt,
SWORD FAR * pccol);
RETCODE SQL_API SQLPrepare(HSTMT hstmt, UCHAR FAR *szSqlStr, RETCODE SQL_API SQLPrepare (HSTMT hstmt,
SDWORD cbSqlStr); UCHAR FAR * szSqlStr,
SDWORD cbSqlStr);
RETCODE SQL_API SQLRowCount(HSTMT hstmt, SDWORD FAR *pcrow); RETCODE SQL_API SQLRowCount (HSTMT hstmt,
SDWORD FAR * pcrow);
RETCODE SQL_API SQLSetCursorName(HSTMT hstmt, UCHAR FAR *szCursor, RETCODE SQL_API SQLSetCursorName (HSTMT hstmt,
SWORD cbCursor); UCHAR FAR * szCursor,
SWORD cbCursor);
RETCODE SQL_API SQLTransact(HENV henv, HDBC hdbc, RETCODE SQL_API SQLTransact (HENV henv,
UWORD fType); HDBC hdbc,
UWORD fType);
RETCODE SQL_API SQLSetParam(HSTMT hstmt, RETCODE SQL_API SQLSetParam (HSTMT hstmt,
UWORD ipar, UWORD ipar,
SWORD fCType, SWORD fCType,
SWORD fSqlType, SWORD fSqlType,
UDWORD cbColDef, UDWORD cbColDef,
SWORD ibScale, SWORD ibScale,
PTR rgbValue, PTR rgbValue,
SDWORD FAR *pcbValue); SDWORD FAR * pcbValue);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif

1581
src/interfaces/odbc/isqlext.h
View File

File diff suppressed because it is too large Load Diff

80
src/interfaces/odbc/lobj.c
View File

@ -1,13 +1,14 @@
/* Module: lobj.c
/* Module: lobj.c
* *
* Description: This module contains routines related to manipulating * Description: This module contains routines related to manipulating
* large objects. * large objects.
* *
* Classes: none * Classes: none
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -18,16 +19,15 @@
Oid Oid
lo_creat(ConnectionClass *conn, int mode) lo_creat(ConnectionClass *conn, int mode)
{ {
LO_ARG argv[1]; LO_ARG argv[1];
int retval, int retval, result_len;
result_len;
argv[0].isint = 1; argv[0].isint = 1;
argv[0].len = 4; argv[0].len = 4;
argv[0].u.integer = mode; argv[0].u.integer = mode;
if (!CC_send_function(conn, LO_CREAT, &retval, &result_len, 1, argv, 1)) if ( ! CC_send_function(conn, LO_CREAT, &retval, &result_len, 1, argv, 1))
return 0; /* invalid oid */ return 0; /* invalid oid */
else else
return retval; return retval;
@ -37,9 +37,9 @@ lo_creat(ConnectionClass *conn, int mode)
int int
lo_open(ConnectionClass *conn, int lobjId, int mode) lo_open(ConnectionClass *conn, int lobjId, int mode)
{ {
int fd; int fd;
int result_len; int result_len;
LO_ARG argv[2]; LO_ARG argv[2];
argv[0].isint = 1; argv[0].isint = 1;
@ -50,7 +50,7 @@ lo_open(ConnectionClass *conn, int lobjId, int mode)
argv[1].len = 4; argv[1].len = 4;
argv[1].u.integer = mode; argv[1].u.integer = mode;
if (!CC_send_function(conn, LO_OPEN, &fd, &result_len, 1, argv, 2)) if ( ! CC_send_function(conn, LO_OPEN, &fd, &result_len, 1, argv, 2))
return -1; return -1;
if (fd >= 0 && lo_lseek(conn, fd, 0L, SEEK_SET) < 0) if (fd >= 0 && lo_lseek(conn, fd, 0L, SEEK_SET) < 0)
@ -62,28 +62,28 @@ lo_open(ConnectionClass *conn, int lobjId, int mode)
int int
lo_close(ConnectionClass *conn, int fd) lo_close(ConnectionClass *conn, int fd)
{ {
LO_ARG argv[1]; LO_ARG argv[1];
int retval, int retval, result_len;
result_len;
argv[0].isint = 1; argv[0].isint = 1;
argv[0].len = 4; argv[0].len = 4;
argv[0].u.integer = fd; argv[0].u.integer = fd;
if (!CC_send_function(conn, LO_CLOSE, &retval, &result_len, 1, argv, 1)) if ( ! CC_send_function(conn, LO_CLOSE, &retval, &result_len, 1, argv, 1))
return -1; return -1;
else else
return retval; return retval;
} }
int int
lo_read(ConnectionClass *conn, int fd, char *buf, int len) lo_read(ConnectionClass *conn, int fd, char *buf, int len)
{ {
LO_ARG argv[2]; LO_ARG argv[2];
int result_len; int result_len;
argv[0].isint = 1; argv[0].isint = 1;
@ -94,7 +94,7 @@ lo_read(ConnectionClass *conn, int fd, char *buf, int len)
argv[1].len = 4; argv[1].len = 4;
argv[1].u.integer = len; argv[1].u.integer = len;
if (!CC_send_function(conn, LO_READ, (int *) buf, &result_len, 0, argv, 2)) if ( ! CC_send_function(conn, LO_READ, (int *) buf, &result_len, 0, argv, 2))
return -1; return -1;
else else
@ -104,9 +104,8 @@ lo_read(ConnectionClass *conn, int fd, char *buf, int len)
int int
lo_write(ConnectionClass *conn, int fd, char *buf, int len) lo_write(ConnectionClass *conn, int fd, char *buf, int len)
{ {
LO_ARG argv[2]; LO_ARG argv[2];
int retval, int retval, result_len;
result_len;
if (len <= 0) if (len <= 0)
@ -120,7 +119,7 @@ lo_write(ConnectionClass *conn, int fd, char *buf, int len)
argv[1].len = len; argv[1].len = len;
argv[1].u.ptr = (char *) buf; argv[1].u.ptr = (char *) buf;
if (!CC_send_function(conn, LO_WRITE, &retval, &result_len, 1, argv, 2)) if ( ! CC_send_function(conn, LO_WRITE, &retval, &result_len, 1, argv, 2))
return -1; return -1;
else else
@ -130,9 +129,8 @@ lo_write(ConnectionClass *conn, int fd, char *buf, int len)
int int
lo_lseek(ConnectionClass *conn, int fd, int offset, int whence) lo_lseek(ConnectionClass *conn, int fd, int offset, int whence)
{ {
LO_ARG argv[3]; LO_ARG argv[3];
int retval, int retval, result_len;
result_len;
argv[0].isint = 1; argv[0].isint = 1;
@ -147,7 +145,7 @@ lo_lseek(ConnectionClass *conn, int fd, int offset, int whence)
argv[2].len = 4; argv[2].len = 4;
argv[2].u.integer = whence; argv[2].u.integer = whence;
if (!CC_send_function(conn, LO_LSEEK, &retval, &result_len, 1, argv, 3)) if ( ! CC_send_function(conn, LO_LSEEK, &retval, &result_len, 1, argv, 3))
return -1; return -1;
else else
@ -157,16 +155,15 @@ lo_lseek(ConnectionClass *conn, int fd, int offset, int whence)
int int
lo_tell(ConnectionClass *conn, int fd) lo_tell(ConnectionClass *conn, int fd)
{ {
LO_ARG argv[1]; LO_ARG argv[1];
int retval, int retval, result_len;
result_len;
argv[0].isint = 1; argv[0].isint = 1;
argv[0].len = 4; argv[0].len = 4;
argv[0].u.integer = fd; argv[0].u.integer = fd;
if (!CC_send_function(conn, LO_TELL, &retval, &result_len, 1, argv, 1)) if ( ! CC_send_function(conn, LO_TELL, &retval, &result_len, 1, argv, 1))
return -1; return -1;
else else
@ -176,18 +173,25 @@ lo_tell(ConnectionClass *conn, int fd)
int int
lo_unlink(ConnectionClass *conn, Oid lobjId) lo_unlink(ConnectionClass *conn, Oid lobjId)
{ {
LO_ARG argv[1]; LO_ARG argv[1];
int retval, int retval, result_len;
result_len;
argv[0].isint = 1; argv[0].isint = 1;
argv[0].len = 4; argv[0].len = 4;
argv[0].u.integer = lobjId; argv[0].u.integer = lobjId;
if (!CC_send_function(conn, LO_UNLINK, &retval, &result_len, 1, argv, 1)) if ( ! CC_send_function(conn, LO_UNLINK, &retval, &result_len, 1, argv, 1))
return -1; return -1;
else else
return retval; return retval;
} }

36
src/interfaces/odbc/lobj.h
View File

@ -1,9 +1,9 @@
/* File: lobj.h /* File: lobj.h
* *
* Description: See "lobj.c" * Description: See "lobj.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -13,15 +13,14 @@
#include "psqlodbc.h" #include "psqlodbc.h"
struct lo_arg struct lo_arg {
{ int isint;
int isint; int len;
int len;
union union
{ {
int integer; int integer;
char *ptr; char *ptr;
} u; } u;
}; };
#define LO_CREAT 957 #define LO_CREAT 957
@ -36,13 +35,14 @@ struct lo_arg
#define INV_WRITE 0x00020000 #define INV_WRITE 0x00020000
#define INV_READ 0x00040000 #define INV_READ 0x00040000
Oid lo_creat(ConnectionClass *conn, int mode); Oid lo_creat(ConnectionClass *conn, int mode);
int lo_open(ConnectionClass *conn, int lobjId, int mode); int lo_open(ConnectionClass *conn, int lobjId, int mode);
int lo_close(ConnectionClass *conn, int fd); int lo_close(ConnectionClass *conn, int fd);
int lo_read(ConnectionClass *conn, int fd, char *buf, int len); int lo_read(ConnectionClass *conn, int fd, char *buf, int len);
int lo_write(ConnectionClass *conn, int fd, char *buf, int len); int lo_write(ConnectionClass *conn, int fd, char *buf, int len);
int lo_lseek(ConnectionClass *conn, int fd, int offset, int len); int lo_lseek(ConnectionClass *conn, int fd, int offset, int len);
int lo_tell(ConnectionClass *conn, int fd); int lo_tell(ConnectionClass *conn, int fd);
int lo_unlink(ConnectionClass *conn, Oid lobjId); int lo_unlink(ConnectionClass *conn, Oid lobjId);
#endif #endif

150
src/interfaces/odbc/misc.c
View File

@ -1,13 +1,14 @@
/* Module: misc.c
/* Module: misc.c
* *
* Description: This module contains miscellaneous routines * Description: This module contains miscellaneous routines
* such as for debugging/logging and string functions. * such as for debugging/logging and string functions.
* *
* Classes: n/a * Classes: n/a
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -24,54 +25,49 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#else #else
#include <process.h> /* Byron: is this where Windows keeps def. #include <process.h> /* Byron: is this where Windows keeps def. of getpid ? */
* of getpid ? */
#endif #endif
extern GLOBAL_VALUES globals; extern GLOBAL_VALUES globals;
void generate_filename(char *, char *, char *); void generate_filename(char*,char*,char*);
void void
generate_filename(char *dirname, char *prefix, char *filename) generate_filename(char* dirname,char* prefix,char* filename)
{ {
int pid = 0; int pid = 0;
#ifndef WIN32 #ifndef WIN32
struct passwd *ptr = 0; struct passwd *ptr = 0;
ptr = getpwuid(getuid()); ptr = getpwuid(getuid());
#endif #endif
pid = getpid(); pid = getpid();
if (dirname == 0 || filename == 0) if(dirname == 0 || filename == 0)
return; return;
strcpy(filename, dirname); strcpy(filename,dirname);
strcat(filename, DIRSEPARATOR); strcat(filename,DIRSEPARATOR);
if (prefix != 0) if(prefix != 0)
strcat(filename, prefix); strcat(filename,prefix);
#ifndef WIN32 #ifndef WIN32
strcat(filename, ptr->pw_name); strcat(filename,ptr->pw_name);
#endif #endif
sprintf(filename, "%s%u%s", filename, pid, ".log"); sprintf(filename,"%s%u%s",filename,pid,".log");
return; return;
} }
#ifdef MY_LOG #ifdef MY_LOG
void void
mylog(char *fmt,...) mylog(char * fmt, ...)
{ {
va_list args; va_list args;
char filebuf[80]; char filebuf[80];
FILE *LOGFP = globals.mylogFP; FILE* LOGFP = globals.mylogFP;
if (globals.debug) if ( globals.debug) {
{
va_start(args, fmt); va_start(args, fmt);
if (!LOGFP) if (! LOGFP) {
{ generate_filename(MYLOGDIR,MYLOGFILE,filebuf);
generate_filename(MYLOGDIR, MYLOGFILE, filebuf);
LOGFP = fopen(filebuf, PG_BINARY_W); LOGFP = fopen(filebuf, PG_BINARY_W);
globals.mylogFP = LOGFP; globals.mylogFP = LOGFP;
setbuf(LOGFP, NULL); setbuf(LOGFP, NULL);
@ -83,26 +79,23 @@ mylog(char *fmt,...)
va_end(args); va_end(args);
} }
} }
#endif #endif
#ifdef Q_LOG #ifdef Q_LOG
void void
qlog(char *fmt,...) qlog(char * fmt, ...)
{ {
va_list args; va_list args;
char filebuf[80]; char filebuf[80];
FILE *LOGFP = globals.qlogFP; FILE* LOGFP = globals.qlogFP;
if (globals.commlog) if ( globals.commlog) {
{
va_start(args, fmt); va_start(args, fmt);
if (!LOGFP) if (! LOGFP) {
{ generate_filename(QLOGDIR,QLOGFILE,filebuf);
generate_filename(QLOGDIR, QLOGFILE, filebuf);
LOGFP = fopen(filebuf, PG_BINARY_W); LOGFP = fopen(filebuf, PG_BINARY_W);
globals.qlogFP = LOGFP; globals.qlogFP = LOGFP;
setbuf(LOGFP, NULL); setbuf(LOGFP, NULL);
@ -114,10 +107,9 @@ qlog(char *fmt,...)
va_end(args); va_end(args);
} }
} }
#endif #endif
/* Undefine these because windows.h will redefine and cause a warning */ /* Undefine these because windows.h will redefine and cause a warning */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -144,8 +136,7 @@ my_strcpy(char *dst, int dst_len, char *src, int src_len)
if (dst_len <= 0) if (dst_len <= 0)
return STRCPY_FAIL; return STRCPY_FAIL;
if (src_len == SQL_NULL_DATA) if (src_len == SQL_NULL_DATA) {
{
dst[0] = '\0'; dst[0] = '\0';
return STRCPY_NULL; return STRCPY_NULL;
} }
@ -155,17 +146,14 @@ my_strcpy(char *dst, int dst_len, char *src, int src_len)
if (src_len <= 0) if (src_len <= 0)
return STRCPY_FAIL; return STRCPY_FAIL;
else else {
{ if (src_len < dst_len) {
if (src_len < dst_len)
{
memcpy(dst, src, src_len); memcpy(dst, src, src_len);
dst[src_len] = '\0'; dst[src_len] = '\0';
} }
else else {
{ memcpy(dst, src, dst_len-1);
memcpy(dst, src, dst_len - 1); dst[dst_len-1] = '\0'; /* truncated */
dst[dst_len - 1] = '\0'; /* truncated */
return STRCPY_TRUNCATED; return STRCPY_TRUNCATED;
} }
} }
@ -177,28 +165,28 @@ my_strcpy(char *dst, int dst_len, char *src, int src_len)
/* the destination string if src has len characters or more. */ /* the destination string if src has len characters or more. */
/* instead, I want it to copy up to len-1 characters and always */ /* instead, I want it to copy up to len-1 characters and always */
/* terminate the destination string. */ /* terminate the destination string. */
char * char *strncpy_null(char *dst, const char *src, int len)
strncpy_null(char *dst, const char *src, int len)
{ {
int i; int i;
if (NULL != dst) if (NULL != dst) {
{
/* Just in case, check for special lengths */ /* Just in case, check for special lengths */
if (len == SQL_NULL_DATA) if (len == SQL_NULL_DATA) {
{
dst[0] = '\0'; dst[0] = '\0';
return NULL; return NULL;
} }
else if (len == SQL_NTS) else if (len == SQL_NTS)
len = strlen(src) + 1; len = strlen(src) + 1;
for (i = 0; src[i] && i < len - 1; i++) for(i = 0; src[i] && i < len - 1; i++) {
dst[i] = src[i]; dst[i] = src[i];
}
if (len > 0) if(len > 0) {
dst[i] = '\0'; dst[i] = '\0';
}
} }
return dst; return dst;
} }
@ -209,24 +197,22 @@ strncpy_null(char *dst, const char *src, int len)
char * char *
make_string(char *s, int len, char *buf) make_string(char *s, int len, char *buf)
{ {
int length; int length;
char *str; char *str;
if (s && (len > 0 || (len == SQL_NTS && strlen(s) > 0))) if(s && (len > 0 || (len == SQL_NTS && strlen(s) > 0))) {
{
length = (len > 0) ? len : strlen(s); length = (len > 0) ? len : strlen(s);
if (buf) if (buf) {
{ strncpy_null(buf, s, length+1);
strncpy_null(buf, s, length + 1);
return buf; return buf;
} }
str = malloc(length + 1); str = malloc(length + 1);
if (!str) if ( ! str)
return NULL; return NULL;
strncpy_null(str, s, length + 1); strncpy_null(str, s, length+1);
return str; return str;
} }
@ -240,11 +226,11 @@ make_string(char *s, int len, char *buf)
char * char *
my_strcat(char *buf, char *fmt, char *s, int len) my_strcat(char *buf, char *fmt, char *s, int len)
{ {
if (s && (len > 0 || (len == SQL_NTS && strlen(s) > 0)))
{
int length = (len > 0) ? len : strlen(s);
int pos = strlen(buf); if (s && (len > 0 || (len == SQL_NTS && strlen(s) > 0))) {
int length = (len > 0) ? len : strlen(s);
int pos = strlen(buf);
sprintf(&buf[pos], fmt, length, s); sprintf(&buf[pos], fmt, length, s);
return buf; return buf;
@ -252,26 +238,24 @@ my_strcat(char *buf, char *fmt, char *s, int len)
return NULL; return NULL;
} }
void void remove_newlines(char *string)
remove_newlines(char *string)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < strlen(string); i++) for(i=0; i < strlen(string); i++) {
{ if((string[i] == '\n') ||
if ((string[i] == '\n') || (string[i] == '\r')) {
(string[i] == '\r'))
string[i] = ' '; string[i] = ' ';
}
} }
} }
char * char *
trim(char *s) trim(char *s)
{ {
int i; int i;
for (i = strlen(s) - 1; i >= 0; i--) for (i = strlen(s) - 1; i >= 0; i--) {
{
if (s[i] == ' ') if (s[i] == ' ')
s[i] = '\0'; s[i] = '\0';
else else

80
src/interfaces/odbc/misc.h
View File

@ -1,9 +1,9 @@
/* File: misc.h /* File: misc.h
* *
* Description: See "misc.c" * Description: See "misc.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -39,37 +39,35 @@
#ifdef MY_LOG #ifdef MY_LOG
#define MYLOGFILE "mylog_" #define MYLOGFILE "mylog_"
#ifndef WIN32 #ifndef WIN32
#define MYLOGDIR "/tmp" #define MYLOGDIR "/tmp"
#else
#define MYLOGDIR "c:"
#endif
extern void mylog(char * fmt, ...);
#else #else
#define MYLOGDIR "c:" #ifndef WIN32
#endif #define mylog(args...) /* GNU convention for variable arguments */
extern void mylog(char *fmt,...); #else
#define mylog /* mylog */
#else #endif
#ifndef WIN32
#define mylog(args...) /* GNU convention for variable arguments */
#else
#define mylog /* mylog */
#endif
#endif #endif
#ifdef Q_LOG #ifdef Q_LOG
#define QLOGFILE "psqlodbc_" #define QLOGFILE "psqlodbc_"
#ifndef WIN32 #ifndef WIN32
#define QLOGDIR "/tmp" #define QLOGDIR "/tmp"
#else
#define QLOGDIR "c:"
#endif
extern void qlog(char * fmt, ...);
#else #else
#define QLOGDIR "c:" #ifndef WIN32
#endif #define qlog(args...) /* GNU convention for variable arguments */
extern void qlog(char *fmt,...); #else
#define qlog /* qlog */
#else #endif
#ifndef WIN32
#define qlog(args...) /* GNU convention for variable arguments */
#else
#define qlog /* qlog */
#endif
#endif #endif
#ifndef WIN32 #ifndef WIN32
@ -79,21 +77,21 @@ extern void qlog(char *fmt,...);
#endif #endif
#ifdef WIN32 #ifdef WIN32
#define PG_BINARY O_BINARY #define PG_BINARY O_BINARY
#define PG_BINARY_R "rb" #define PG_BINARY_R "rb"
#define PG_BINARY_W "wb" #define PG_BINARY_W "wb"
#else #else
#define PG_BINARY 0 #define PG_BINARY 0
#define PG_BINARY_R "r" #define PG_BINARY_R "r"
#define PG_BINARY_W "w" #define PG_BINARY_W "w"
#endif #endif
void remove_newlines(char *string); void remove_newlines(char *string);
char *strncpy_null(char *dst, const char *src, int len); char *strncpy_null(char *dst, const char *src, int len);
char *trim(char *string); char *trim(char *string);
char *make_string(char *s, int len, char *buf); char *make_string(char *s, int len, char *buf);
char *my_strcat(char *buf, char *fmt, char *s, int len); char *my_strcat(char *buf, char *fmt, char *s, int len);
/* defines for return value of my_strcpy */ /* defines for return value of my_strcpy */
#define STRCPY_SUCCESS 1 #define STRCPY_SUCCESS 1
@ -101,6 +99,6 @@ char *my_strcat(char *buf, char *fmt, char *s, int len);
#define STRCPY_TRUNCATED -1 #define STRCPY_TRUNCATED -1
#define STRCPY_NULL -2 #define STRCPY_NULL -2
int my_strcpy(char *dst, int dst_len, char *src, int src_len); int my_strcpy(char *dst, int dst_len, char *src, int src_len);
#endif #endif

950
src/interfaces/odbc/options.c
View File

File diff suppressed because it is too large Load Diff

566
src/interfaces/odbc/parse.c
View File

File diff suppressed because it is too large Load Diff

1095
src/interfaces/odbc/pgtypes.c
View File

File diff suppressed because it is too large Load Diff

131
src/interfaces/odbc/pgtypes.h
View File

@ -1,9 +1,9 @@
/* File: pgtypes.h /* File: pgtypes.h
* *
* Description: See "pgtypes.c" * Description: See "pgtypes.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -17,81 +17,82 @@
#if 0 #if 0
#define PG_TYPE_LO ????/* waiting for permanent type */ #define PG_TYPE_LO ???? /* waiting for permanent type */
#endif #endif
#define PG_TYPE_BOOL 16 #define PG_TYPE_BOOL 16
#define PG_TYPE_BYTEA 17 #define PG_TYPE_BYTEA 17
#define PG_TYPE_CHAR 18 #define PG_TYPE_CHAR 18
#define PG_TYPE_NAME 19 #define PG_TYPE_NAME 19
#define PG_TYPE_INT8 20 #define PG_TYPE_INT8 20
#define PG_TYPE_INT2 21 #define PG_TYPE_INT2 21
#define PG_TYPE_INT2VECTOR 22 #define PG_TYPE_INT2VECTOR 22
#define PG_TYPE_INT4 23 #define PG_TYPE_INT4 23
#define PG_TYPE_REGPROC 24 #define PG_TYPE_REGPROC 24
#define PG_TYPE_TEXT 25 #define PG_TYPE_TEXT 25
#define PG_TYPE_OID 26 #define PG_TYPE_OID 26
#define PG_TYPE_TID 27 #define PG_TYPE_TID 27
#define PG_TYPE_XID 28 #define PG_TYPE_XID 28
#define PG_TYPE_CID 29 #define PG_TYPE_CID 29
#define PG_TYPE_OIDVECTOR 30 #define PG_TYPE_OIDVECTOR 30
#define PG_TYPE_SET 32 #define PG_TYPE_SET 32
#define PG_TYPE_CHAR2 409 #define PG_TYPE_CHAR2 409
#define PG_TYPE_CHAR4 410 #define PG_TYPE_CHAR4 410
#define PG_TYPE_CHAR8 411 #define PG_TYPE_CHAR8 411
#define PG_TYPE_POINT 600 #define PG_TYPE_POINT 600
#define PG_TYPE_LSEG 601 #define PG_TYPE_LSEG 601
#define PG_TYPE_PATH 602 #define PG_TYPE_PATH 602
#define PG_TYPE_BOX 603 #define PG_TYPE_BOX 603
#define PG_TYPE_POLYGON 604 #define PG_TYPE_POLYGON 604
#define PG_TYPE_FILENAME 605 #define PG_TYPE_FILENAME 605
#define PG_TYPE_FLOAT4 700 #define PG_TYPE_FLOAT4 700
#define PG_TYPE_FLOAT8 701 #define PG_TYPE_FLOAT8 701
#define PG_TYPE_ABSTIME 702 #define PG_TYPE_ABSTIME 702
#define PG_TYPE_RELTIME 703 #define PG_TYPE_RELTIME 703
#define PG_TYPE_TINTERVAL 704 #define PG_TYPE_TINTERVAL 704
#define PG_TYPE_UNKNOWN 705 #define PG_TYPE_UNKNOWN 705
#define PG_TYPE_MONEY 790 #define PG_TYPE_MONEY 790
#define PG_TYPE_OIDINT2 810 #define PG_TYPE_OIDINT2 810
#define PG_TYPE_OIDINT4 910 #define PG_TYPE_OIDINT4 910
#define PG_TYPE_OIDNAME 911 #define PG_TYPE_OIDNAME 911
#define PG_TYPE_BPCHAR 1042 #define PG_TYPE_BPCHAR 1042
#define PG_TYPE_VARCHAR 1043 #define PG_TYPE_VARCHAR 1043
#define PG_TYPE_DATE 1082 #define PG_TYPE_DATE 1082
#define PG_TYPE_TIME 1083 #define PG_TYPE_TIME 1083
#define PG_TYPE_DATETIME 1184 #define PG_TYPE_DATETIME 1184
#define PG_TYPE_TIMESTAMP 1296 #define PG_TYPE_TIMESTAMP 1296
#define PG_TYPE_NUMERIC 1700 #define PG_TYPE_NUMERIC 1700
/* extern Int4 pgtypes_defined[]; */ /* extern Int4 pgtypes_defined[]; */
extern Int2 sqlTypes[]; extern Int2 sqlTypes[];
/* Defines for pgtype_precision */ /* Defines for pgtype_precision */
#define PG_STATIC -1 #define PG_STATIC -1
Int4 sqltype_to_pgtype(Int2 fSqlType); Int4 sqltype_to_pgtype(Int2 fSqlType);
Int2 pgtype_to_sqltype(StatementClass *stmt, Int4 type); Int2 pgtype_to_sqltype(StatementClass *stmt, Int4 type);
Int2 pgtype_to_ctype(StatementClass *stmt, Int4 type); Int2 pgtype_to_ctype(StatementClass *stmt, Int4 type);
char *pgtype_to_name(StatementClass *stmt, Int4 type); char *pgtype_to_name(StatementClass *stmt, Int4 type);
/* These functions can use static numbers or result sets(col parameter) */ /* These functions can use static numbers or result sets(col parameter) */
Int4 pgtype_precision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); Int4 pgtype_precision(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as);
Int4 pgtype_display_size(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); Int4 pgtype_display_size(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as);
Int4 pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as); Int4 pgtype_length(StatementClass *stmt, Int4 type, int col, int handle_unknown_size_as);
Int2 pgtype_scale(StatementClass *stmt, Int4 type, int col); Int2 pgtype_scale(StatementClass *stmt, Int4 type, int col);
Int2 pgtype_radix(StatementClass *stmt, Int4 type); Int2 pgtype_radix(StatementClass *stmt, Int4 type);
Int2 pgtype_nullable(StatementClass *stmt, Int4 type); Int2 pgtype_nullable(StatementClass *stmt, Int4 type);
Int2 pgtype_auto_increment(StatementClass *stmt, Int4 type); Int2 pgtype_auto_increment(StatementClass *stmt, Int4 type);
Int2 pgtype_case_sensitive(StatementClass *stmt, Int4 type); Int2 pgtype_case_sensitive(StatementClass *stmt, Int4 type);
Int2 pgtype_money(StatementClass *stmt, Int4 type); Int2 pgtype_money(StatementClass *stmt, Int4 type);
Int2 pgtype_searchable(StatementClass *stmt, Int4 type); Int2 pgtype_searchable(StatementClass *stmt, Int4 type);
Int2 pgtype_unsigned(StatementClass *stmt, Int4 type); Int2 pgtype_unsigned(StatementClass *stmt, Int4 type);
char *pgtype_literal_prefix(StatementClass *stmt, Int4 type); char *pgtype_literal_prefix(StatementClass *stmt, Int4 type);
char *pgtype_literal_suffix(StatementClass *stmt, Int4 type); char *pgtype_literal_suffix(StatementClass *stmt, Int4 type);
char *pgtype_create_params(StatementClass *stmt, Int4 type); char *pgtype_create_params(StatementClass *stmt, Int4 type);
Int2 sqltype_to_default_ctype(Int2 sqltype); Int2 sqltype_to_default_ctype(Int2 sqltype);
#endif #endif

93
src/interfaces/odbc/psqlodbc.c
View File

@ -1,14 +1,15 @@
/* Module: psqlodbc.c
/* Module: psqlodbc.c
* *
* Description: This module contains the main entry point (DllMain) for the library. * Description: This module contains the main entry point (DllMain) for the library.
* It also contains functions to get and set global variables for the * It also contains functions to get and set global variables for the
* driver in the registry. * driver in the registry.
* *
* Classes: n/a * Classes: n/a
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -35,51 +36,49 @@ GLOBAL_VALUES globals;
RETCODE SQL_API SQLDummyOrdinal(void); RETCODE SQL_API SQLDummyOrdinal(void);
#ifdef WIN32 #ifdef WIN32
HINSTANCE NEAR s_hModule; /* Saved module handle. */ HINSTANCE NEAR s_hModule; /* Saved module handle. */
/* This is where the Driver Manager attaches to this Driver */ /* This is where the Driver Manager attaches to this Driver */
BOOL WINAPI BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
{ {
WORD wVersionRequested; WORD wVersionRequested;
WSADATA wsaData; WSADATA wsaData;
switch (ul_reason_for_call) switch (ul_reason_for_call) {
{ case DLL_PROCESS_ATTACH:
case DLL_PROCESS_ATTACH: s_hModule = hInst; /* Save for dialog boxes */
s_hModule = hInst; /* Save for dialog boxes */
/* Load the WinSock Library */ /* Load the WinSock Library */
wVersionRequested = MAKEWORD(1, 1); wVersionRequested = MAKEWORD(1, 1);
if (WSAStartup(wVersionRequested, &wsaData)) if ( WSAStartup(wVersionRequested, &wsaData))
return FALSE; return FALSE;
/* Verify that this is the minimum version of WinSock */ /* Verify that this is the minimum version of WinSock */
if (LOBYTE(wsaData.wVersion) != 1 || if ( LOBYTE( wsaData.wVersion ) != 1 ||
HIBYTE(wsaData.wVersion) != 1) HIBYTE( wsaData.wVersion ) != 1 ) {
{
WSACleanup();
return FALSE;
}
getGlobalDefaults(DBMS_NAME, ODBCINST_INI, FALSE);
break;
case DLL_THREAD_ATTACH:
break;
case DLL_PROCESS_DETACH:
WSACleanup(); WSACleanup();
return FALSE;
}
return TRUE; getGlobalDefaults(DBMS_NAME, ODBCINST_INI, FALSE);
break;
case DLL_THREAD_DETACH: case DLL_THREAD_ATTACH:
break; break;
default: case DLL_PROCESS_DETACH:
break;
WSACleanup();
return TRUE;
case DLL_THREAD_DETACH:
break;
default:
break;
} }
return TRUE; return TRUE;
@ -87,7 +86,7 @@ DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
UNREFERENCED_PARAMETER(lpReserved); UNREFERENCED_PARAMETER(lpReserved);
} }
#else /* not WIN32 */ #else /* not WIN32 */
#ifndef TRUE #ifndef TRUE
#define TRUE (BOOL)1 #define TRUE (BOOL)1
@ -98,7 +97,7 @@ DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
#ifdef __GNUC__ #ifdef __GNUC__
/* This function is called at library initialization time. */ /* This function is called at library initialization time. */
static BOOL static BOOL
__attribute__((constructor)) __attribute__((constructor))
@ -108,7 +107,7 @@ init(void)
return TRUE; return TRUE;
} }
#else /* not __GNUC__ */ #else /* not __GNUC__ */
/* These two functions do shared library initialziation on UNIX, well at least /* These two functions do shared library initialziation on UNIX, well at least
* on Linux. I don't know about other systems. * on Linux. I don't know about other systems.
@ -126,9 +125,9 @@ _fini(void)
return TRUE; return TRUE;
} }
#endif /* not __GNUC__ */ #endif /* not __GNUC__ */
#endif /* not WIN32 */ #endif /* not WIN32 */
/* This function is used to cause the Driver Manager to /* This function is used to cause the Driver Manager to
call functions by number rather than name, which is faster. call functions by number rather than name, which is faster.
@ -136,8 +135,8 @@ _fini(void)
Driver Manager do this. Also, the ordinal values of the Driver Manager do this. Also, the ordinal values of the
functions must match the value of fFunction in SQLGetFunctions() functions must match the value of fFunction in SQLGetFunctions()
*/ */
RETCODE SQL_API RETCODE SQL_API SQLDummyOrdinal(void)
SQLDummyOrdinal(void)
{ {
return SQL_SUCCESS; return SQL_SUCCESS;
} }

183
src/interfaces/odbc/psqlodbc.h
View File

@ -1,12 +1,12 @@
/* File: psqlodbc.h /* File: psqlodbc.h
* *
* Description: This file contains defines and declarations that are related to * Description: This file contains defines and declarations that are related to
* the entire driver. * the entire driver.
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
* $Id: psqlodbc.h,v 1.36 2001/02/11 13:53:42 momjian Exp $ * $Id: psqlodbc.h,v 1.37 2001/02/14 05:45:46 momjian Exp $
*/ */
#ifndef __PSQLODBC_H__ #ifndef __PSQLODBC_H__
@ -16,7 +16,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */ #include <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */
#ifndef WIN32 #ifndef WIN32
#define Int4 long int #define Int4 long int
@ -25,7 +25,6 @@
#define UInt2 unsigned short #define UInt2 unsigned short
typedef float SFLOAT; typedef float SFLOAT;
typedef double SDOUBLE; typedef double SDOUBLE;
#else #else
#define Int4 int #define Int4 int
#define UInt4 unsigned int #define UInt4 unsigned int
@ -36,13 +35,13 @@ typedef double SDOUBLE;
typedef UInt4 Oid; typedef UInt4 Oid;
/* Driver stuff */ /* Driver stuff */
#define ODBCVER 0x0250 #define ODBCVER 0x0250
#define DRIVER_ODBC_VER "02.50" #define DRIVER_ODBC_VER "02.50"
#define DRIVERNAME "PostgreSQL ODBC" #define DRIVERNAME "PostgreSQL ODBC"
#define DBMS_NAME "PostgreSQL" #define DBMS_NAME "PostgreSQL"
#define POSTGRESDRIVERVERSION "07.01.0003" #define POSTGRESDRIVERVERSION "07.01.0002"
#ifdef WIN32 #ifdef WIN32
#define DRIVER_FILE_NAME "PSQLODBC.DLL" #define DRIVER_FILE_NAME "PSQLODBC.DLL"
@ -52,53 +51,48 @@ typedef UInt4 Oid;
/* Limits */ /* Limits */
#ifdef WIN32 #ifdef WIN32
#define BLCKSZ 4096 #define BLCKSZ 4096
#endif #endif
#define MAX_MESSAGE_LEN 65536 /* This puts a limit on query size #define MAX_MESSAGE_LEN 65536 /* This puts a limit on query size but I don't */
* but I don't */ /* see an easy way round this - DJP 24-1-2001 */
/* see an easy way round this - DJP 24-1-2001 */ #define MAX_CONNECT_STRING 4096
#define MAX_CONNECT_STRING 4096 #define ERROR_MSG_LENGTH 4096
#define ERROR_MSG_LENGTH 4096 #define FETCH_MAX 100 /* default number of rows to cache for declare/fetch */
#define FETCH_MAX 100 /* default number of rows to cache #define TUPLE_MALLOC_INC 100
* for declare/fetch */ #define SOCK_BUFFER_SIZE 4096 /* default socket buffer size */
#define TUPLE_MALLOC_INC 100 #define MAX_CONNECTIONS 128 /* conns per environment (arbitrary) */
#define SOCK_BUFFER_SIZE 4096 /* default socket buffer size */ #define MAX_FIELDS 512
#define MAX_CONNECTIONS 128 /* conns per environment #define BYTELEN 8
* (arbitrary) */ #define VARHDRSZ sizeof(Int4)
#define MAX_FIELDS 512
#define BYTELEN 8
#define VARHDRSZ sizeof(Int4)
#define MAX_TABLE_LEN 32 #define MAX_TABLE_LEN 32
#define MAX_COLUMN_LEN 32 #define MAX_COLUMN_LEN 32
#define MAX_CURSOR_LEN 32 #define MAX_CURSOR_LEN 32
/* Registry length limits */ /* Registry length limits */
#define LARGE_REGISTRY_LEN 4096 /* used for special cases */ #define LARGE_REGISTRY_LEN 4096 /* used for special cases */
#define MEDIUM_REGISTRY_LEN 256 /* normal size for #define MEDIUM_REGISTRY_LEN 256 /* normal size for user,database,etc. */
* user,database,etc. */ #define SMALL_REGISTRY_LEN 10 /* for 1/0 settings */
#define SMALL_REGISTRY_LEN 10 /* for 1/0 settings */
/* These prefixes denote system tables */ /* These prefixes denote system tables */
#define POSTGRES_SYS_PREFIX "pg_" #define POSTGRES_SYS_PREFIX "pg_"
#define KEYS_TABLE "dd_fkey" #define KEYS_TABLE "dd_fkey"
/* Info limits */ /* Info limits */
#define MAX_INFO_STRING 128 #define MAX_INFO_STRING 128
#define MAX_KEYPARTS 20 #define MAX_KEYPARTS 20
#define MAX_KEYLEN 512 /* max key of the form #define MAX_KEYLEN 512 /* max key of the form "date+outlet+invoice" */
* "date+outlet+invoice" */ #define MAX_ROW_SIZE 0 /* Unlimited rowsize with the Tuple Toaster */
#define MAX_ROW_SIZE 0 /* Unlimited rowsize with the #define MAX_STATEMENT_LEN 0 /* Unlimited statement size with 7.0 */
* Tuple Toaster */
#define MAX_STATEMENT_LEN 0 /* Unlimited statement size with
* 7.0 */
/* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */ /* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */
/* Now that's 0, lets use this instead. DJP 24-1-2001 */ /* Now that's 0, lets use this instead. DJP 24-1-2001 */
#define STD_STATEMENT_LEN MAX_MESSAGE_LEN #define STD_STATEMENT_LEN MAX_MESSAGE_LEN
#define PG62 "6.2" /* "Protocol" key setting to force Postgres 6.2 */
#define PG63 "6.3" /* "Protocol" key setting to force postgres 6.3 */
#define PG64 "6.4" #define PG64 "6.4"
typedef struct ConnectionClass_ ConnectionClass; typedef struct ConnectionClass_ ConnectionClass;
@ -118,73 +112,60 @@ typedef struct lo_arg LO_ARG;
typedef struct GlobalValues_ typedef struct GlobalValues_
{ {
int fetch_max; int fetch_max;
int socket_buffersize; int socket_buffersize;
int unknown_sizes; int unknown_sizes;
int max_varchar_size; int max_varchar_size;
int max_longvarchar_size; int max_longvarchar_size;
char debug; char debug;
char commlog; char commlog;
char disable_optimizer; char disable_optimizer;
char ksqo; char ksqo;
char unique_index; char unique_index;
char onlyread; /* readonly is reserved on Digital C++ char onlyread; /* readonly is reserved on Digital C++ compiler */
* compiler */ char use_declarefetch;
char use_declarefetch; char text_as_longvarchar;
char text_as_longvarchar; char unknowns_as_longvarchar;
char unknowns_as_longvarchar; char bools_as_char;
char bools_as_char; char lie;
char lie; char parse;
char parse; char cancel_as_freestmt;
char cancel_as_freestmt; char extra_systable_prefixes[MEDIUM_REGISTRY_LEN];
char extra_systable_prefixes[MEDIUM_REGISTRY_LEN]; char conn_settings[LARGE_REGISTRY_LEN];
char conn_settings[LARGE_REGISTRY_LEN]; char protocol[SMALL_REGISTRY_LEN];
/* FILE* mylogFP;
* Protocol is not used anymore, but kept in case it is useful in the FILE* qlogFP;
* future. bjm 2001-02-10
*/
char protocol[SMALL_REGISTRY_LEN];
FILE *mylogFP;
FILE *qlogFP;
} GLOBAL_VALUES; } GLOBAL_VALUES;
typedef struct StatementOptions_ typedef struct StatementOptions_ {
{ int maxRows;
int maxRows; int maxLength;
int maxLength; int rowset_size;
int rowset_size; int keyset_size;
int keyset_size; int cursor_type;
int cursor_type; int scroll_concurrency;
int scroll_concurrency; int retrieve_data;
int retrieve_data; int bind_size; /* size of each structure if using Row Binding */
int bind_size; /* size of each structure if using Row int use_bookmarks;
* Binding */
int use_bookmarks;
} StatementOptions; } StatementOptions;
/* Used to pass extra query info to send_query */ /* Used to pass extra query info to send_query */
typedef struct QueryInfo_ typedef struct QueryInfo_ {
{ int row_size;
int row_size; QResultClass *result_in;
QResultClass *result_in; char *cursor;
char *cursor;
} QueryInfo; } QueryInfo;
#define PG_TYPE_LO -999 /* hack until permanent #define PG_TYPE_LO -999 /* hack until permanent type available */
* type available */ #define PG_TYPE_LO_NAME "lo"
#define PG_TYPE_LO_NAME "lo" #define OID_ATTNUM -2 /* the attnum in pg_index of the oid */
#define OID_ATTNUM -2 /* the attnum in pg_index of the
* oid */
/* sizes */ /* sizes */
#define TEXT_FIELD_SIZE 8190 /* size of text fields #define TEXT_FIELD_SIZE 8190 /* size of text fields (not including null term) */
* (not including null #define NAME_FIELD_SIZE 32 /* size of name fields */
* term) */ #define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not including null term) */
#define NAME_FIELD_SIZE 32 /* size of name fields */
#define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not
* including null term) */
#define PG_NUMERIC_MAX_PRECISION 1000 #define PG_NUMERIC_MAX_PRECISION 1000
#define PG_NUMERIC_MAX_SCALE 1000 #define PG_NUMERIC_MAX_SCALE 1000

33
src/interfaces/odbc/psqlodbc.rc
View File

@ -133,7 +133,7 @@ BEGIN
PUSHBUTTON "Defaults",IDDEFAULTS,185,205,50,15 PUSHBUTTON "Defaults",IDDEFAULTS,185,205,50,15
END END
DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 125 DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 267, 161
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Advanced Options (DataSource)" CAPTION "Advanced Options (DataSource)"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
@ -144,16 +144,23 @@ BEGIN
BS_AUTOCHECKBOX | WS_TABSTOP,130,10,85,10 BS_AUTOCHECKBOX | WS_TABSTOP,130,10,85,10
CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button", CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,25,25,85,10 BS_AUTOCHECKBOX | WS_TABSTOP,25,25,85,10
GROUPBOX "OID Options",IDC_STATIC,39,41,180,25 GROUPBOX "Protocol",IDC_STATIC,15,40,180,25
CONTROL "6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON | WS_GROUP,25,
50,35,10
CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,
75,50,26,10
CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,
130,50,26,10
GROUPBOX "OID Options",IDC_STATIC,15,70,180,25
CONTROL "Show &Column",DS_SHOWOIDCOLUMN,"Button",BS_AUTOCHECKBOX | CONTROL "Show &Column",DS_SHOWOIDCOLUMN,"Button",BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP,62,51,59,10 WS_GROUP | WS_TABSTOP,25,81,59,10
CONTROL "Fake &Index",DS_FAKEOIDINDEX,"Button",BS_AUTOCHECKBOX | CONTROL "Fake &Index",DS_FAKEOIDINDEX,"Button",BS_AUTOCHECKBOX |
WS_GROUP | WS_TABSTOP,151,51,51,10 WS_GROUP | WS_TABSTOP,115,81,51,10
RTEXT "Connect &Settings:",IDC_STATIC,11,73,35,25 RTEXT "Connect &Settings:",IDC_STATIC,10,105,35,25
EDITTEXT DS_CONNSETTINGS,49,73,200,20,ES_MULTILINE | EDITTEXT DS_CONNSETTINGS,50,105,200,20,ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN
DEFPUSHBUTTON "OK",IDOK,71,103,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,71,135,50,14,WS_GROUP
PUSHBUTTON "Cancel",IDCANCEL,145,103,50,14 PUSHBUTTON "Cancel",IDCANCEL,146,135,50,14
END END
@ -184,7 +191,7 @@ BEGIN
RIGHTMARGIN, 260 RIGHTMARGIN, 260
VERTGUIDE, 55 VERTGUIDE, 55
TOPMARGIN, 7 TOPMARGIN, 7
BOTTOMMARGIN, 118 BOTTOMMARGIN, 154
END END
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
@ -197,8 +204,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,1,0,3 FILEVERSION 7,1,0,2
PRODUCTVERSION 7,1,0,3 PRODUCTVERSION 7,1,0,2
FILEFLAGSMASK 0x3L FILEFLAGSMASK 0x3L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -216,14 +223,14 @@ BEGIN
VALUE "Comments", "PostgreSQL ODBC driver\0" VALUE "Comments", "PostgreSQL ODBC driver\0"
VALUE "CompanyName", "Insight Distribution Systems\0" VALUE "CompanyName", "Insight Distribution Systems\0"
VALUE "FileDescription", "PostgreSQL Driver\0" VALUE "FileDescription", "PostgreSQL Driver\0"
VALUE "FileVersion", " 07.01.0003\0" VALUE "FileVersion", " 07.01.0002\0"
VALUE "InternalName", "psqlodbc\0" VALUE "InternalName", "psqlodbc\0"
VALUE "LegalCopyright", "\0" VALUE "LegalCopyright", "\0"
VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft® is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0" VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft® is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0"
VALUE "OriginalFilename", "psqlodbc.dll\0" VALUE "OriginalFilename", "psqlodbc.dll\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Microsoft Open Database Connectivity\0" VALUE "ProductName", "Microsoft Open Database Connectivity\0"
VALUE "ProductVersion", " 07.01.0003\0" VALUE "ProductVersion", " 07.01.0002\0"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", "\0"
END END
END END

485
src/interfaces/odbc/qresult.c
View File

@ -1,19 +1,20 @@
/* Module: qresult.c
/* Module: qresult.c
* *
* Description: This module contains functions related to * Description: This module contains functions related to
* managing result information (i.e, fetching rows from the backend, * managing result information (i.e, fetching rows from the backend,
* managing the tuple cache, etc.) and retrieving it. * managing the tuple cache, etc.) and retrieving it.
* Depending on the situation, a QResultClass will hold either data * Depending on the situation, a QResultClass will hold either data
* from the backend or a manually built result (see "qresult.h" to * from the backend or a manually built result (see "qresult.h" to
* see which functions/macros are for manual or backend results. * see which functions/macros are for manual or backend results.
* For manually built results, the QResultClass simply points to * For manually built results, the QResultClass simply points to
* TupleList and ColumnInfo structures, which actually hold the data. * TupleList and ColumnInfo structures, which actually hold the data.
* *
* Classes: QResultClass (Functions prefix: "QR_") * Classes: QResultClass (Functions prefix: "QR_")
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -31,18 +32,18 @@
extern GLOBAL_VALUES globals; extern GLOBAL_VALUES globals;
/* Used for building a Manual Result only */ /* Used for building a Manual Result only */
/* All info functions call this function to create the manual result set. */ /* All info functions call this function to create the manual result set. */
void void
QR_set_num_fields(QResultClass *self, int new_num_fields) QR_set_num_fields(QResultClass *self, int new_num_fields)
{ {
mylog("in QR_set_num_fields\n"); mylog("in QR_set_num_fields\n");
CI_set_num_fields(self->fields, new_num_fields); CI_set_num_fields(self->fields, new_num_fields);
if (self->manual_tuples) if(self->manual_tuples)
TL_Destructor(self->manual_tuples); TL_Destructor(self->manual_tuples);
self->manual_tuples = TL_Constructor(new_num_fields); self->manual_tuples = TL_Constructor(new_num_fields);
mylog("exit QR_set_num_fields\n"); mylog("exit QR_set_num_fields\n");
} }
@ -72,24 +73,22 @@ QR_inc_base(QResultClass *self, int base_inc)
} }
/************************************/ /************************************/
/* CLASS QResult */ /* CLASS QResult */
/************************************/ /************************************/
QResultClass * QResultClass *
QR_Constructor(void) QR_Constructor(void)
{ {
QResultClass *rv; QResultClass *rv;
mylog("in QR_Constructor\n"); mylog("in QR_Constructor\n");
rv = (QResultClass *) malloc(sizeof(QResultClass)); rv = (QResultClass *) malloc(sizeof(QResultClass));
if (rv != NULL) if (rv != NULL) {
{
rv->status = PGRES_EMPTY_QUERY; rv->status = PGRES_EMPTY_QUERY;
/* construct the column info */ /* construct the column info */
if (!(rv->fields = CI_Constructor())) if ( ! (rv->fields = CI_Constructor())) {
{
free(rv); free(rv);
return NULL; return NULL;
} }
@ -110,6 +109,7 @@ QR_Constructor(void)
rv->cache_size = globals.fetch_max; rv->cache_size = globals.fetch_max;
rv->rowset_size = 1; rv->rowset_size = 1;
} }
mylog("exit QR_Constructor\n"); mylog("exit QR_Constructor\n");
@ -125,32 +125,33 @@ QR_Destructor(QResultClass *self)
if (self->manual_tuples) if (self->manual_tuples)
TL_Destructor(self->manual_tuples); TL_Destructor(self->manual_tuples);
/* If conn is defined, then we may have used "backend_tuples", */ /* If conn is defined, then we may have used "backend_tuples", */
/* so in case we need to, free it up. Also, close the cursor. */ /* so in case we need to, free it up. Also, close the cursor. */
if (self->conn && self->conn->sock && CC_is_in_trans(self->conn)) if (self->conn && self->conn->sock && CC_is_in_trans(self->conn))
QR_close(self); /* close the cursor if there is one */ QR_close(self); /* close the cursor if there is one */
QR_free_memory(self); /* safe to call anyway */ QR_free_memory(self); /* safe to call anyway */
/* Should have been freed in the close() but just in case... */ /* Should have been freed in the close() but just in case... */
if (self->cursor) if (self->cursor)
free(self->cursor); free(self->cursor);
/* Free up column info */ /* Free up column info */
if (self->fields) if (self->fields)
CI_Destructor(self->fields); CI_Destructor(self->fields);
/* Free command info (this is from strdup()) */ /* Free command info (this is from strdup()) */
if (self->command) if (self->command)
free(self->command); free(self->command);
/* Free notice info (this is from strdup()) */ /* Free notice info (this is from strdup()) */
if (self->notice) if (self->notice)
free(self->notice); free(self->notice);
free(self); free(self);
mylog("QResult: exit DESTRUCTOR\n"); mylog("QResult: exit DESTRUCTOR\n");
} }
void void
@ -174,28 +175,24 @@ QR_set_notice(QResultClass *self, char *msg)
void void
QR_free_memory(QResultClass *self) QR_free_memory(QResultClass *self)
{ {
register int lf, register int lf, row;
row; register TupleField *tuple = self->backend_tuples;
register TupleField *tuple = self->backend_tuples; int fcount = self->fcount;
int fcount = self->fcount; int num_fields = self->num_fields;
int num_fields = self->num_fields;
mylog("QResult: free memory in, fcount=%d\n", fcount); mylog("QResult: free memory in, fcount=%d\n", fcount);
if (self->backend_tuples) if ( self->backend_tuples) {
{
for (row = 0; row < fcount; row++) for (row = 0; row < fcount; row++) {
{
mylog("row = %d, num_fields = %d\n", row, num_fields); mylog("row = %d, num_fields = %d\n", row, num_fields);
for (lf = 0; lf < num_fields; lf++) for (lf=0; lf < num_fields; lf++) {
{ if (tuple[lf].value != NULL) {
if (tuple[lf].value != NULL)
{
mylog("free [lf=%d] %u\n", lf, tuple[lf].value); mylog("free [lf=%d] %u\n", lf, tuple[lf].value);
free(tuple[lf].value); free(tuple[lf].value);
} }
} }
tuple += num_fields;/* next row */ tuple += num_fields; /* next row */
} }
free(self->backend_tuples); free(self->backend_tuples);
@ -211,26 +208,23 @@ QR_free_memory(QResultClass *self)
char char
QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor) QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
{ {
int tuple_size; int tuple_size;
/* If called from send_query the first time (conn != NULL), */ /* If called from send_query the first time (conn != NULL), */
/* then set the inTuples state, */ /* then set the inTuples state, */
/* and read the tuples. If conn is NULL, */ /* and read the tuples. If conn is NULL, */
/* it implies that we are being called from next_tuple(), */ /* it implies that we are being called from next_tuple(), */
/* like to get more rows so don't call next_tuple again! */ /* like to get more rows so don't call next_tuple again! */
if (conn != NULL) if (conn != NULL) {
{
self->conn = conn; self->conn = conn;
mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n", (cursor == NULL) ? "" : cursor, self->cursor); mylog("QR_fetch_tuples: cursor = '%s', self->cursor=%u\n", (cursor==NULL)?"":cursor, self->cursor);
if (self->cursor) if (self->cursor)
free(self->cursor); free(self->cursor);
if (globals.use_declarefetch) if ( globals.use_declarefetch) {
{ if (! cursor || cursor[0] == '\0') {
if (!cursor || cursor[0] == '\0')
{
self->status = PGRES_INTERNAL_ERROR; self->status = PGRES_INTERNAL_ERROR;
QR_set_message(self, "Internal Error -- no cursor for fetch"); QR_set_message(self, "Internal Error -- no cursor for fetch");
return FALSE; return FALSE;
@ -238,15 +232,13 @@ QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
self->cursor = strdup(cursor); self->cursor = strdup(cursor);
} }
/* Read the field attributes. */ /* Read the field attributes. */
/* $$$$ Should do some error control HERE! $$$$ */ /* $$$$ Should do some error control HERE! $$$$ */
if (CI_read_fields(self->fields, self->conn)) if ( CI_read_fields(self->fields, self->conn)) {
{
self->status = PGRES_FIELDS_OK; self->status = PGRES_FIELDS_OK;
self->num_fields = CI_get_num_fields(self->fields); self->num_fields = CI_get_num_fields(self->fields);
} }
else else {
{
self->status = PGRES_BAD_RESPONSE; self->status = PGRES_BAD_RESPONSE;
QR_set_message(self, "Error reading field information"); QR_set_message(self, "Error reading field information");
return FALSE; return FALSE;
@ -262,8 +254,7 @@ QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
/* allocate memory for the tuple cache */ /* allocate memory for the tuple cache */
mylog("MALLOC: tuple_size = %d, size = %d\n", tuple_size, self->num_fields * sizeof(TupleField) * tuple_size); mylog("MALLOC: tuple_size = %d, size = %d\n", tuple_size, self->num_fields * sizeof(TupleField) * tuple_size);
self->backend_tuples = (TupleField *) malloc(self->num_fields * sizeof(TupleField) * tuple_size); self->backend_tuples = (TupleField *) malloc(self->num_fields * sizeof(TupleField) * tuple_size);
if (!self->backend_tuples) if ( ! self->backend_tuples) {
{
self->status = PGRES_FATAL_ERROR; self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Could not get memory for tuple cache."); QR_set_message(self, "Could not get memory for tuple cache.");
return FALSE; return FALSE;
@ -272,20 +263,19 @@ QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
self->inTuples = TRUE; self->inTuples = TRUE;
/* Force a read to occur in next_tuple */ /* Force a read to occur in next_tuple */
self->fcount = tuple_size + 1; self->fcount = tuple_size+1;
self->fetch_count = tuple_size + 1; self->fetch_count = tuple_size+1;
self->base = 0; self->base = 0;
return QR_next_tuple(self); return QR_next_tuple(self);
} }
else else {
{
/* Always have to read the field attributes. */
/* But we dont have to reallocate memory for them! */
if (!CI_read_fields(NULL, self->conn)) /* Always have to read the field attributes. */
{ /* But we dont have to reallocate memory for them! */
if ( ! CI_read_fields(NULL, self->conn)) {
self->status = PGRES_BAD_RESPONSE; self->status = PGRES_BAD_RESPONSE;
QR_set_message(self, "Error reading field information"); QR_set_message(self, "Error reading field information");
return FALSE; return FALSE;
@ -299,11 +289,10 @@ QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor)
int int
QR_close(QResultClass *self) QR_close(QResultClass *self)
{ {
QResultClass *res; QResultClass *res;
if (globals.use_declarefetch && self->conn && self->cursor) if (globals.use_declarefetch && self->conn && self->cursor) {
{ char buf[64];
char buf[64];
sprintf(buf, "close %s", self->cursor); sprintf(buf, "close %s", self->cursor);
mylog("QResult: closing cursor: '%s'\n", buf); mylog("QResult: closing cursor: '%s'\n", buf);
@ -316,29 +305,27 @@ QR_close(QResultClass *self)
free(self->cursor); free(self->cursor);
self->cursor = NULL; self->cursor = NULL;
if (res == NULL) if (res == NULL) {
{
self->status = PGRES_FATAL_ERROR; self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Error closing cursor."); QR_set_message(self, "Error closing cursor.");
return FALSE; return FALSE;
} }
/* End the transaction if there are no cursors left on this conn */ /* End the transaction if there are no cursors left on this conn */
if (CC_cursor_count(self->conn) == 0) if (CC_cursor_count(self->conn) == 0) {
{
mylog("QResult: END transaction on conn=%u\n", self->conn); mylog("QResult: END transaction on conn=%u\n", self->conn);
res = CC_send_query(self->conn, "END", NULL); res = CC_send_query(self->conn, "END", NULL);
CC_set_no_trans(self->conn); CC_set_no_trans(self->conn);
if (res == NULL) if (res == NULL) {
{
self->status = PGRES_FATAL_ERROR; self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Error ending transaction."); QR_set_message(self, "Error ending transaction.");
return FALSE; return FALSE;
} }
} }
} }
return TRUE; return TRUE;
@ -348,64 +335,54 @@ QR_close(QResultClass *self)
int int
QR_next_tuple(QResultClass *self) QR_next_tuple(QResultClass *self)
{ {
int id; int id;
QResultClass *res; QResultClass *res;
SocketClass *sock; SocketClass *sock;
/* Speed up access */ /* Speed up access */
int fetch_count = self->fetch_count; int fetch_count = self->fetch_count;
int fcount = self->fcount; int fcount = self->fcount;
int fetch_size, int fetch_size, offset= 0;
offset = 0; int end_tuple = self->rowset_size + self->base;
int end_tuple = self->rowset_size + self->base; char corrected = FALSE;
char corrected = FALSE; TupleField *the_tuples = self->backend_tuples;
TupleField *the_tuples = self->backend_tuples; static char msgbuffer[MAX_MESSAGE_LEN+1];
static char msgbuffer[MAX_MESSAGE_LEN + 1]; char cmdbuffer[MAX_MESSAGE_LEN+1]; /* QR_set_command() dups this string so dont need static */
char cmdbuffer[MAX_MESSAGE_LEN + 1]; /* QR_set_command() dups char fetch[128];
* this string so dont QueryInfo qi;
* need static */
char fetch[128];
QueryInfo qi;
if (fetch_count < fcount) if (fetch_count < fcount) { /* return a row from cache */
{ /* return a row from cache */
mylog("next_tuple: fetch_count < fcount: returning tuple %d, fcount = %d\n", fetch_count, fcount); mylog("next_tuple: fetch_count < fcount: returning tuple %d, fcount = %d\n", fetch_count, fcount);
self->tupleField = the_tuples + (fetch_count * self->num_fields); /* next row */ self->tupleField = the_tuples + (fetch_count * self->num_fields); /* next row */
self->fetch_count++; self->fetch_count++;
return TRUE; return TRUE;
} }
else if (self->fcount < self->cache_size) else if (self->fcount < self->cache_size) { /* last row from cache */
{ /* last row from cache */ /* We are done because we didn't even get CACHE_SIZE tuples */
/* We are done because we didn't even get CACHE_SIZE tuples */ mylog("next_tuple: fcount < CACHE_SIZE: fcount = %d, fetch_count = %d\n", fcount, fetch_count);
mylog("next_tuple: fcount < CACHE_SIZE: fcount = %d, fetch_count = %d\n", fcount, fetch_count); self->tupleField = NULL;
self->tupleField = NULL; self->status = PGRES_END_TUPLES;
self->status = PGRES_END_TUPLES; return -1; /* end of tuples */
return -1; /* end of tuples */
} }
else else {
{ /* See if we need to fetch another group of rows.
We may be being called from send_query(), and
/* if so, don't send another fetch, just fall through
* See if we need to fetch another group of rows. We may be being and read the tuples.
* called from send_query(), and if so, don't send another fetch, */
* just fall through and read the tuples.
*/
self->tupleField = NULL; self->tupleField = NULL;
if (!self->inTuples) if ( ! self->inTuples) {
{
if (!globals.use_declarefetch) if ( ! globals.use_declarefetch) {
{
mylog("next_tuple: ALL_ROWS: done, fcount = %d, fetch_count = %d\n", fcount, fetch_count); mylog("next_tuple: ALL_ROWS: done, fcount = %d, fetch_count = %d\n", fcount, fetch_count);
self->tupleField = NULL; self->tupleField = NULL;
self->status = PGRES_END_TUPLES; self->status = PGRES_END_TUPLES;
return -1; /* end of tuples */ return -1; /* end of tuples */
} }
if (self->base == fcount) if (self->base == fcount) { /* not a correction */
{ /* not a correction */
/* Determine the optimum cache size. */ /* Determine the optimum cache size. */
if (globals.fetch_max % self->rowset_size == 0) if (globals.fetch_max % self->rowset_size == 0)
fetch_size = globals.fetch_max; fetch_size = globals.fetch_max;
else if (self->rowset_size < globals.fetch_max) else if (self->rowset_size < globals.fetch_max)
@ -416,8 +393,7 @@ QR_next_tuple(QResultClass *self)
self->cache_size = fetch_size; self->cache_size = fetch_size;
self->fetch_count = 1; self->fetch_count = 1;
} }
else else { /* need to correct */
{ /* need to correct */
corrected = TRUE; corrected = TRUE;
@ -427,12 +403,12 @@ QR_next_tuple(QResultClass *self)
offset = self->fetch_count; offset = self->fetch_count;
self->fetch_count++; self->fetch_count++;
} }
self->backend_tuples = (TupleField *) realloc(self->backend_tuples, self->num_fields * sizeof(TupleField) * self->cache_size); self->backend_tuples = (TupleField *) realloc(self->backend_tuples, self->num_fields * sizeof(TupleField) * self->cache_size);
if (!self->backend_tuples) if ( ! self->backend_tuples) {
{
self->status = PGRES_FATAL_ERROR; self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Out of memory while reading tuples."); QR_set_message(self, "Out of memory while reading tuples.");
return FALSE; return FALSE;
@ -441,34 +417,29 @@ QR_next_tuple(QResultClass *self)
mylog("next_tuple: sending actual fetch (%d) query '%s'\n", fetch_size, fetch); mylog("next_tuple: sending actual fetch (%d) query '%s'\n", fetch_size, fetch);
/* don't read ahead for the next tuple (self) ! */ /* don't read ahead for the next tuple (self) ! */
qi.row_size = self->cache_size; qi.row_size = self->cache_size;
qi.result_in = self; qi.result_in = self;
qi.cursor = NULL; qi.cursor = NULL;
res = CC_send_query(self->conn, fetch, &qi); res = CC_send_query(self->conn, fetch, &qi);
if (res == NULL) if (res == NULL) {
{
self->status = PGRES_FATAL_ERROR; self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Error fetching next group."); QR_set_message(self, "Error fetching next group.");
return FALSE; return FALSE;
} }
self->inTuples = TRUE; self->inTuples = TRUE;
} }
else else {
{
mylog("next_tuple: inTuples = true, falling through: fcount = %d, fetch_count = %d\n", self->fcount, self->fetch_count); mylog("next_tuple: inTuples = true, falling through: fcount = %d, fetch_count = %d\n", self->fcount, self->fetch_count);
/* This is a pre-fetch (fetching rows right after query
/* but before any real SQLFetch() calls. This is done
* This is a pre-fetch (fetching rows right after query but so the field attributes are available.
* before any real SQLFetch() calls. This is done so the */
* field attributes are available.
*/
self->fetch_count = 0; self->fetch_count = 0;
} }
} }
if (!corrected) if ( ! corrected) {
{
self->base = 0; self->base = 0;
self->fcount = 0; self->fcount = 0;
} }
@ -477,96 +448,88 @@ QR_next_tuple(QResultClass *self)
sock = CC_get_socket(self->conn); sock = CC_get_socket(self->conn);
self->tupleField = NULL; self->tupleField = NULL;
for (;;) for ( ; ;) {
{
id = SOCK_get_char(sock); id = SOCK_get_char(sock);
switch (id) switch (id) {
{ case 'T': /* Tuples within tuples cannot be handled */
case 'T': /* Tuples within tuples cannot be handled */ self->status = PGRES_BAD_RESPONSE;
self->status = PGRES_BAD_RESPONSE; QR_set_message(self, "Tuples within tuples cannot be handled");
QR_set_message(self, "Tuples within tuples cannot be handled"); return FALSE;
return FALSE; case 'B': /* Tuples in binary format */
case 'B': /* Tuples in binary format */ case 'D': /* Tuples in ASCII format */
case 'D': /* Tuples in ASCII format */
if (!globals.use_declarefetch && self->fcount > 0 && !(self->fcount % TUPLE_MALLOC_INC)) if ( ! globals.use_declarefetch && self->fcount > 0 && ! (self->fcount % TUPLE_MALLOC_INC)) {
{ size_t old_size = self->fcount * self->num_fields * sizeof(TupleField);
size_t old_size = self->fcount * self->num_fields * sizeof(TupleField); mylog("REALLOC: old_size = %d\n", old_size);
mylog("REALLOC: old_size = %d\n", old_size); self->backend_tuples = (TupleField *) realloc(self->backend_tuples, old_size + (self->num_fields * sizeof(TupleField) * TUPLE_MALLOC_INC));
if ( ! self->backend_tuples) {
self->backend_tuples = (TupleField *) realloc(self->backend_tuples, old_size + (self->num_fields * sizeof(TupleField) * TUPLE_MALLOC_INC)); self->status = PGRES_FATAL_ERROR;
if (!self->backend_tuples) QR_set_message(self, "Out of memory while reading tuples.");
{
self->status = PGRES_FATAL_ERROR;
QR_set_message(self, "Out of memory while reading tuples.");
return FALSE;
}
}
if (!QR_read_tuple(self, (char) (id == 0)))
{
self->status = PGRES_BAD_RESPONSE;
QR_set_message(self, "Error reading the tuple");
return FALSE; return FALSE;
} }
}
self->fcount++; if ( ! QR_read_tuple(self, (char) (id == 0))) {
break; /* continue reading */ self->status = PGRES_BAD_RESPONSE;
QR_set_message(self, "Error reading the tuple");
case 'C': /* End of tuple list */
SOCK_get_string(sock, cmdbuffer, MAX_MESSAGE_LEN);
QR_set_command(self, cmdbuffer);
mylog("end of tuple list -- setting inUse to false: this = %u\n", self);
self->inTuples = FALSE;
if (self->fcount > 0)
{
qlog(" [ fetched %d rows ]\n", self->fcount);
mylog("_next_tuple: 'C' fetch_max && fcount = %d\n", self->fcount);
/* set to first row */
self->tupleField = self->backend_tuples + (offset * self->num_fields);
return TRUE;
}
else
{ /* We are surely done here (we read 0
* tuples) */
qlog(" [ fetched 0 rows ]\n");
mylog("_next_tuple: 'C': DONE (fcount == 0)\n");
return -1; /* end of tuples */
}
case 'E': /* Error */
SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH);
QR_set_message(self, msgbuffer);
self->status = PGRES_FATAL_ERROR;
if (!strncmp(msgbuffer, "FATAL", 5))
CC_set_no_trans(self->conn);
qlog("ERROR from backend in next_tuple: '%s'\n", msgbuffer);
return FALSE; return FALSE;
}
case 'N': /* Notice */ self->fcount++;
SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH); break; /* continue reading */
QR_set_message(self, msgbuffer);
self->status = PGRES_NONFATAL_ERROR;
qlog("NOTICE from backend in next_tuple: '%s'\n", msgbuffer);
continue;
default: /* this should only happen if the backend
* dumped core */ case 'C': /* End of tuple list */
mylog("QR_next_tuple: Unexpected result from backend: id = '%c' (%d)\n", id, id); SOCK_get_string(sock, cmdbuffer, MAX_MESSAGE_LEN);
qlog("QR_next_tuple: Unexpected result from backend: id = '%c' (%d)\n", id, id); QR_set_command(self, cmdbuffer);
QR_set_message(self, "Unexpected result from backend. It probably crashed");
self->status = PGRES_FATAL_ERROR; mylog("end of tuple list -- setting inUse to false: this = %u\n", self);
self->inTuples = FALSE;
if (self->fcount > 0) {
qlog(" [ fetched %d rows ]\n", self->fcount);
mylog("_next_tuple: 'C' fetch_max && fcount = %d\n", self->fcount);
/* set to first row */
self->tupleField = self->backend_tuples + (offset * self->num_fields);
return TRUE;
}
else { /* We are surely done here (we read 0 tuples) */
qlog(" [ fetched 0 rows ]\n");
mylog("_next_tuple: 'C': DONE (fcount == 0)\n");
return -1; /* end of tuples */
}
case 'E': /* Error */
SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH);
QR_set_message(self, msgbuffer);
self->status = PGRES_FATAL_ERROR;
if ( ! strncmp(msgbuffer, "FATAL", 5))
CC_set_no_trans(self->conn); CC_set_no_trans(self->conn);
return FALSE;
qlog("ERROR from backend in next_tuple: '%s'\n", msgbuffer);
return FALSE;
case 'N': /* Notice */
SOCK_get_string(sock, msgbuffer, ERROR_MSG_LENGTH);
QR_set_message(self, msgbuffer);
self->status = PGRES_NONFATAL_ERROR;
qlog("NOTICE from backend in next_tuple: '%s'\n", msgbuffer);
continue;
default: /* this should only happen if the backend dumped core */
mylog("QR_next_tuple: Unexpected result from backend: id = '%c' (%d)\n", id, id);
qlog("QR_next_tuple: Unexpected result from backend: id = '%c' (%d)\n", id, id);
QR_set_message(self, "Unexpected result from backend. It probably crashed");
self->status = PGRES_FATAL_ERROR;
CC_set_no_trans(self->conn);
return FALSE;
} }
} }
return TRUE; return TRUE;
@ -575,18 +538,17 @@ QR_next_tuple(QResultClass *self)
char char
QR_read_tuple(QResultClass *self, char binary) QR_read_tuple(QResultClass *self, char binary)
{ {
Int2 field_lf; Int2 field_lf;
TupleField *this_tuplefield; TupleField *this_tuplefield;
char bmp, char bmp, bitmap[MAX_FIELDS]; /* Max. len of the bitmap */
bitmap[MAX_FIELDS]; /* Max. len of the bitmap */ Int2 bitmaplen; /* len of the bitmap in bytes */
Int2 bitmaplen; /* len of the bitmap in bytes */ Int2 bitmap_pos;
Int2 bitmap_pos; Int2 bitcnt;
Int2 bitcnt; Int4 len;
Int4 len; char *buffer;
char *buffer; int num_fields = self->num_fields; /* speed up access */
int num_fields = self->num_fields; /* speed up access */ SocketClass *sock = CC_get_socket(self->conn);
SocketClass *sock = CC_get_socket(self->conn); ColumnInfoClass *flds;
ColumnInfoClass *flds;
/* set the current row to read the fields into */ /* set the current row to read the fields into */
@ -597,36 +559,31 @@ QR_read_tuple(QResultClass *self, char binary)
bitmaplen++; bitmaplen++;
/* /*
* At first the server sends a bitmap that indicates which database At first the server sends a bitmap that indicates which
* fields are null database fields are null
*/ */
SOCK_get_n_char(sock, bitmap, bitmaplen); SOCK_get_n_char(sock, bitmap, bitmaplen);
bitmap_pos = 0; bitmap_pos = 0;
bitcnt = 0; bitcnt = 0;
bmp = bitmap[bitmap_pos]; bmp = bitmap[bitmap_pos];
for (field_lf = 0; field_lf < num_fields; field_lf++) for(field_lf = 0; field_lf < num_fields; field_lf++) {
{
/* Check if the current field is NULL */ /* Check if the current field is NULL */
if (!(bmp & 0200)) if(!(bmp & 0200)) {
{
/* YES, it is NULL ! */ /* YES, it is NULL ! */
this_tuplefield[field_lf].len = 0; this_tuplefield[field_lf].len = 0;
this_tuplefield[field_lf].value = 0; this_tuplefield[field_lf].value = 0;
} } else {
else
{
/* /*
* NO, the field is not null. so get at first the length of NO, the field is not null. so get at first the
* the field (four bytes) length of the field (four bytes)
*/ */
len = SOCK_get_int(sock, VARHDRSZ); len = SOCK_get_int(sock, VARHDRSZ);
if (!binary) if (!binary)
len -= VARHDRSZ; len -= VARHDRSZ;
buffer = (char *) malloc(len + 1); buffer = (char *)malloc(len+1);
SOCK_get_n_char(sock, buffer, len); SOCK_get_n_char(sock, buffer, len);
buffer[len] = '\0'; buffer[len] = '\0';
@ -635,31 +592,27 @@ QR_read_tuple(QResultClass *self, char binary)
this_tuplefield[field_lf].len = len; this_tuplefield[field_lf].len = len;
this_tuplefield[field_lf].value = buffer; this_tuplefield[field_lf].value = buffer;
/* /* This can be used to set the longest length of the column for any
* This can be used to set the longest length of the column row in the tuple cache. It would not be accurate for varchar and
* for any row in the tuple cache. It would not be accurate text fields to use this since a tuple cache is only 100 rows.
* for varchar and text fields to use this since a tuple cache Bpchar can be handled since the strlen of all rows is fixed,
* is only 100 rows. Bpchar can be handled since the strlen of assuming there are not 100 nulls in a row!
* all rows is fixed, assuming there are not 100 nulls in a */
* row!
*/
flds = self->fields; flds = self->fields;
if (flds->display_size[field_lf] < len) if (flds->display_size[field_lf] < len)
flds->display_size[field_lf] = len; flds->display_size[field_lf] = len;
} }
/* /*
* Now adjust for the next bit to be scanned in the next loop. Now adjust for the next bit to be scanned in the
*/ next loop.
*/
bitcnt++; bitcnt++;
if (BYTELEN == bitcnt) if (BYTELEN == bitcnt) {
{
bitmap_pos++; bitmap_pos++;
bmp = bitmap[bitmap_pos]; bmp = bitmap[bitmap_pos];
bitcnt = 0; bitcnt = 0;
} } else
else
bmp <<= 1; bmp <<= 1;
} }
self->currTuple++; self->currTuple++;

115
src/interfaces/odbc/qresult.h
View File

@ -1,9 +1,9 @@
/* File: qresult.h /* File: qresult.h
* *
* Description: See "qresult.c" * Description: See "qresult.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -17,65 +17,58 @@
#include "psqlodbc.h" #include "psqlodbc.h"
#include "tuple.h" #include "tuple.h"
enum QueryResultCode_ enum QueryResultCode_ {
{ PGRES_EMPTY_QUERY = 0,
PGRES_EMPTY_QUERY = 0, PGRES_COMMAND_OK, /* a query command that doesn't return */
PGRES_COMMAND_OK, /* a query command that doesn't return */ /* anything was executed properly by the backend */
/* anything was executed properly by the backend */ PGRES_TUPLES_OK, /* a query command that returns tuples */
PGRES_TUPLES_OK, /* a query command that returns tuples */ /* was executed properly by the backend, PGresult */
/* was executed properly by the backend, PGresult */ /* contains the resulttuples */
/* contains the resulttuples */ PGRES_COPY_OUT,
PGRES_COPY_OUT, PGRES_COPY_IN,
PGRES_COPY_IN, PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from the backend */
PGRES_BAD_RESPONSE, /* an unexpected response was recv'd from PGRES_NONFATAL_ERROR,
* the backend */ PGRES_FATAL_ERROR,
PGRES_NONFATAL_ERROR, PGRES_FIELDS_OK, /* field information from a query was successful */
PGRES_FATAL_ERROR, PGRES_END_TUPLES,
PGRES_FIELDS_OK, /* field information from a query was PGRES_INTERNAL_ERROR
* successful */
PGRES_END_TUPLES,
PGRES_INTERNAL_ERROR
}; };
typedef enum QueryResultCode_ QueryResultCode; typedef enum QueryResultCode_ QueryResultCode;
struct QResultClass_ struct QResultClass_ {
{ ColumnInfoClass *fields; /* the Column information */
ColumnInfoClass *fields; /* the Column information */ TupleListClass *manual_tuples; /* manual result tuple list */
TupleListClass *manual_tuples; /* manual result tuple list */ ConnectionClass *conn; /* the connection this result is using (backend) */
ConnectionClass *conn; /* the connection this result is using
* (backend) */
/* Stuff for declare/fetch tuples */ /* Stuff for declare/fetch tuples */
int fetch_count; /* logical rows read so far */ int fetch_count; /* logical rows read so far */
int fcount; /* actual rows read in the fetch */ int fcount; /* actual rows read in the fetch */
int currTuple; int currTuple;
int base; int base;
int num_fields; /* number of fields in the result */ int num_fields; /* number of fields in the result */
int cache_size; int cache_size;
int rowset_size; int rowset_size;
QueryResultCode status; QueryResultCode status;
char *message; char *message;
char *cursor; /* The name of the cursor for select char *cursor; /* The name of the cursor for select statements */
* statements */ char *command;
char *command; char *notice;
char *notice;
TupleField *backend_tuples; /* data from the backend (the tuple cache) */ TupleField *backend_tuples; /* data from the backend (the tuple cache) */
TupleField *tupleField; /* current backend tuple being retrieved */ TupleField *tupleField; /* current backend tuple being retrieved */
char inTuples; /* is a fetch of rows from the backend in char inTuples; /* is a fetch of rows from the backend in progress? */
* progress? */
}; };
#define QR_get_fields(self) (self->fields) #define QR_get_fields(self) (self->fields)
/* These functions are for retrieving data from the qresult */ /* These functions are for retrieving data from the qresult */
#define QR_get_value_manual(self, tupleno, fieldno) (TL_get_fieldval(self->manual_tuples, tupleno, fieldno)) #define QR_get_value_manual(self, tupleno, fieldno) (TL_get_fieldval(self->manual_tuples, tupleno, fieldno))
#define QR_get_value_backend(self, fieldno) (self->tupleField[fieldno].value) #define QR_get_value_backend(self, fieldno) (self->tupleField[fieldno].value)
#define QR_get_value_backend_row(self, tupleno, fieldno) ((self->backend_tuples + (tupleno * self->num_fields))[fieldno].value) #define QR_get_value_backend_row(self, tupleno, fieldno) ((self->backend_tuples + (tupleno * self->num_fields))[fieldno].value)
@ -83,9 +76,9 @@ struct QResultClass_
#define QR_NumResultCols(self) (CI_get_num_fields(self->fields)) #define QR_NumResultCols(self) (CI_get_num_fields(self->fields))
#define QR_get_fieldname(self, fieldno_) (CI_get_fieldname(self->fields, fieldno_)) #define QR_get_fieldname(self, fieldno_) (CI_get_fieldname(self->fields, fieldno_))
#define QR_get_fieldsize(self, fieldno_) (CI_get_fieldsize(self->fields, fieldno_)) #define QR_get_fieldsize(self, fieldno_) (CI_get_fieldsize(self->fields, fieldno_))
#define QR_get_display_size(self, fieldno_) (CI_get_display_size(self->fields, fieldno_)) #define QR_get_display_size(self, fieldno_) (CI_get_display_size(self->fields, fieldno_))
#define QR_get_atttypmod(self, fieldno_) (CI_get_atttypmod(self->fields, fieldno_)) #define QR_get_atttypmod(self, fieldno_) (CI_get_atttypmod(self->fields, fieldno_))
#define QR_get_field_type(self, fieldno_) (CI_get_oid(self->fields, fieldno_)) #define QR_get_field_type(self, fieldno_) (CI_get_oid(self->fields, fieldno_))
/* These functions are used only for manual result sets */ /* These functions are used only for manual result sets */
#define QR_get_num_tuples(self) (self->manual_tuples ? TL_get_num_tuples(self->manual_tuples) : self->fcount) #define QR_get_num_tuples(self) (self->manual_tuples ? TL_get_num_tuples(self->manual_tuples) : self->fcount)
@ -106,20 +99,20 @@ struct QResultClass_
/* Core Functions */ /* Core Functions */
QResultClass *QR_Constructor(void); QResultClass *QR_Constructor(void);
void QR_Destructor(QResultClass *self); void QR_Destructor(QResultClass *self);
char QR_read_tuple(QResultClass *self, char binary); char QR_read_tuple(QResultClass *self, char binary);
int QR_next_tuple(QResultClass *self); int QR_next_tuple(QResultClass *self);
int QR_close(QResultClass *self); int QR_close(QResultClass *self);
char QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor); char QR_fetch_tuples(QResultClass *self, ConnectionClass *conn, char *cursor);
void QR_free_memory(QResultClass *self); void QR_free_memory(QResultClass *self);
void QR_set_command(QResultClass *self, char *msg); void QR_set_command(QResultClass *self, char *msg);
void QR_set_notice(QResultClass *self, char *msg); void QR_set_notice(QResultClass *self, char *msg);
void QR_set_num_fields(QResultClass *self, int new_num_fields); /* manual result only */ void QR_set_num_fields(QResultClass *self, int new_num_fields); /* manual result only */
void QR_inc_base(QResultClass *self, int base_inc); void QR_inc_base(QResultClass *self, int base_inc);
void QR_set_cache_size(QResultClass *self, int cache_size); void QR_set_cache_size(QResultClass *self, int cache_size);
void QR_set_rowset_size(QResultClass *self, int rowset_size); void QR_set_rowset_size(QResultClass *self, int rowset_size);
void QR_set_position(QResultClass *self, int pos); void QR_set_position(QResultClass *self, int pos);
#endif #endif

110
src/interfaces/odbc/resource.h
View File

@ -1,60 +1,62 @@
/* {{NO_DEPENDENCIES}} */ /* {{NO_DEPENDENCIES}} */
/* Microsoft Developer Studio generated include file. */ /* Microsoft Developer Studio generated include file. */
/* Used by psqlodbc.rc */ /* Used by psqlodbc.rc */
/* */
#define IDS_BADDSN 1 #define IDS_BADDSN 1
#define IDS_MSGTITLE 2 #define IDS_MSGTITLE 2
#define DLG_OPTIONS_DRV 102 #define DLG_OPTIONS_DRV 102
#define DLG_OPTIONS_DS 103 #define DLG_OPTIONS_DS 103
#define IDC_DSNAME 400 #define IDC_DSNAME 400
#define IDC_DSNAMETEXT 401 #define IDC_DSNAMETEXT 401
#define IDC_DESC 404 #define IDC_DESC 404
#define IDC_SERVER 407 #define IDC_SERVER 407
#define IDC_DATABASE 408 #define IDC_DATABASE 408
#define DLG_CONFIG 1001 #define DLG_CONFIG 1001
#define IDC_PORT 1002 #define IDC_PORT 1002
#define IDC_USER 1006 #define IDC_USER 1006
#define IDC_PASSWORD 1009 #define IDC_PASSWORD 1009
#define DS_READONLY 1011 #define DS_READONLY 1011
#define DS_SHOWOIDCOLUMN 1012 #define DS_SHOWOIDCOLUMN 1012
#define DS_FAKEOIDINDEX 1013 #define DS_FAKEOIDINDEX 1013
#define DRV_COMMLOG 1014 #define DRV_COMMLOG 1014
#define IDC_DATASOURCE 1018 #define DS_PG62 1016
#define DRV_OPTIMIZER 1019 #define IDC_DATASOURCE 1018
#define DS_CONNSETTINGS 1020 #define DRV_OPTIMIZER 1019
#define IDC_DRIVER 1021 #define DS_CONNSETTINGS 1020
#define DRV_CONNSETTINGS 1031 #define IDC_DRIVER 1021
#define DRV_UNIQUEINDEX 1032 #define DRV_CONNSETTINGS 1031
#define DRV_UNKNOWN_MAX 1035 #define DRV_UNIQUEINDEX 1032
#define DRV_UNKNOWN_DONTKNOW 1036 #define DRV_UNKNOWN_MAX 1035
#define DRV_READONLY 1037 #define DRV_UNKNOWN_DONTKNOW 1036
#define IDC_DESCTEXT 1039 #define DRV_READONLY 1037
#define DRV_MSG_LABEL 1040 #define IDC_DESCTEXT 1039
#define DRV_UNKNOWN_LONGEST 1041 #define DRV_MSG_LABEL 1040
#define DRV_TEXT_LONGVARCHAR 1043 #define DRV_UNKNOWN_LONGEST 1041
#define DRV_UNKNOWNS_LONGVARCHAR 1044 #define DRV_TEXT_LONGVARCHAR 1043
#define DRV_CACHE_SIZE 1045 #define DRV_UNKNOWNS_LONGVARCHAR 1044
#define DRV_VARCHAR_SIZE 1046 #define DRV_CACHE_SIZE 1045
#define DRV_LONGVARCHAR_SIZE 1047 #define DRV_VARCHAR_SIZE 1046
#define IDDEFAULTS 1048 #define DRV_LONGVARCHAR_SIZE 1047
#define DRV_USEDECLAREFETCH 1049 #define IDDEFAULTS 1048
#define DRV_BOOLS_CHAR 1050 #define DRV_USEDECLAREFETCH 1049
#define DS_SHOWSYSTEMTABLES 1051 #define DRV_BOOLS_CHAR 1050
#define DRV_EXTRASYSTABLEPREFIXES 1051 #define DS_SHOWSYSTEMTABLES 1051
#define DS_ROWVERSIONING 1052 #define DRV_EXTRASYSTABLEPREFIXES 1051
#define DRV_PARSE 1052 #define DS_ROWVERSIONING 1052
#define DRV_CANCELASFREESTMT 1053 #define DRV_PARSE 1052
#define IDC_OPTIONS 1054 #define DRV_CANCELASFREESTMT 1053
#define DRV_KSQO 1055 #define IDC_OPTIONS 1054
#define DS_PG64 1057 #define DRV_KSQO 1055
#define DS_PG64 1057
#define DS_PG63 1058
/* Next default values for new objects */
/* Next default values for new objects */
/* */
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 104 #define _APS_NEXT_RESOURCE_VALUE 104
#define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1060 #define _APS_NEXT_CONTROL_VALUE 1060
#define _APS_NEXT_SYMED_VALUE 101 #define _APS_NEXT_SYMED_VALUE 101
#endif #endif
#endif #endif

1194
src/interfaces/odbc/results.c
View File

File diff suppressed because it is too large Load Diff

614
src/interfaces/odbc/setup.c
View File

@ -1,14 +1,15 @@
/* Module: setup.c
/* Module: setup.c
* *
* Description: This module contains the setup functions for * Description: This module contains the setup functions for
* adding/modifying a Data Source in the ODBC.INI portion * adding/modifying a Data Source in the ODBC.INI portion
* of the registry. * of the registry.
* *
* Classes: n/a * Classes: n/a
* *
* API functions: ConfigDSN * API functions: ConfigDSN
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*************************************************************************************/ *************************************************************************************/
@ -25,311 +26,288 @@
#define INTFUNC __stdcall #define INTFUNC __stdcall
extern HINSTANCE NEAR s_hModule;/* Saved module handle. */ extern HINSTANCE NEAR s_hModule; /* Saved module handle. */
extern GLOBAL_VALUES globals; extern GLOBAL_VALUES globals;
/* Constants --------------------------------------------------------------- */ /* Constants --------------------------------------------------------------- */
#define MIN(x,y) ((x) < (y) ? (x) : (y)) #define MIN(x,y) ((x) < (y) ? (x) : (y))
#ifdef WIN32 #ifdef WIN32
#define MAXPGPATH (255+1) #define MAXPGPATH (255+1)
#endif #endif
#define MAXKEYLEN (15+1) /* Max keyword length */ #define MAXKEYLEN (15+1) /* Max keyword length */
#define MAXDESC (255+1) /* Max description length */ #define MAXDESC (255+1) /* Max description length */
#define MAXDSNAME (32+1) /* Max data source name length */ #define MAXDSNAME (32+1) /* Max data source name length */
/* Globals ----------------------------------------------------------------- */ /* Globals ----------------------------------------------------------------- */
/* NOTE: All these are used by the dialog procedures */ /* NOTE: All these are used by the dialog procedures */
typedef struct tagSETUPDLG typedef struct tagSETUPDLG {
{ HWND hwndParent; /* Parent window handle */
HWND hwndParent; /* Parent window handle */ LPCSTR lpszDrvr; /* Driver description */
LPCSTR lpszDrvr; /* Driver description */ ConnInfo ci;
ConnInfo ci; char szDSN[MAXDSNAME]; /* Original data source name */
char szDSN[MAXDSNAME]; /* Original data source name */ BOOL fNewDSN; /* New data source flag */
BOOL fNewDSN; /* New data source flag */ BOOL fDefault; /* Default data source flag */
BOOL fDefault; /* Default data source flag */
} SETUPDLG, FAR *LPSETUPDLG; } SETUPDLG, FAR *LPSETUPDLG;
/* Prototypes -------------------------------------------------------------- */ /* Prototypes -------------------------------------------------------------- */
void INTFUNC CenterDialog(HWND hdlg); void INTFUNC CenterDialog(HWND hdlg);
int CALLBACK ConfigDlgProc(HWND hdlg, WORD wMsg, WPARAM wParam, LPARAM lParam); int CALLBACK ConfigDlgProc(HWND hdlg, WORD wMsg, WPARAM wParam, LPARAM lParam);
void INTFUNC ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg); void INTFUNC ParseAttributes (LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg);
BOOL INTFUNC SetDSNAttributes(HWND hwnd, LPSETUPDLG lpsetupdlg); BOOL INTFUNC SetDSNAttributes(HWND hwnd, LPSETUPDLG lpsetupdlg);
/* ConfigDSN --------------------------------------------------------------- /* ConfigDSN ---------------------------------------------------------------
Description: ODBC Setup entry point Description: ODBC Setup entry point
This entry point is called by the ODBC Installer This entry point is called by the ODBC Installer
(see file header for more details) (see file header for more details)
Input : hwnd ----------- Parent window handle Input : hwnd ----------- Parent window handle
fRequest ------- Request type (i.e., add, config, or remove) fRequest ------- Request type (i.e., add, config, or remove)
lpszDriver ----- Driver name lpszDriver ----- Driver name
lpszAttributes - data source attribute string lpszAttributes - data source attribute string
Output : TRUE success, FALSE otherwise Output : TRUE success, FALSE otherwise
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
BOOL CALLBACK BOOL CALLBACK ConfigDSN (HWND hwnd,
ConfigDSN(HWND hwnd, WORD fRequest,
WORD fRequest, LPCSTR lpszDriver,
LPCSTR lpszDriver, LPCSTR lpszAttributes)
LPCSTR lpszAttributes)
{ {
BOOL fSuccess; /* Success/fail flag */ BOOL fSuccess; /* Success/fail flag */
GLOBALHANDLE hglbAttr; GLOBALHANDLE hglbAttr;
LPSETUPDLG lpsetupdlg; LPSETUPDLG lpsetupdlg;
/* Allocate attribute array */ /* Allocate attribute array */
hglbAttr = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof(SETUPDLG)); hglbAttr = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof(SETUPDLG));
if (!hglbAttr) if (!hglbAttr)
return FALSE; return FALSE;
lpsetupdlg = (LPSETUPDLG) GlobalLock(hglbAttr); lpsetupdlg = (LPSETUPDLG)GlobalLock(hglbAttr);
/* Parse attribute string */ /* Parse attribute string */
if (lpszAttributes) if (lpszAttributes)
ParseAttributes(lpszAttributes, lpsetupdlg); ParseAttributes(lpszAttributes, lpsetupdlg);
/* Save original data source name */ /* Save original data source name */
if (lpsetupdlg->ci.dsn[0]) if (lpsetupdlg->ci.dsn[0])
lstrcpy(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn); lstrcpy(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn);
else else
lpsetupdlg->szDSN[0] = '\0'; lpsetupdlg->szDSN[0] = '\0';
/* Remove data source */ /* Remove data source */
if (ODBC_REMOVE_DSN == fRequest) if (ODBC_REMOVE_DSN == fRequest) {
{
/* Fail if no data source name was supplied */ /* Fail if no data source name was supplied */
if (!lpsetupdlg->ci.dsn[0]) if (!lpsetupdlg->ci.dsn[0])
fSuccess = FALSE; fSuccess = FALSE;
/* Otherwise remove data source from ODBC.INI */ /* Otherwise remove data source from ODBC.INI */
else else
fSuccess = SQLRemoveDSNFromIni(lpsetupdlg->ci.dsn); fSuccess = SQLRemoveDSNFromIni(lpsetupdlg->ci.dsn);
} }
/* Add or Configure data source */ /* Add or Configure data source */
else else {
{
/* Save passed variables for global access (e.g., dialog access) */ /* Save passed variables for global access (e.g., dialog access) */
lpsetupdlg->hwndParent = hwnd; lpsetupdlg->hwndParent = hwnd;
lpsetupdlg->lpszDrvr = lpszDriver; lpsetupdlg->lpszDrvr = lpszDriver;
lpsetupdlg->fNewDSN = (ODBC_ADD_DSN == fRequest); lpsetupdlg->fNewDSN = (ODBC_ADD_DSN == fRequest);
lpsetupdlg->fDefault = !lstrcmpi(lpsetupdlg->ci.dsn, INI_DSN); lpsetupdlg->fDefault = !lstrcmpi(lpsetupdlg->ci.dsn, INI_DSN);
/* /* Display the appropriate dialog (if parent window handle supplied) */
* Display the appropriate dialog (if parent window handle if (hwnd) {
* supplied) /* Display dialog(s) */
*/ fSuccess = (IDOK == DialogBoxParam(s_hModule,
if (hwnd) MAKEINTRESOURCE(DLG_CONFIG),
{ hwnd,
/* Display dialog(s) */ ConfigDlgProc,
fSuccess = (IDOK == DialogBoxParam(s_hModule, (LONG)(LPSTR)lpsetupdlg));
MAKEINTRESOURCE(DLG_CONFIG), }
hwnd,
ConfigDlgProc,
(LONG) (LPSTR) lpsetupdlg));
}
else if (lpsetupdlg->ci.dsn[0]) else if (lpsetupdlg->ci.dsn[0])
fSuccess = SetDSNAttributes(hwnd, lpsetupdlg); fSuccess = SetDSNAttributes(hwnd, lpsetupdlg);
else else
fSuccess = FALSE; fSuccess = FALSE;
} }
GlobalUnlock(hglbAttr); GlobalUnlock(hglbAttr);
GlobalFree(hglbAttr); GlobalFree(hglbAttr);
return fSuccess; return fSuccess;
} }
/* CenterDialog ------------------------------------------------------------ /* CenterDialog ------------------------------------------------------------
Description: Center the dialog over the frame window Description: Center the dialog over the frame window
Input : hdlg -- Dialog window handle Input : hdlg -- Dialog window handle
Output : None Output : None
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void INTFUNC void INTFUNC CenterDialog(HWND hdlg)
CenterDialog(HWND hdlg)
{ {
HWND hwndFrame; HWND hwndFrame;
RECT rcDlg, RECT rcDlg, rcScr, rcFrame;
rcScr, int cx, cy;
rcFrame;
int cx,
cy;
hwndFrame = GetParent(hdlg); hwndFrame = GetParent(hdlg);
GetWindowRect(hdlg, &rcDlg); GetWindowRect(hdlg, &rcDlg);
cx = rcDlg.right - rcDlg.left; cx = rcDlg.right - rcDlg.left;
cy = rcDlg.bottom - rcDlg.top; cy = rcDlg.bottom - rcDlg.top;
GetClientRect(hwndFrame, &rcFrame); GetClientRect(hwndFrame, &rcFrame);
ClientToScreen(hwndFrame, (LPPOINT) (&rcFrame.left)); ClientToScreen(hwndFrame, (LPPOINT)(&rcFrame.left));
ClientToScreen(hwndFrame, (LPPOINT) (&rcFrame.right)); ClientToScreen(hwndFrame, (LPPOINT)(&rcFrame.right));
rcDlg.top = rcFrame.top + (((rcFrame.bottom - rcFrame.top) - cy) >> 1); rcDlg.top = rcFrame.top + (((rcFrame.bottom - rcFrame.top) - cy) >> 1);
rcDlg.left = rcFrame.left + (((rcFrame.right - rcFrame.left) - cx) >> 1); rcDlg.left = rcFrame.left + (((rcFrame.right - rcFrame.left) - cx) >> 1);
rcDlg.bottom = rcDlg.top + cy; rcDlg.bottom = rcDlg.top + cy;
rcDlg.right = rcDlg.left + cx; rcDlg.right = rcDlg.left + cx;
GetWindowRect(GetDesktopWindow(), &rcScr); GetWindowRect(GetDesktopWindow(), &rcScr);
if (rcDlg.bottom > rcScr.bottom) if (rcDlg.bottom > rcScr.bottom)
{ {
rcDlg.bottom = rcScr.bottom; rcDlg.bottom = rcScr.bottom;
rcDlg.top = rcDlg.bottom - cy; rcDlg.top = rcDlg.bottom - cy;
} }
if (rcDlg.right > rcScr.right) if (rcDlg.right > rcScr.right)
{ {
rcDlg.right = rcScr.right; rcDlg.right = rcScr.right;
rcDlg.left = rcDlg.right - cx; rcDlg.left = rcDlg.right - cx;
} }
if (rcDlg.left < 0) if (rcDlg.left < 0) rcDlg.left = 0;
rcDlg.left = 0; if (rcDlg.top < 0) rcDlg.top = 0;
if (rcDlg.top < 0)
rcDlg.top = 0;
MoveWindow(hdlg, rcDlg.left, rcDlg.top, cx, cy, TRUE); MoveWindow(hdlg, rcDlg.left, rcDlg.top, cx, cy, TRUE);
return; return;
} }
/* ConfigDlgProc ----------------------------------------------------------- /* ConfigDlgProc -----------------------------------------------------------
Description: Manage add data source name dialog Description: Manage add data source name dialog
Input : hdlg --- Dialog window handle Input : hdlg --- Dialog window handle
wMsg --- Message wMsg --- Message
wParam - Message parameter wParam - Message parameter
lParam - Message parameter lParam - Message parameter
Output : TRUE if message processed, FALSE otherwise Output : TRUE if message processed, FALSE otherwise
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
int CALLBACK int CALLBACK ConfigDlgProc(HWND hdlg,
ConfigDlgProc(HWND hdlg, WORD wMsg,
WORD wMsg, WPARAM wParam,
WPARAM wParam, LPARAM lParam)
LPARAM lParam)
{ {
switch (wMsg)
switch (wMsg) {
/* Initialize the dialog */
case WM_INITDIALOG:
{ {
/* Initialize the dialog */ LPSETUPDLG lpsetupdlg = (LPSETUPDLG) lParam;
case WM_INITDIALOG: ConnInfo *ci = &lpsetupdlg->ci;
/* Hide the driver connect message */
ShowWindow(GetDlgItem(hdlg, DRV_MSG_LABEL), SW_HIDE);
SetWindowLong(hdlg, DWL_USER, lParam);
CenterDialog(hdlg); /* Center dialog */
/* NOTE: Values supplied in the attribute string will always */
/* override settings in ODBC.INI */
/* Get the rest of the common attributes */
getDSNinfo(ci, CONN_DONT_OVERWRITE);
/* Fill in any defaults */
getDSNdefaults(ci);
/* Initialize dialog fields */
SetDlgStuff(hdlg, ci);
if (lpsetupdlg->fDefault) {
EnableWindow(GetDlgItem(hdlg, IDC_DSNAME), FALSE);
EnableWindow(GetDlgItem(hdlg, IDC_DSNAMETEXT), FALSE);
}
else
SendDlgItemMessage(hdlg, IDC_DSNAME,
EM_LIMITTEXT, (WPARAM)(MAXDSNAME-1), 0L);
SendDlgItemMessage(hdlg, IDC_DESC,
EM_LIMITTEXT, (WPARAM)(MAXDESC-1), 0L);
return TRUE; /* Focus was not set */
}
/* Process buttons */
case WM_COMMAND:
switch (GET_WM_COMMAND_ID(wParam, lParam)) {
/* Ensure the OK button is enabled only when a data source name */
/* is entered */
case IDC_DSNAME:
if (GET_WM_COMMAND_CMD(wParam, lParam) == EN_CHANGE)
{ {
LPSETUPDLG lpsetupdlg = (LPSETUPDLG) lParam; char szItem[MAXDSNAME]; /* Edit control text */
ConnInfo *ci = &lpsetupdlg->ci;
/* Hide the driver connect message */ /* Enable/disable the OK button */
ShowWindow(GetDlgItem(hdlg, DRV_MSG_LABEL), SW_HIDE); EnableWindow(GetDlgItem(hdlg, IDOK),
GetDlgItemText(hdlg, IDC_DSNAME,
szItem, sizeof(szItem)));
SetWindowLong(hdlg, DWL_USER, lParam); return TRUE;
CenterDialog(hdlg); /* Center dialog */
/*
* NOTE: Values supplied in the attribute string will
* always
*/
/* override settings in ODBC.INI */
/* Get the rest of the common attributes */
getDSNinfo(ci, CONN_DONT_OVERWRITE);
/* Fill in any defaults */
getDSNdefaults(ci);
/* Initialize dialog fields */
SetDlgStuff(hdlg, ci);
if (lpsetupdlg->fDefault)
{
EnableWindow(GetDlgItem(hdlg, IDC_DSNAME), FALSE);
EnableWindow(GetDlgItem(hdlg, IDC_DSNAMETEXT), FALSE);
}
else
SendDlgItemMessage(hdlg, IDC_DSNAME,
EM_LIMITTEXT, (WPARAM) (MAXDSNAME - 1), 0L);
SendDlgItemMessage(hdlg, IDC_DESC,
EM_LIMITTEXT, (WPARAM) (MAXDESC - 1), 0L);
return TRUE; /* Focus was not set */
} }
/* Process buttons */
case WM_COMMAND:
switch (GET_WM_COMMAND_ID(wParam, lParam))
{
/*
* Ensure the OK button is enabled only when a data
* source name
*/
/* is entered */
case IDC_DSNAME:
if (GET_WM_COMMAND_CMD(wParam, lParam) == EN_CHANGE)
{
char szItem[MAXDSNAME]; /* Edit control text */
/* Enable/disable the OK button */
EnableWindow(GetDlgItem(hdlg, IDOK),
GetDlgItemText(hdlg, IDC_DSNAME,
szItem, sizeof(szItem)));
return TRUE;
}
break;
/* Accept results */
case IDOK:
{
LPSETUPDLG lpsetupdlg;
lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWL_USER);
/* Retrieve dialog values */
if (!lpsetupdlg->fDefault)
GetDlgItemText(hdlg, IDC_DSNAME,
lpsetupdlg->ci.dsn,
sizeof(lpsetupdlg->ci.dsn));
/* Get Dialog Values */
GetDlgStuff(hdlg, &lpsetupdlg->ci);
/* Update ODBC.INI */
SetDSNAttributes(hdlg, lpsetupdlg);
}
/* Return to caller */
case IDCANCEL:
EndDialog(hdlg, wParam);
return TRUE;
case IDC_DRIVER:
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV),
hdlg, driver_optionsProc, (LPARAM) NULL);
return TRUE;
case IDC_DATASOURCE:
{
LPSETUPDLG lpsetupdlg;
lpsetupdlg = (LPSETUPDLG) GetWindowLong(hdlg, DWL_USER);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DS),
hdlg, ds_optionsProc, (LPARAM) &lpsetupdlg->ci);
return TRUE;
}
}
break; break;
/* Accept results */
case IDOK:
{
LPSETUPDLG lpsetupdlg;
lpsetupdlg = (LPSETUPDLG)GetWindowLong(hdlg, DWL_USER);
/* Retrieve dialog values */
if (!lpsetupdlg->fDefault)
GetDlgItemText(hdlg, IDC_DSNAME,
lpsetupdlg->ci.dsn,
sizeof(lpsetupdlg->ci.dsn));
/* Get Dialog Values */
GetDlgStuff(hdlg, &lpsetupdlg->ci);
/* Update ODBC.INI */
SetDSNAttributes(hdlg, lpsetupdlg);
}
/* Return to caller */
case IDCANCEL:
EndDialog(hdlg, wParam);
return TRUE;
case IDC_DRIVER:
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DRV),
hdlg, driver_optionsProc, (LPARAM) NULL);
return TRUE;
case IDC_DATASOURCE:
{
LPSETUPDLG lpsetupdlg;
lpsetupdlg = (LPSETUPDLG)GetWindowLong(hdlg, DWL_USER);
DialogBoxParam(s_hModule, MAKEINTRESOURCE(DLG_OPTIONS_DS),
hdlg, ds_optionsProc, (LPARAM) &lpsetupdlg->ci);
return TRUE;
}
}
break;
} }
/* Message not processed */ /* Message not processed */
@ -338,97 +316,97 @@ ConfigDlgProc(HWND hdlg,
/* ParseAttributes --------------------------------------------------------- /* ParseAttributes ---------------------------------------------------------
Description: Parse attribute string moving values into the aAttr array Description: Parse attribute string moving values into the aAttr array
Input : lpszAttributes - Pointer to attribute string Input : lpszAttributes - Pointer to attribute string
Output : None (global aAttr normally updated) Output : None (global aAttr normally updated)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void INTFUNC void INTFUNC ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg)
ParseAttributes(LPCSTR lpszAttributes, LPSETUPDLG lpsetupdlg)
{ {
LPCSTR lpsz; LPCSTR lpsz;
LPCSTR lpszStart; LPCSTR lpszStart;
char aszKey[MAXKEYLEN]; char aszKey[MAXKEYLEN];
int cbKey; int cbKey;
char value[MAXPGPATH]; char value[MAXPGPATH];
memset(&lpsetupdlg->ci, 0, sizeof(ConnInfo)); memset(&lpsetupdlg->ci, 0, sizeof(ConnInfo));
for (lpsz = lpszAttributes; *lpsz; lpsz++) for (lpsz=lpszAttributes; *lpsz; lpsz++)
{ /* Extract key name (e.g., DSN), it must { /* Extract key name (e.g., DSN), it must be terminated by an equals */
* be terminated by an equals */ lpszStart = lpsz;
lpszStart = lpsz; for (;; lpsz++)
for (;; lpsz++) {
{ if (!*lpsz)
if (!*lpsz) return; /* No key was found */
return; /* No key was found */ else if (*lpsz == '=')
else if (*lpsz == '=') break; /* Valid key found */
break; /* Valid key found */ }
} /* Determine the key's index in the key table (-1 if not found) */
/* Determine the key's index in the key table (-1 if not found) */ cbKey = lpsz - lpszStart;
cbKey = lpsz - lpszStart; if (cbKey < sizeof(aszKey))
if (cbKey < sizeof(aszKey)) {
{
_fmemcpy(aszKey, lpszStart, cbKey);
aszKey[cbKey] = '\0';
}
/* Locate end of key value */ _fmemcpy(aszKey, lpszStart, cbKey);
lpszStart = ++lpsz; aszKey[cbKey] = '\0';
for (; *lpsz; lpsz++); }
/* Locate end of key value */
lpszStart = ++lpsz;
for (; *lpsz; lpsz++);
/* lpsetupdlg->aAttr[iElement].fSupplied = TRUE; */ /* lpsetupdlg->aAttr[iElement].fSupplied = TRUE; */
_fmemcpy(value, lpszStart, MIN(lpsz - lpszStart + 1, MAXPGPATH)); _fmemcpy(value, lpszStart, MIN(lpsz-lpszStart+1, MAXPGPATH));
mylog("aszKey='%s', value='%s'\n", aszKey, value); mylog("aszKey='%s', value='%s'\n", aszKey, value);
/* Copy the appropriate value to the conninfo */ /* Copy the appropriate value to the conninfo */
copyAttributes(&lpsetupdlg->ci, aszKey, value); copyAttributes(&lpsetupdlg->ci, aszKey, value);
} }
return; return;
} }
/* SetDSNAttributes -------------------------------------------------------- /* SetDSNAttributes --------------------------------------------------------
Description: Write data source attributes to ODBC.INI Description: Write data source attributes to ODBC.INI
Input : hwnd - Parent window handle (plus globals) Input : hwnd - Parent window handle (plus globals)
Output : TRUE if successful, FALSE otherwise Output : TRUE if successful, FALSE otherwise
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
BOOL INTFUNC BOOL INTFUNC SetDSNAttributes(HWND hwndParent, LPSETUPDLG lpsetupdlg)
SetDSNAttributes(HWND hwndParent, LPSETUPDLG lpsetupdlg)
{ {
LPCSTR lpszDSN; /* Pointer to data source name */ LPCSTR lpszDSN; /* Pointer to data source name */
lpszDSN = lpsetupdlg->ci.dsn; lpszDSN = lpsetupdlg->ci.dsn;
/* Validate arguments */ /* Validate arguments */
if (lpsetupdlg->fNewDSN && !*lpsetupdlg->ci.dsn) if (lpsetupdlg->fNewDSN && !*lpsetupdlg->ci.dsn)
return FALSE; return FALSE;
/* Write the data source name */ /* Write the data source name */
if (!SQLWriteDSNToIni(lpszDSN, lpsetupdlg->lpszDrvr)) if (!SQLWriteDSNToIni(lpszDSN, lpsetupdlg->lpszDrvr))
{ {
if (hwndParent) if (hwndParent)
{ {
char szBuf[MAXPGPATH]; char szBuf[MAXPGPATH];
char szMsg[MAXPGPATH]; char szMsg[MAXPGPATH];
LoadString(s_hModule, IDS_BADDSN, szBuf, sizeof(szBuf)); LoadString(s_hModule, IDS_BADDSN, szBuf, sizeof(szBuf));
wsprintf(szMsg, szBuf, lpszDSN); wsprintf(szMsg, szBuf, lpszDSN);
LoadString(s_hModule, IDS_MSGTITLE, szBuf, sizeof(szBuf)); LoadString(s_hModule, IDS_MSGTITLE, szBuf, sizeof(szBuf));
MessageBox(hwndParent, szMsg, szBuf, MB_ICONEXCLAMATION | MB_OK); MessageBox(hwndParent, szMsg, szBuf, MB_ICONEXCLAMATION | MB_OK);
} }
return FALSE; return FALSE;
} }
/* Update ODBC.INI */ /* Update ODBC.INI */
writeDSNinfo(&lpsetupdlg->ci); writeDSNinfo(&lpsetupdlg->ci);
/* If the data source name has changed, remove the old name */ /* If the data source name has changed, remove the old name */
if (lstrcmpi(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn)) if (lstrcmpi(lpsetupdlg->szDSN, lpsetupdlg->ci.dsn))
SQLRemoveDSNFromIni(lpsetupdlg->szDSN); {
return TRUE; SQLRemoveDSNFromIni(lpsetupdlg->szDSN);
}
return TRUE;
} }

216
src/interfaces/odbc/socket.c
View File

@ -1,13 +1,14 @@
/* Module: socket.c
/* Module: socket.c
* *
* Description: This module contains functions for low level socket * Description: This module contains functions for low level socket
* operations (connecting/reading/writing to the backend) * operations (connecting/reading/writing to the backend)
* *
* Classes: SocketClass (Functions prefix: "SOCK_") * Classes: SocketClass (Functions prefix: "SOCK_")
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -19,7 +20,7 @@
#ifndef WIN32 #ifndef WIN32
#include <stdlib.h> #include <stdlib.h>
#include <string.h> /* for memset */ #include <string.h> /* for memset */
#endif #endif
extern GLOBAL_VALUES globals; extern GLOBAL_VALUES globals;
@ -45,38 +46,37 @@ SOCK_clear_error(SocketClass *self)
SocketClass * SocketClass *
SOCK_Constructor() SOCK_Constructor()
{ {
SocketClass *rv; SocketClass *rv;
rv = (SocketClass *) malloc(sizeof(SocketClass)); rv = (SocketClass *) malloc(sizeof(SocketClass));
if (rv != NULL) if (rv != NULL) {
{ rv->socket = (SOCKETFD) -1;
rv->socket = (SOCKETFD) - 1;
rv->buffer_filled_in = 0; rv->buffer_filled_in = 0;
rv->buffer_filled_out = 0; rv->buffer_filled_out = 0;
rv->buffer_read_in = 0; rv->buffer_read_in = 0;
rv->buffer_in = (unsigned char *) malloc(globals.socket_buffersize); rv->buffer_in = (unsigned char *) malloc(globals.socket_buffersize);
if (!rv->buffer_in) if ( ! rv->buffer_in)
return NULL; return NULL;
rv->buffer_out = (unsigned char *) malloc(globals.socket_buffersize); rv->buffer_out = (unsigned char *) malloc(globals.socket_buffersize);
if (!rv->buffer_out) if ( ! rv->buffer_out)
return NULL; return NULL;
rv->errormsg = NULL; rv->errormsg = NULL;
rv->errornumber = 0; rv->errornumber = 0;
rv->reverse = FALSE; rv->reverse = FALSE;
} }
return rv; return rv;
} }
void void
SOCK_Destructor(SocketClass *self) SOCK_Destructor(SocketClass *self)
{ {
if (self->socket != -1) if (self->socket != -1) {
{
SOCK_put_char(self, 'X'); SOCK_put_char(self, 'X');
SOCK_flush_output(self); SOCK_flush_output(self);
closesocket(self->socket); closesocket(self->socket);
@ -89,34 +89,32 @@ SOCK_Destructor(SocketClass *self)
free(self->buffer_out); free(self->buffer_out);
free(self); free(self);
} }
char char
SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname) SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname)
{ {
struct hostent *host; struct hostent *host;
struct sockaddr_in sadr; struct sockaddr_in sadr;
unsigned long iaddr; unsigned long iaddr;
if (self->socket != -1) if (self->socket != -1) {
{
self->errornumber = SOCKET_ALREADY_CONNECTED; self->errornumber = SOCKET_ALREADY_CONNECTED;
self->errormsg = "Socket is already connected"; self->errormsg = "Socket is already connected";
return 0; return 0;
} }
memset((char *) &sadr, 0, sizeof(sadr)); memset((char *)&sadr, 0, sizeof(sadr));
/* /* If it is a valid IP address, use it.
* If it is a valid IP address, use it. Otherwise use hostname lookup. Otherwise use hostname lookup.
*/ */
iaddr = inet_addr(hostname); iaddr = inet_addr(hostname);
if (iaddr == INADDR_NONE) if (iaddr == INADDR_NONE) {
{
host = gethostbyname(hostname); host = gethostbyname(hostname);
if (host == NULL) if (host == NULL) {
{
self->errornumber = SOCKET_HOST_NOT_FOUND; self->errornumber = SOCKET_HOST_NOT_FOUND;
self->errormsg = "Could not resolve hostname."; self->errormsg = "Could not resolve hostname.";
return 0; return 0;
@ -124,26 +122,25 @@ SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname)
memcpy(&(sadr.sin_addr), host->h_addr, host->h_length); memcpy(&(sadr.sin_addr), host->h_addr, host->h_length);
} }
else else
memcpy(&(sadr.sin_addr), (struct in_addr *) & iaddr, sizeof(iaddr)); memcpy(&(sadr.sin_addr), (struct in_addr *) &iaddr, sizeof(iaddr));
sadr.sin_family = AF_INET; sadr.sin_family = AF_INET;
sadr.sin_port = htons(port); sadr.sin_port = htons(port);
self->socket = socket(AF_INET, SOCK_STREAM, 0); self->socket = socket(AF_INET, SOCK_STREAM, 0);
if (self->socket == -1) if (self->socket == -1) {
{
self->errornumber = SOCKET_COULD_NOT_CREATE_SOCKET; self->errornumber = SOCKET_COULD_NOT_CREATE_SOCKET;
self->errormsg = "Could not create Socket."; self->errormsg = "Could not create Socket.";
return 0; return 0;
} }
if (connect(self->socket, (struct sockaddr *) & (sadr), if ( connect(self->socket, (struct sockaddr *)&(sadr),
sizeof(sadr)) < 0) sizeof(sadr)) < 0) {
{
self->errornumber = SOCKET_COULD_NOT_CONNECT; self->errornumber = SOCKET_COULD_NOT_CONNECT;
self->errormsg = "Could not connect to remote socket."; self->errormsg = "Could not connect to remote socket.";
closesocket(self->socket); closesocket(self->socket);
self->socket = (SOCKETFD) - 1; self->socket = (SOCKETFD) -1;
return 0; return 0;
} }
return 1; return 1;
@ -153,16 +150,15 @@ SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname)
void void
SOCK_get_n_char(SocketClass *self, char *buffer, int len) SOCK_get_n_char(SocketClass *self, char *buffer, int len)
{ {
int lf; int lf;
if (!buffer) if ( ! buffer) {
{
self->errornumber = SOCKET_NULLPOINTER_PARAMETER; self->errornumber = SOCKET_NULLPOINTER_PARAMETER;
self->errormsg = "get_n_char was called with NULL-Pointer"; self->errormsg = "get_n_char was called with NULL-Pointer";
return; return;
} }
for (lf = 0; lf < len; lf++) for(lf=0; lf < len; lf++)
buffer[lf] = SOCK_get_next_byte(self); buffer[lf] = SOCK_get_next_byte(self);
} }
@ -170,74 +166,72 @@ SOCK_get_n_char(SocketClass *self, char *buffer, int len)
void void
SOCK_put_n_char(SocketClass *self, char *buffer, int len) SOCK_put_n_char(SocketClass *self, char *buffer, int len)
{ {
int lf; int lf;
if (!buffer) if ( ! buffer) {
{
self->errornumber = SOCKET_NULLPOINTER_PARAMETER; self->errornumber = SOCKET_NULLPOINTER_PARAMETER;
self->errormsg = "put_n_char was called with NULL-Pointer"; self->errormsg = "put_n_char was called with NULL-Pointer";
return; return;
} }
for (lf = 0; lf < len; lf++) for(lf=0; lf < len; lf++)
SOCK_put_next_byte(self, (unsigned char) buffer[lf]); SOCK_put_next_byte(self, (unsigned char)buffer[lf]);
} }
/* bufsize must include room for the null terminator /* bufsize must include room for the null terminator
will read at most bufsize-1 characters + null. will read at most bufsize-1 characters + null.
*/ */
void void
SOCK_get_string(SocketClass *self, char *buffer, int bufsize) SOCK_get_string(SocketClass *self, char *buffer, int bufsize)
{ {
register int lf = 0; register int lf = 0;
for (lf = 0; lf < bufsize; lf++) for (lf = 0; lf < bufsize; lf++)
if (!(buffer[lf] = SOCK_get_next_byte(self))) if ( ! (buffer[lf] = SOCK_get_next_byte(self)))
return; return;
buffer[bufsize - 1] = '\0'; buffer[bufsize-1] = '\0';
} }
void void
SOCK_put_string(SocketClass *self, char *string) SOCK_put_string(SocketClass *self, char *string)
{ {
register int lf; register int lf;
int len; int len;
len = strlen(string) + 1; len = strlen(string)+1;
for (lf = 0; lf < len; lf++) for(lf = 0; lf < len; lf++)
SOCK_put_next_byte(self, (unsigned char) string[lf]); SOCK_put_next_byte(self, (unsigned char)string[lf]);
} }
int int
SOCK_get_int(SocketClass *self, short len) SOCK_get_int(SocketClass *self, short len)
{ {
char buf[4]; char buf[4];
switch (len) switch (len) {
{ case 2:
case 2: SOCK_get_n_char(self, buf, len);
SOCK_get_n_char(self, buf, len); if (self->reverse)
if (self->reverse) return *((unsigned short *) buf);
return *((unsigned short *) buf); else
else return ntohs( *((unsigned short *) buf) );
return ntohs(*((unsigned short *) buf));
case 4: case 4:
SOCK_get_n_char(self, buf, len); SOCK_get_n_char(self, buf, len);
if (self->reverse) if (self->reverse)
return *((unsigned int *) buf); return *((unsigned int *) buf);
else else
return ntohl(*((unsigned int *) buf)); return ntohl( *((unsigned int *) buf) );
default: default:
self->errornumber = SOCKET_GET_INT_WRONG_LENGTH; self->errornumber = SOCKET_GET_INT_WRONG_LENGTH;
self->errormsg = "Cannot read ints of that length"; self->errormsg = "Cannot read ints of that length";
return 0; return 0;
} }
} }
@ -245,36 +239,34 @@ SOCK_get_int(SocketClass *self, short len)
void void
SOCK_put_int(SocketClass *self, int value, short len) SOCK_put_int(SocketClass *self, int value, short len)
{ {
unsigned int rv; unsigned int rv;
switch (len) switch (len) {
{ case 2:
case 2: rv = self->reverse ? value : htons( (unsigned short) value);
rv = self->reverse ? value : htons((unsigned short) value); SOCK_put_n_char(self, (char *) &rv, 2);
SOCK_put_n_char(self, (char *) &rv, 2); return;
return;
case 4: case 4:
rv = self->reverse ? value : htonl((unsigned int) value); rv = self->reverse ? value : htonl( (unsigned int) value);
SOCK_put_n_char(self, (char *) &rv, 4); SOCK_put_n_char(self, (char *) &rv, 4);
return; return;
default: default:
self->errornumber = SOCKET_PUT_INT_WRONG_LENGTH; self->errornumber = SOCKET_PUT_INT_WRONG_LENGTH;
self->errormsg = "Cannot write ints of that length"; self->errormsg = "Cannot write ints of that length";
return; return;
} }
} }
void void
SOCK_flush_output(SocketClass *self) SOCK_flush_output(SocketClass *self)
{ {
int written; int written;
written = send(self->socket, (char *) self->buffer_out, self->buffer_filled_out, 0); written = send(self->socket, (char *)self->buffer_out, self->buffer_filled_out, 0);
if (written != self->buffer_filled_out) if (written != self->buffer_filled_out) {
{
self->errornumber = SOCKET_WRITE_ERROR; self->errornumber = SOCKET_WRITE_ERROR;
self->errormsg = "Could not flush socket buffer."; self->errormsg = "Could not flush socket buffer.";
} }
@ -284,27 +276,23 @@ SOCK_flush_output(SocketClass *self)
unsigned char unsigned char
SOCK_get_next_byte(SocketClass *self) SOCK_get_next_byte(SocketClass *self)
{ {
if (self->buffer_read_in >= self->buffer_filled_in)
{ if (self->buffer_read_in >= self->buffer_filled_in) {
/* there are no more bytes left in the buffer, so */ /* there are no more bytes left in the buffer so */
/* reload the buffer */ /* reload the buffer */
self->buffer_read_in = 0; self->buffer_read_in = 0;
self->buffer_filled_in = recv(self->socket, (char *) self->buffer_in, self->buffer_filled_in = recv(self->socket, (char *)self->buffer_in, globals.socket_buffersize, 0);
globals.socket_buffersize, 0);
mylog("read %d, global_socket_buffersize=%d\n", mylog("read %d, global_socket_buffersize=%d\n", self->buffer_filled_in, globals.socket_buffersize);
self->buffer_filled_in, globals.socket_buffersize);
if (self->buffer_filled_in < 0) if (self->buffer_filled_in < 0) {
{
self->errornumber = SOCKET_READ_ERROR; self->errornumber = SOCKET_READ_ERROR;
self->errormsg = "Error while reading from the socket."; self->errormsg = "Error while reading from the socket.";
self->buffer_filled_in = 0; self->buffer_filled_in = 0;
return 0; return 0;
} }
if (self->buffer_filled_in == 0) if (self->buffer_filled_in == 0) {
{
self->errornumber = SOCKET_CLOSED; self->errornumber = SOCKET_CLOSED;
self->errormsg = "Socket has been closed."; self->errormsg = "Socket has been closed.";
self->buffer_filled_in = 0; self->buffer_filled_in = 0;
@ -317,16 +305,14 @@ SOCK_get_next_byte(SocketClass *self)
void void
SOCK_put_next_byte(SocketClass *self, unsigned char next_byte) SOCK_put_next_byte(SocketClass *self, unsigned char next_byte)
{ {
int bytes_sent; int bytes_sent;
self->buffer_out[self->buffer_filled_out++] = next_byte; self->buffer_out[self->buffer_filled_out++] = next_byte;
if (self->buffer_filled_out == globals.socket_buffersize) if (self->buffer_filled_out == globals.socket_buffersize) {
{
/* buffer is full, so write it out */ /* buffer is full, so write it out */
bytes_sent = send(self->socket, (char *) self->buffer_out, globals.socket_buffersize, 0); bytes_sent = send(self->socket, (char *)self->buffer_out, globals.socket_buffersize, 0);
if (bytes_sent != globals.socket_buffersize) if (bytes_sent != globals.socket_buffersize) {
{
self->errornumber = SOCKET_WRITE_ERROR; self->errornumber = SOCKET_WRITE_ERROR;
self->errormsg = "Error while writing to the socket."; self->errormsg = "Error while writing to the socket.";
} }

71
src/interfaces/odbc/socket.h
View File

@ -1,9 +1,9 @@
/* File: socket.h /* File: socket.h
* *
* Description: See "socket.c" * Description: See "socket.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -25,11 +25,10 @@
#define closesocket(xxx) close(xxx) #define closesocket(xxx) close(xxx)
#define SOCKETFD int #define SOCKETFD int
#ifndef INADDR_NONE #ifndef INADDR_NONE
#ifndef _IN_ADDR_T #ifndef _IN_ADDR_T
#define _IN_ADDR_T #define _IN_ADDR_T
typedef unsigned int in_addr_t; typedef unsigned int in_addr_t;
#endif #endif
#define INADDR_NONE ((in_addr_t)-1) #define INADDR_NONE ((in_addr_t)-1)
#endif #endif
@ -41,34 +40,32 @@ typedef unsigned int in_addr_t;
#include "psqlodbc.h" #include "psqlodbc.h"
#define SOCKET_ALREADY_CONNECTED 1 #define SOCKET_ALREADY_CONNECTED 1
#define SOCKET_HOST_NOT_FOUND 2 #define SOCKET_HOST_NOT_FOUND 2
#define SOCKET_COULD_NOT_CREATE_SOCKET 3 #define SOCKET_COULD_NOT_CREATE_SOCKET 3
#define SOCKET_COULD_NOT_CONNECT 4 #define SOCKET_COULD_NOT_CONNECT 4
#define SOCKET_READ_ERROR 5 #define SOCKET_READ_ERROR 5
#define SOCKET_WRITE_ERROR 6 #define SOCKET_WRITE_ERROR 6
#define SOCKET_NULLPOINTER_PARAMETER 7 #define SOCKET_NULLPOINTER_PARAMETER 7
#define SOCKET_PUT_INT_WRONG_LENGTH 8 #define SOCKET_PUT_INT_WRONG_LENGTH 8
#define SOCKET_GET_INT_WRONG_LENGTH 9 #define SOCKET_GET_INT_WRONG_LENGTH 9
#define SOCKET_CLOSED 10 #define SOCKET_CLOSED 10
struct SocketClass_ struct SocketClass_ {
{
int buffer_filled_in; int buffer_filled_in;
int buffer_filled_out; int buffer_filled_out;
int buffer_read_in; int buffer_read_in;
unsigned char *buffer_in; unsigned char *buffer_in;
unsigned char *buffer_out; unsigned char *buffer_out;
SOCKETFD socket; SOCKETFD socket;
char *errormsg; char *errormsg;
int errornumber; int errornumber;
char reverse; /* used to handle Postgres 6.2 protocol char reverse; /* used to handle Postgres 6.2 protocol (reverse byte order) */
* (reverse byte order) */
}; };
@ -83,17 +80,17 @@ struct SocketClass_
/* Socket prototypes */ /* Socket prototypes */
SocketClass *SOCK_Constructor(void); SocketClass *SOCK_Constructor(void);
void SOCK_Destructor(SocketClass *self); void SOCK_Destructor(SocketClass *self);
char SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname); char SOCK_connect_to(SocketClass *self, unsigned short port, char *hostname);
void SOCK_get_n_char(SocketClass *self, char *buffer, int len); void SOCK_get_n_char(SocketClass *self, char *buffer, int len);
void SOCK_put_n_char(SocketClass *self, char *buffer, int len); void SOCK_put_n_char(SocketClass *self, char *buffer, int len);
void SOCK_get_string(SocketClass *self, char *buffer, int bufsize); void SOCK_get_string(SocketClass *self, char *buffer, int bufsize);
void SOCK_put_string(SocketClass *self, char *string); void SOCK_put_string(SocketClass *self, char *string);
int SOCK_get_int(SocketClass *self, short len); int SOCK_get_int(SocketClass *self, short len);
void SOCK_put_int(SocketClass *self, int value, short len); void SOCK_put_int(SocketClass *self, int value, short len);
void SOCK_flush_output(SocketClass *self); void SOCK_flush_output(SocketClass *self);
unsigned char SOCK_get_next_byte(SocketClass *self); unsigned char SOCK_get_next_byte(SocketClass *self);
void SOCK_put_next_byte(SocketClass *self, unsigned char next_byte); void SOCK_put_next_byte(SocketClass *self, unsigned char next_byte);
void SOCK_clear_error(SocketClass *self); void SOCK_clear_error(SocketClass *self);
#endif #endif

721
src/interfaces/odbc/statement.c
View File

File diff suppressed because it is too large Load Diff

255
src/interfaces/odbc/statement.h
View File

@ -1,9 +1,9 @@
/* File: statement.h /* File: statement.h
* *
* Description: See "statement.c" * Description: See "statement.c"
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -33,59 +33,51 @@
#define TRUE (BOOL)1 #define TRUE (BOOL)1
#endif #endif
typedef enum typedef enum {
{ STMT_ALLOCATED, /* The statement handle is allocated, but not used so far */
STMT_ALLOCATED, /* The statement handle is allocated, but STMT_READY, /* the statement is waiting to be executed */
* not used so far */ STMT_PREMATURE, /* ODBC states that it is legal to call e.g. SQLDescribeCol before
STMT_READY, /* the statement is waiting to be executed */ a call to SQLExecute, but after SQLPrepare. To get all the necessary
STMT_PREMATURE, /* ODBC states that it is legal to call information in such a case, we simply execute the query _before_ the
* e.g. SQLDescribeCol before a call to actual call to SQLExecute, so that statement is considered to be "premature".
* SQLExecute, but after SQLPrepare. To */
* get all the necessary information in STMT_FINISHED, /* statement execution has finished */
* such a case, we simply execute the STMT_EXECUTING /* statement execution is still going on */
* query _before_ the actual call to
* SQLExecute, so that statement is
* considered to be "premature". */
STMT_FINISHED, /* statement execution has finished */
STMT_EXECUTING /* statement execution is still going on */
} STMT_Status; } STMT_Status;
#define STMT_TRUNCATED (-2) #define STMT_TRUNCATED -2
#define STMT_INFO_ONLY (-1) /* not an error message, just a #define STMT_INFO_ONLY -1 /* not an error message, just a notification to be returned by SQLError */
* notification to be returned by SQLError */ #define STMT_OK 0 /* will be interpreted as "no error pending" */
#define STMT_OK 0 /* will be interpreted as "no error #define STMT_EXEC_ERROR 1
* pending" */ #define STMT_STATUS_ERROR 2
#define STMT_EXEC_ERROR 1 #define STMT_SEQUENCE_ERROR 3
#define STMT_STATUS_ERROR 2 #define STMT_NO_MEMORY_ERROR 4
#define STMT_SEQUENCE_ERROR 3 #define STMT_COLNUM_ERROR 5
#define STMT_NO_MEMORY_ERROR 4 #define STMT_NO_STMTSTRING 6
#define STMT_COLNUM_ERROR 5 #define STMT_ERROR_TAKEN_FROM_BACKEND 7
#define STMT_NO_STMTSTRING 6 #define STMT_INTERNAL_ERROR 8
#define STMT_ERROR_TAKEN_FROM_BACKEND 7 #define STMT_STILL_EXECUTING 9
#define STMT_INTERNAL_ERROR 8 #define STMT_NOT_IMPLEMENTED_ERROR 10
#define STMT_STILL_EXECUTING 9 #define STMT_BAD_PARAMETER_NUMBER_ERROR 11
#define STMT_NOT_IMPLEMENTED_ERROR 10 #define STMT_OPTION_OUT_OF_RANGE_ERROR 12
#define STMT_BAD_PARAMETER_NUMBER_ERROR 11 #define STMT_INVALID_COLUMN_NUMBER_ERROR 13
#define STMT_OPTION_OUT_OF_RANGE_ERROR 12 #define STMT_RESTRICTED_DATA_TYPE_ERROR 14
#define STMT_INVALID_COLUMN_NUMBER_ERROR 13 #define STMT_INVALID_CURSOR_STATE_ERROR 15
#define STMT_RESTRICTED_DATA_TYPE_ERROR 14 #define STMT_OPTION_VALUE_CHANGED 16
#define STMT_INVALID_CURSOR_STATE_ERROR 15 #define STMT_CREATE_TABLE_ERROR 17
#define STMT_OPTION_VALUE_CHANGED 16 #define STMT_NO_CURSOR_NAME 18
#define STMT_CREATE_TABLE_ERROR 17 #define STMT_INVALID_CURSOR_NAME 19
#define STMT_NO_CURSOR_NAME 18 #define STMT_INVALID_ARGUMENT_NO 20
#define STMT_INVALID_CURSOR_NAME 19 #define STMT_ROW_OUT_OF_RANGE 21
#define STMT_INVALID_ARGUMENT_NO 20 #define STMT_OPERATION_CANCELLED 22
#define STMT_ROW_OUT_OF_RANGE 21 #define STMT_INVALID_CURSOR_POSITION 23
#define STMT_OPERATION_CANCELLED 22 #define STMT_VALUE_OUT_OF_RANGE 24
#define STMT_INVALID_CURSOR_POSITION 23 #define STMT_OPERATION_INVALID 25
#define STMT_VALUE_OUT_OF_RANGE 24 #define STMT_PROGRAM_TYPE_OUT_OF_RANGE 26
#define STMT_OPERATION_INVALID 25 #define STMT_BAD_ERROR 27
#define STMT_PROGRAM_TYPE_OUT_OF_RANGE 26
#define STMT_BAD_ERROR 27
/* statement types */ /* statement types */
enum enum {
{
STMT_TYPE_UNKNOWN = -2, STMT_TYPE_UNKNOWN = -2,
STMT_TYPE_OTHER = -1, STMT_TYPE_OTHER = -1,
STMT_TYPE_SELECT = 0, STMT_TYPE_SELECT = 0,
@ -103,8 +95,7 @@ enum
/* Parsing status */ /* Parsing status */
enum enum {
{
STMT_PARSE_NONE = 0, STMT_PARSE_NONE = 0,
STMT_PARSE_COMPLETE, STMT_PARSE_COMPLETE,
STMT_PARSE_INCOMPLETE, STMT_PARSE_INCOMPLETE,
@ -112,110 +103,92 @@ enum
}; };
/* Result style */ /* Result style */
enum enum {
{
STMT_FETCH_NONE = 0, STMT_FETCH_NONE = 0,
STMT_FETCH_NORMAL, STMT_FETCH_NORMAL,
STMT_FETCH_EXTENDED, STMT_FETCH_EXTENDED,
}; };
typedef struct typedef struct {
{ COL_INFO *col_info; /* cached SQLColumns info for this table */
COL_INFO *col_info; /* cached SQLColumns info for this table */ char name[MAX_TABLE_LEN+1];
char name[MAX_TABLE_LEN + 1]; char alias[MAX_TABLE_LEN+1];
char alias[MAX_TABLE_LEN + 1];
} TABLE_INFO; } TABLE_INFO;
typedef struct typedef struct {
{ TABLE_INFO *ti; /* resolve to explicit table names */
TABLE_INFO *ti; /* resolve to explicit table names */ int precision;
int precision; int display_size;
int display_size; int length;
int length; int type;
int type; char nullable;
char nullable; char func;
char func; char expr;
char expr; char quote;
char quote; char dquote;
char dquote; char numeric;
char numeric; char dot[MAX_TABLE_LEN+1];
char dot[MAX_TABLE_LEN + 1]; char name[MAX_COLUMN_LEN+1];
char name[MAX_COLUMN_LEN + 1]; char alias[MAX_COLUMN_LEN+1];
char alias[MAX_COLUMN_LEN + 1];
} FIELD_INFO; } FIELD_INFO;
/******** Statement Handle ***********/ /******** Statement Handle ***********/
struct StatementClass_ struct StatementClass_ {
{ ConnectionClass *hdbc; /* pointer to ConnectionClass this statement belongs to */
ConnectionClass *hdbc; /* pointer to ConnectionClass this QResultClass *result; /* result of the current statement */
* statement belongs to */ HSTMT FAR *phstmt;
QResultClass *result; /* result of the current statement */
HSTMT FAR *phstmt;
StatementOptions options; StatementOptions options;
STMT_Status status; STMT_Status status;
char *errormsg; char *errormsg;
int errornumber; int errornumber;
/* information on bindings */ /* information on bindings */
BindInfoClass *bindings; /* array to store the binding information */ BindInfoClass *bindings; /* array to store the binding information */
BindInfoClass bookmark; BindInfoClass bookmark;
int bindings_allocated; int bindings_allocated;
/* information on statement parameters */ /* information on statement parameters */
int parameters_allocated; int parameters_allocated;
ParameterInfoClass *parameters; ParameterInfoClass *parameters;
Int4 currTuple; /* current absolute row number (GetData, Int4 currTuple; /* current absolute row number (GetData, SetPos, SQLFetch) */
* SetPos, SQLFetch) */ int save_rowset_size; /* saved rowset size in case of change/FETCH_NEXT */
int save_rowset_size; /* saved rowset size in case of int rowset_start; /* start of rowset (an absolute row number) */
* change/FETCH_NEXT */ int bind_row; /* current offset for Multiple row/column binding */
int rowset_start; /* start of rowset (an absolute row int last_fetch_count; /* number of rows retrieved in last fetch/extended fetch */
* number) */ int current_col; /* current column for GetData -- used to handle multiple calls */
int bind_row; /* current offset for Multiple row/column int lobj_fd; /* fd of the current large object */
* binding */
int last_fetch_count; /* number of rows retrieved in
* last fetch/extended fetch */
int current_col; /* current column for GetData -- used to
* handle multiple calls */
int lobj_fd; /* fd of the current large object */
char *statement; /* if non--null pointer to the SQL char *statement; /* if non--null pointer to the SQL statement that has been executed */
* statement that has been executed */
TABLE_INFO **ti; TABLE_INFO **ti;
FIELD_INFO **fi; FIELD_INFO **fi;
int nfld; int nfld;
int ntab; int ntab;
int parse_status; int parse_status;
int statement_type; /* According to the defines above */ int statement_type; /* According to the defines above */
int data_at_exec; /* Number of params needing SQLPutData */ int data_at_exec; /* Number of params needing SQLPutData */
int current_exec_param; /* The current parameter for int current_exec_param; /* The current parameter for SQLPutData */
* SQLPutData */
char put_data; /* Has SQLPutData been called yet? */ char put_data; /* Has SQLPutData been called yet? */
char errormsg_created; /* has an informative error msg char errormsg_created; /* has an informative error msg been created? */
* been created? */ char manual_result; /* Is the statement result manually built? */
char manual_result; /* Is the statement result manually built? */ char prepare; /* is this statement a prepared statement or direct */
char prepare; /* is this statement a prepared statement
* or direct */
char internal; /* Is this statement being called char internal; /* Is this statement being called internally? */
* internally? */
char cursor_name[MAX_CURSOR_LEN + 1]; char cursor_name[MAX_CURSOR_LEN+1];
char stmt_with_params[STD_STATEMENT_LEN]; /* statement after char stmt_with_params[STD_STATEMENT_LEN]; /* statement after parameter substitution */
* parameter
* substitution */
}; };
#define SC_get_conn(a) (a->hdbc) #define SC_get_conn(a) (a->hdbc)
#define SC_get_Result(a) (a->result); #define SC_get_Result(a) (a->result);
/* options for SC_free_params() */ /* options for SC_free_params() */
@ -224,21 +197,21 @@ struct StatementClass_
/* Statement prototypes */ /* Statement prototypes */
StatementClass *SC_Constructor(void); StatementClass *SC_Constructor(void);
void InitializeStatementOptions(StatementOptions *opt); void InitializeStatementOptions(StatementOptions *opt);
char SC_Destructor(StatementClass *self); char SC_Destructor(StatementClass *self);
int statement_type(char *statement); int statement_type(char *statement);
char parse_statement(StatementClass *stmt); char parse_statement(StatementClass *stmt);
void SC_pre_execute(StatementClass *self); void SC_pre_execute(StatementClass *self);
char SC_unbind_cols(StatementClass *self); char SC_unbind_cols(StatementClass *self);
char SC_recycle_statement(StatementClass *self); char SC_recycle_statement(StatementClass *self);
void SC_clear_error(StatementClass *self); void SC_clear_error(StatementClass *self);
char SC_get_error(StatementClass *self, int *number, char **message); char SC_get_error(StatementClass *self, int *number, char **message);
char *SC_create_errormsg(StatementClass *self); char *SC_create_errormsg(StatementClass *self);
RETCODE SC_execute(StatementClass *self); RETCODE SC_execute(StatementClass *self);
RETCODE SC_fetch(StatementClass *self); RETCODE SC_fetch(StatementClass *self);
void SC_free_params(StatementClass *self, char option); void SC_free_params(StatementClass *self, char option);
void SC_log_error(char *func, char *desc, StatementClass *self); void SC_log_error(char *func, char *desc, StatementClass *self);
unsigned long SC_get_bookmark(StatementClass *self); unsigned long SC_get_bookmark(StatementClass *self);

45
src/interfaces/odbc/tuple.c
View File

@ -1,16 +1,17 @@
/* Module: tuple.c
/* Module: tuple.c
* *
* Description: This module contains functions for setting the data for individual * Description: This module contains functions for setting the data for individual
* fields (TupleField structure) of a manual result set. * fields (TupleField structure) of a manual result set.
* *
* Important Note: These functions are ONLY used in building manual result sets for * Important Note: These functions are ONLY used in building manual result sets for
* info functions (SQLTables, SQLColumns, etc.) * info functions (SQLTables, SQLColumns, etc.)
* *
* Classes: n/a * Classes: n/a
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -18,43 +19,39 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
void void set_tuplefield_null(TupleField *tuple_field)
set_tuplefield_null(TupleField *tuple_field)
{ {
tuple_field->len = 0; tuple_field->len = 0;
tuple_field->value = NULL; /* strdup(""); */ tuple_field->value = NULL; /* strdup(""); */
} }
void void set_tuplefield_string(TupleField *tuple_field, char *string)
set_tuplefield_string(TupleField *tuple_field, char *string)
{ {
tuple_field->len = strlen(string); tuple_field->len = strlen(string);
tuple_field->value = malloc(strlen(string) + 1); tuple_field->value = malloc(strlen(string)+1);
strcpy(tuple_field->value, string); strcpy(tuple_field->value, string);
} }
void void set_tuplefield_int2(TupleField *tuple_field, Int2 value)
set_tuplefield_int2(TupleField *tuple_field, Int2 value)
{ {
char buffer[10]; char buffer[10];
sprintf(buffer, "%d", value); sprintf(buffer,"%d", value);
tuple_field->len = strlen(buffer) + 1; tuple_field->len = strlen(buffer)+1;
/* +1 ... is this correct (better be on the save side-...) */ /* +1 ... is this correct (better be on the save side-...) */
tuple_field->value = strdup(buffer); tuple_field->value = strdup(buffer);
} }
void void set_tuplefield_int4(TupleField *tuple_field, Int4 value)
set_tuplefield_int4(TupleField *tuple_field, Int4 value)
{ {
char buffer[15]; char buffer[15];
sprintf(buffer, "%ld", value); sprintf(buffer,"%ld", value);
tuple_field->len = strlen(buffer) + 1; tuple_field->len = strlen(buffer)+1;
/* +1 ... is this correct (better be on the save side-...) */ /* +1 ... is this correct (better be on the save side-...) */
tuple_field->value = strdup(buffer); tuple_field->value = strdup(buffer);
} }

35
src/interfaces/odbc/tuple.h
View File

@ -1,13 +1,13 @@
/* File: tuple.h /* File: tuple.h
* *
* Description: See "tuple.c" * Description: See "tuple.c"
* *
* Important NOTE: The TupleField structure is used both to hold backend data and * Important NOTE: The TupleField structure is used both to hold backend data and
* manual result set data. The "set_" functions and the TupleNode * manual result set data. The "set_" functions and the TupleNode
* structure are only used for manual result sets by info routines. * structure are only used for manual result sets by info routines.
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -17,18 +17,15 @@
#include "psqlodbc.h" #include "psqlodbc.h"
/* Used by backend data AND manual result sets */ /* Used by backend data AND manual result sets */
struct TupleField_ struct TupleField_ {
{ Int4 len; /* length of the current Tuple */
Int4 len; /* length of the current Tuple */ void *value; /* an array representing the value */
void *value; /* an array representing the value */
}; };
/* Used ONLY for manual result sets */ /* Used ONLY for manual result sets */
struct TupleNode_ struct TupleNode_ {
{ struct TupleNode_ *prev, *next;
struct TupleNode_ *prev, TupleField tuple[1];
*next;
TupleField tuple[1];
}; };
/* These macros are wrappers for the corresponding set_tuplefield functions /* These macros are wrappers for the corresponding set_tuplefield functions
@ -39,9 +36,9 @@ struct TupleNode_
#define set_nullfield_int2(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int2(FLD, (VAL)) : set_tuplefield_null(FLD)) #define set_nullfield_int2(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int2(FLD, (VAL)) : set_tuplefield_null(FLD))
#define set_nullfield_int4(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int4(FLD, (VAL)) : set_tuplefield_null(FLD)) #define set_nullfield_int4(FLD, VAL) ((VAL) != -1 ? set_tuplefield_int4(FLD, (VAL)) : set_tuplefield_null(FLD))
void set_tuplefield_null(TupleField *tuple_field); void set_tuplefield_null(TupleField *tuple_field);
void set_tuplefield_string(TupleField *tuple_field, char *string); void set_tuplefield_string(TupleField *tuple_field, char *string);
void set_tuplefield_int2(TupleField *tuple_field, Int2 value); void set_tuplefield_int2(TupleField *tuple_field, Int2 value);
void set_tuplefield_int4(TupleField *tuple_field, Int4 value); void set_tuplefield_int4(TupleField *tuple_field, Int4 value);
#endif #endif

178
src/interfaces/odbc/tuplelist.c
View File

@ -1,13 +1,14 @@
/* Module: tuplelist.c
/* Module: tuplelist.c
* *
* Description: This module contains functions for creating a manual result set * Description: This module contains functions for creating a manual result set
* (the TupleList) and retrieving data from it for a specific row/column. * (the TupleList) and retrieving data from it for a specific row/column.
* *
* Classes: TupleListClass (Functions prefix: "TL_") * Classes: TupleListClass (Functions prefix: "TL_")
* *
* API functions: none * API functions: none
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -18,19 +19,19 @@
TupleListClass * TupleListClass *
TL_Constructor(UInt4 fieldcnt) TL_Constructor(UInt4 fieldcnt)
{ {
TupleListClass *rv; TupleListClass *rv;
mylog("in TL_Constructor\n"); mylog("in TL_Constructor\n");
rv = (TupleListClass *) malloc(sizeof(TupleListClass)); rv = (TupleListClass *) malloc(sizeof(TupleListClass));
if (rv) if (rv) {
{
rv->num_fields = fieldcnt; rv->num_fields = fieldcnt;
rv->num_tuples = 0; rv->num_tuples = 0;
rv->list_start = NULL; rv->list_start = NULL;
rv->list_end = NULL; rv->list_end = NULL;
rv->lastref = NULL; rv->lastref = NULL;
rv->last_indexed = -1; rv->last_indexed = -1;
} }
mylog("exit TL_Constructor\n"); mylog("exit TL_Constructor\n");
@ -41,22 +42,21 @@ TL_Constructor(UInt4 fieldcnt)
void void
TL_Destructor(TupleListClass *self) TL_Destructor(TupleListClass *self)
{ {
int lf; int lf;
TupleNode *node, TupleNode *node, *tp;
*tp;
mylog("TupleList: in DESTRUCTOR\n"); mylog("TupleList: in DESTRUCTOR\n");
node = self->list_start; node = self->list_start;
while (node != NULL) while(node != NULL) {
{ for (lf=0; lf < self->num_fields; lf++)
for (lf = 0; lf < self->num_fields; lf++) if (node->tuple[lf].value != NULL) {
if (node->tuple[lf].value != NULL) free(node->tuple[lf].value);
free(node->tuple[lf].value); }
tp = node->next; tp = node->next;
free(node); free(node);
node = tp; node = tp;
} }
free(self); free(self);
@ -67,12 +67,10 @@ TL_Destructor(TupleListClass *self)
void * void *
TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno) TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno)
{ {
Int4 lf; Int4 lf;
Int4 delta, Int4 delta, from_end;
from_end; char end_is_closer, start_is_closer;
char end_is_closer, TupleNode *rv;
start_is_closer;
TupleNode *rv;
if (self->last_indexed == -1) if (self->last_indexed == -1)
/* we have an empty tuple list */ /* we have an empty tuple list */
@ -87,88 +85,67 @@ TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno)
/* illegel field number range */ /* illegel field number range */
return NULL; return NULL;
/* /* check if we are accessing the same tuple that was used in
* check if we are accessing the same tuple that was used in the last the last fetch (e.g: for fetching all the fields one after
* fetch (e.g: for fetching all the fields one after another. Do this another. Do this to speed things up
* to speed things up */
*/
if (tupleno == self->last_indexed) if (tupleno == self->last_indexed)
return self->lastref->tuple[fieldno].value; return self->lastref->tuple[fieldno].value;
/* now for the tricky part... */ /* now for the tricky part... */
/* /*
* Since random access is quite inefficient for linked lists we use Since random access is quite inefficient for linked lists we use
* the lastref pointer that points to the last element referenced by a the lastref pointer that points to the last element referenced
* get_fieldval() call in conjunction with the its index number that by a get_fieldval() call in conjunction with the its index number
* is stored in last_indexed. (So we use some locality of reference that is stored in last_indexed. (So we use some locality of
* principle to speed things up) reference principle to speed things up)
*/ */
delta = tupleno - self->last_indexed; delta = tupleno - self->last_indexed;
/* if delta is positive, we have to go forward */ /* if delta is positive, we have to go forward */
/* /* now check if we are closer to the start or the end of the list
* now check if we are closer to the start or the end of the list than than to our last_indexed pointer
* to our last_indexed pointer */
*/
from_end = (self->num_tuples - 1) - tupleno; from_end = (self->num_tuples - 1) - tupleno;
start_is_closer = labs(delta) > tupleno; start_is_closer = labs(delta) > tupleno;
/* true if we are closer to the start of the list than to the
/* last_indexed pointer
* true if we are closer to the start of the list than to the */
* last_indexed pointer
*/
end_is_closer = labs(delta) > from_end; end_is_closer = labs(delta) > from_end;
/* true if we are closer at the end of the list */ /* true if we are closer at the end of the list */
if (end_is_closer) if (end_is_closer) {
{
/* scanning from the end is the shortest way. so we do that... */ /* scanning from the end is the shortest way. so we do that... */
rv = self->list_end; rv = self->list_end;
for (lf = 0; lf < from_end; lf++) for (lf=0; lf < from_end; lf++)
rv = rv->prev; rv = rv->prev;
} } else if (start_is_closer) {
else if (start_is_closer) /* the shortest way is to start the search from the head of the list */
{
/*
* the shortest way is to start the search from the head of the
* list
*/
rv = self->list_start; rv = self->list_start;
for (lf = 0; lf < tupleno; lf++) for (lf=0; lf < tupleno; lf++)
rv = rv->next; rv = rv->next;
} } else {
else
{
/* the closest way is starting from our lastref - pointer */ /* the closest way is starting from our lastref - pointer */
rv = self->lastref; rv = self->lastref;
/* at first determine whether we have to search forward or backwards */
/* if (delta < 0) {
* at first determine whether we have to search forward or
* backwards
*/
if (delta < 0)
{
/* we have to search backwards */ /* we have to search backwards */
for (lf = 0; lf < (-1) * delta; lf++) for(lf=0; lf < (-1)*delta; lf++)
rv = rv->prev; rv = rv->prev;
} } else {
else
{
/* ok, we have to search forward... */ /* ok, we have to search forward... */
for (lf = 0; lf < delta; lf++) for (lf=0; lf < delta; lf++)
rv = rv->next; rv = rv->next;
} }
} }
/* /* now we have got our return pointer, so update the lastref
* now we have got our return pointer, so update the lastref and the and the last_indexed values
* last_indexed values */
*/
self->lastref = rv; self->lastref = rv;
self->last_indexed = tupleno; self->last_indexed = tupleno;
@ -180,30 +157,23 @@ TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno)
char char
TL_add_tuple(TupleListClass *self, TupleNode *new_field) TL_add_tuple(TupleListClass *self, TupleNode *new_field)
{ {
/* we append the tuple at the end of the doubly linked list
/* of the tuples we have already read in
* we append the tuple at the end of the doubly linked list of the */
* tuples we have already read in
*/
new_field->prev = NULL; new_field->prev = NULL;
new_field->next = NULL; new_field->next = NULL;
if (self->list_start == NULL) if (self->list_start == NULL) {
{
/* the list is empty, we have to add the first tuple */ /* the list is empty, we have to add the first tuple */
self->list_start = new_field; self->list_start = new_field;
self->list_end = new_field; self->list_end = new_field;
self->lastref = new_field; self->lastref = new_field;
self->last_indexed = 0; self->last_indexed = 0;
} } else {
else /* there is already an element in the list, so add the new
{ one at the end of the list
*/
/*
* there is already an element in the list, so add the new one at
* the end of the list
*/
self->list_end->next = new_field; self->list_end->next = new_field;
new_field->prev = self->list_end; new_field->prev = self->list_end;
self->list_end = new_field; self->list_end = new_field;
@ -213,3 +183,5 @@ TL_add_tuple(TupleListClass *self, TupleNode *new_field)
/* this method of building a list cannot fail, so we return 1 */ /* this method of building a list cannot fail, so we return 1 */
return 1; return 1;
} }

29
src/interfaces/odbc/tuplelist.h
View File

@ -1,12 +1,12 @@
/* File: tuplelist.h /* File: tuplelist.h
* *
* Description: See "tuplelist.c" * Description: See "tuplelist.c"
* *
* Important Note: This structure and its functions are ONLY used in building manual result * Important Note: This structure and its functions are ONLY used in building manual result
* sets for info functions (SQLTables, SQLColumns, etc.) * sets for info functions (SQLTables, SQLColumns, etc.)
* *
* Comments: See "notice.txt" for copyright and license information. * Comments: See "notice.txt" for copyright and license information.
* *
*/ */
@ -15,22 +15,19 @@
#include "psqlodbc.h" #include "psqlodbc.h"
struct TupleListClass_ struct TupleListClass_ {
{ Int4 num_fields;
Int4 num_fields; Int4 num_tuples;
Int4 num_tuples; TupleNode *list_start, *list_end, *lastref;
TupleNode *list_start, Int4 last_indexed;
*list_end,
*lastref;
Int4 last_indexed;
}; };
#define TL_get_num_tuples(x) (x->num_tuples) #define TL_get_num_tuples(x) (x->num_tuples)
/* Create a TupleList. Each tuple consits of fieldcnt columns */ /* Create a TupleList. Each tuple consits of fieldcnt columns */
TupleListClass *TL_Constructor(UInt4 fieldcnt); TupleListClass *TL_Constructor(UInt4 fieldcnt);
void TL_Destructor(TupleListClass *self); void TL_Destructor(TupleListClass *self);
void *TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno); void *TL_get_fieldval(TupleListClass *self, Int4 tupleno, Int2 fieldno);
char TL_add_tuple(TupleListClass *self, TupleNode *new_field); char TL_add_tuple(TupleListClass *self, TupleNode *new_field);
#endif #endif