lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

preping some of the sql stuff for the odbc driver

Browse Source
This commit is contained in:
brianb 2001-07-24 11:00:00 +00:00
parent e0f83b2446
commit ba40f54c85
5 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mdbsql.h
View File

@ -12,6 +12,9 @@ typedef struct {
GPtrArray *tables;
int num_sargs;
GPtrArray *sargs;
MdbTableDef *cur_table;
/* FIX ME */
char *bound_values[256];
} MdbSQL;
typedef struct {

2
src/libmdb/catalog.c
View File

@ -138,7 +138,7 @@ int next_pg, next_pg_off;
if (mdb->pg_buf[0]==0x01 &&
mdb->pg_buf[1]==0x01 &&
mdb_get_int32(mdb,4)==2) {
fprintf(stderr,"cat page %d\n", next_pg);
/* fprintf(stderr,"cat page %d\n", next_pg); */
rows = mdb_catalog_rows(mdb);
for (i=0;i<rows;i++) {
if (mdb->pg_buf[11 + 2 * i] & 0x40) continue;

21
src/odbc/odbc.c
View File

@ -32,7 +32,7 @@
#include "connectparams.h"
static char software_version[] = "$Id: odbc.c,v 1.1 2001/07/10 22:36:20 brianb Exp $";
static char software_version[] = "$Id: odbc.c,v 1.2 2001/07/24 11:00:01 brianb Exp $";
static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn};
@ -50,6 +50,8 @@ static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
#define _MAX_ERROR_LEN 255
static char lastError[_MAX_ERROR_LEN+1];
extern MdbSQL *g_sql;
static void LogError (const char* error)
{
/*
@ -562,12 +564,26 @@ SQLRETURN SQL_API SQLError(
static SQLRETURN SQL_API _SQLExecute( SQLHSTMT hstmt)
{
struct _hstmt *stmt = (struct _hstmt *) hstmt;
struct _hdbc *dbc = (struct _hdbc *) stmt->hdbc;
struct _henv *env = (struct _henv *) dbc->henv;
int ret;
fprintf(stderr,"query = %s\n",stmt->query);
_odbc_fix_literals(stmt);
return SQL_SUCCESS;
/* calls to yyparse would need to be serialized for thread safety */
/* begin unsafe */
g_input_ptr = stmt->query;
g_sql = env->sql;
if (yyparse()) {
/* end unsafe */
LogError("Couldn't parse SQL\n");
mdb_sql_reset(env->sql);
return SQL_ERROR;
} else {
return SQL_SUCCESS;
}
}
SQLRETURN SQL_API SQLExecDirect(
@ -1040,3 +1056,4 @@ static SQLSMALLINT _odbc_get_client_type(int srv_type)
switch (srv_type) {
}
}

3
src/odbc/unittest.c
View File

@ -23,7 +23,7 @@
#include <stdio.h>
static char software_version[] = "$Id: unittest.c,v 1.1 2001/07/10 22:36:20 brianb Exp $";
static char software_version[] = "$Id: unittest.c,v 1.2 2001/07/24 11:00:01 brianb Exp $";
static void *no_unused_var_warn[] = {software_version,
no_unused_var_warn};
@ -44,7 +44,6 @@ HENV henv;
HDBC hdbc;
SQLHSTMT hstmt;
static void printStatementError(HSTMT hstmt, char *msg)
{
UCHAR szSqlState[6];

25
src/sql/mdbsql.c
View File

@ -20,6 +20,8 @@
#include "mdbsql.h"
#include <stdarg.h>
void mdb_dump_results(MdbSQL *sql);
#ifdef HAVE_WORDEXP_H
#define HAVE_WORDEXP
#include <wordexp.h>
@ -384,7 +386,6 @@ MdbCatalogEntry entry;
MdbHandle *mdb = sql->mdb;
MdbTableDef *table = NULL;
MdbSQLTable *sql_tab;
char *bound_values[256];
MdbColumn *col;
MdbSQLColumn *sqlcol;
MdbSQLSarg *sql_sarg;
@ -431,10 +432,10 @@ int found = 0;
for (j=0;j<table->num_cols;j++) {
col=g_ptr_array_index(table->columns,j);
if (!strcasecmp(sqlcol->name, col->name)) {
bound_values[i] = (char *) malloc(MDB_BIND_SIZE);
bound_values[i][0] = '\0';
sql->bound_values[i] = (char *) malloc(MDB_BIND_SIZE);
sql->bound_values[i][0] = '\0';
/* bind the column to its listed (SQL) position */
mdb_bind_column(table, j+1, bound_values[i]);
mdb_bind_column(table, j+1, sql->bound_values[i]);
sqlcol->disp_size = mdb_col_disp_size(col);
found=1;
break;
@ -452,7 +453,15 @@ int found = 0;
sql_sarg=g_ptr_array_index(sql->sargs,i);
mdb_add_sarg_by_name(table,sql_sarg->col_name, sql_sarg->sarg);
}
sql->cur_table = table;
mdb_dump_results(sql);
}
void mdb_dump_results(MdbSQL *sql)
{
int j;
MdbSQLColumn *sqlcol;
/* print header */
for (j=0;j<sql->num_columns;j++) {
sqlcol = g_ptr_array_index(sql->columns,j);
@ -471,10 +480,10 @@ int found = 0;
fprintf(stdout,"\n");
/* print each row */
while(mdb_fetch_row(table)) {
while(mdb_fetch_row(sql->cur_table)) {
for (j=0;j<sql->num_columns;j++) {
sqlcol = g_ptr_array_index(sql->columns,j);
print_value(bound_values[j],sqlcol->disp_size,!j);
print_value(sql->bound_values[j],sqlcol->disp_size,!j);
}
fprintf(stdout,"\n");
}
@ -488,7 +497,7 @@ int found = 0;
fprintf(stdout,"\n");
/* clean up */
for (j=0;j<sql->num_columns;j++) {
if (bound_values[j]) free(bound_values[j]);
if (sql->bound_values[j]) free(sql->bound_values[j]);
}
/* the column and table names are no good now */