Menu
▾
▴
SF.net SVN: frontierkernel: [1649] Frontier/branches/mysql
|
From: <dav...@us...> - 2007-04-08 23:09:38
|
Revision: 1649
http://svn.sourceforge.net/frontierkernel/?rev=1649&view=rev
Author: davidgewirtz
Date: 2007-04-08 16:09:35 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Frontier successfully links and inits MySQL. Two verbs, init and close work successfully calling libmysql.lib.
Modified Paths:
--------------
Frontier/branches/mysql/Common/headers/langmysql.h
Frontier/branches/mysql/Common/source/langmysql.c
Frontier/branches/mysql/build_VC2K5/Frontier.vcproj
Modified: Frontier/branches/mysql/Common/headers/langmysql.h
===================================================================
--- Frontier/branches/mysql/Common/headers/langmysql.h 2007-04-08 22:21:08 UTC (rev 1648)
+++ Frontier/branches/mysql/Common/headers/langmysql.h 2007-04-08 23:09:35 UTC (rev 1649)
@@ -1,5 +1,5 @@
-/* $Id: langsqlite.h,v 1.1.2.1 2006/03/24 01:31:35 davidgewirtz Exp $ */
+/* $Id: langmysql.h,v 1.1.2.1 2007/04/09 18:30:00 davidgewirtz Exp $ */
/******************************************************************************
@@ -27,43 +27,19 @@
/* prototypes */
-extern boolean sqliteopenverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-03-15 gewirtz */
+extern boolean mysqlinitverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-08 gewirtz */
-extern boolean sqlitecloseverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-03-17 gewirtz */
+extern boolean mysqlcloseverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-08 gewirtz */
-extern boolean sqlitecompilequeryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-extern boolean sqliteclearqueryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-extern boolean sqliteresetqueryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-08-31 gewirtz */
+extern boolean mysqlinitverbs (void); /* 2007-04-08 gewirtz */
-extern boolean sqlitestepqueryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-08-31 gewirtz */
-
-extern boolean sqlitegetcolumncountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumntypeverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnintverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumndoubleverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumntextverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnnameverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-20 gewirtz */
-
-extern boolean sqlitegetrowverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-08-31 gewirtz */
-
-extern boolean sqlitegeterrormessageverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-20 gewirtz */
-
-extern boolean sqliteinitverbs (void); /* 2006-03-15 gewirtz */
-
/* boolean hmacmd5 (unsigned char *, int, unsigned char *, int, unsigned char *);*/ /* 2006-03-05 creedon */
/* boolean hmacsha1 (unsigned char *, int, unsigned char *, int, unsigned char *);*/ /* 2006-03-12 creedon */
/* SQLITE MESSAGES */
-#define SQLITE_COLUMN_ERROR_0 "\xe9""SQLite column error. Frontier uses a base-1 index. Columns must be specified with 1 indicating the first column. This is different from the SQLite API, which requires that columns must be specified with 0 indicating the first column."
-#define SQLITE_COLUMN_ERROR_MAX "\x50""SQLite column error. An attempt was made to access a column that does not exist."
-#define SQLITE_COLUMN_ERROR_UNDEFINED "\x29""SQLite returned an undefined column type."
\ No newline at end of file
+// #define SQLITE_COLUMN_ERROR_0 "\xe9""SQLite column error. Frontier uses a base-1 index. Columns must be specified with 1 indicating the first column. This is different from the SQLite API, which requires that columns must be specified with 0 indicating the first column."
+// #define SQLITE_COLUMN_ERROR_MAX "\x50""SQLite column error. An attempt was made to access a column that does not exist."
+// #define SQLITE_COLUMN_ERROR_UNDEFINED "\x29""SQLite returned an undefined column type."
\ No newline at end of file
Modified: Frontier/branches/mysql/Common/source/langmysql.c
===================================================================
--- Frontier/branches/mysql/Common/source/langmysql.c 2007-04-08 22:21:08 UTC (rev 1648)
+++ Frontier/branches/mysql/Common/source/langmysql.c 2007-04-08 23:09:35 UTC (rev 1649)
@@ -1,5 +1,5 @@
-/* $Id: langsqlite.c,v 1.1.2.1 2006/03/24 01:32:31 davidgewirtz Exp $ */
+/* $Id: langmysql.c,v 2007/04/08 18:32:00 davidgewirtz Exp $ */
/******************************************************************************
@@ -43,8 +43,8 @@
#include "langsystem7.h"
#include "langexternal.h"
-#include "langsqlite.h"
-#include <sqlite3.h>
+#include "langmysql.h"
+#include <mysql.h>
#ifdef MACVERSION
@@ -61,56 +61,26 @@
#endif // WIN95VERSION
-/* Building SQLite into Frontier
+/* Building MySQL into Frontier
-The SQLite source distribution is compiled into the Frontier code as part of this
-module. A key goal in this implementation was to avoid touching any of the SQLite
-source files. SQLite is pretty complex in its coding, and I didn't want to take a
-chance that any changes to the original SQLite code would muck up the database
-functionality.
+See the Frontier Lab Notebook article:
-To include the latest SQLite distribution (we're implementing SQLite 3 here),
-download the SQLite source code from http://www.sqlite.org/download.html.
+http://manila.zatz.com/frontierkernel/stories/storyReader$33
-Move all the SQLite source files into the \Common\sqlite3 folder. If you need to
-include new files in the SQLite project, be sure that shell.c and tclsqlite.c are
-NOT included in the Frontier project.
-
-That's it. For further tips, see the Frontier Lab Notebook article:
-
-http://manila.zatz.com/frontierkernel/stories/storyReader$29
-
-- DG
*/
-typedef enum tysqliteverbtoken { /* verbs that are processed by langsqlite.c */
+typedef enum tymysqlverbtoken { /* verbs that are processed by langmysql.c */
- openfunc,
- compilequeryfunc,
- clearqueryfunc,
- resetqueryfunc,
- stepqueryfunc,
- getcolumncountfunc,
- getcolumntypefunc,
- getcolumnintfunc,
- getcolumndoublefunc,
- getcolumntextfunc,
- getcolumnnamefunc,
- getcolumnfunc,
- getrowfunc,
- geterrormessagefunc,
+ initfunc,
closefunc,
- ctsqliteverbs
- } tysqliteverbtoken;
+ ctmysqlverbs
+ } tymysqlverbtoken;
-static boolean sqlitefunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+static boolean mysqlfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- /*
- 2006-03-15 gewirtz: created, cribbed from langcrypt, itself cribbed from htmlfunctionvalue
- */
-
hdltreenode hp1 = hparam1;
tyvaluerecord *v = vreturned;
@@ -118,79 +88,14 @@
switch (token) {
- case openfunc: { /* 2006-03-14 gewirtz: open an SQLite db */
+ case initfunc: { /* 2007-04-08 gewirtz: initialize MySQL */
- return (sqliteopenverb (hp1, v, bserror));
- } /* openfunc */
+ return (mysqlinitverb (hp1, v, bserror));
+ } /* initfunc */
- case compilequeryfunc: { /* 2006-04-18 gewirtz: prepare an SQLite statement */
-
- return (sqlitecompilequeryverb (hp1, v, bserror));
- } /* compilequeryfunc */
-
- case clearqueryfunc: { /* 2006-04-18 gewirtz: finalize an SQLite statement */
-
- return (sqliteclearqueryverb (hp1, v, bserror));
- } /* clearqueryfunc */
-
- case resetqueryfunc: { /* 2006-08-31 gewirtz: reset an SQLite query statement */
-
- return (sqliteresetqueryverb (hp1, v, bserror));
- } /* resetqueryfunc */
-
- case stepqueryfunc: { /* 2006-08-31 gewirtz: move the cursor one step after the query */
-
- return (sqlitestepqueryverb (hp1, v, bserror));
- } /* stepqueryfunc */
-
- case getcolumncountfunc: { /* 2006-04-18 gewirtz: get the number of columns */
-
- return (sqlitegetcolumncountverb (hp1, v, bserror));
- } /* getcolumncountfunc */
-
- case getcolumntypefunc: { /* 2006-04-18 gewirtz: get the type of the referenced column */
- /* this version returns Frontier strings */
- return (sqlitegetcolumntypeverb (hp1, v, bserror));
- } /* getcolumntypefunc */
-
- case getcolumnintfunc: { /* 2006-04-18 gewirtz: get an int value from the column */
-
- return (sqlitegetcolumnintverb (hp1, v, bserror));
- } /* getcolumnintfunc */
-
- case getcolumndoublefunc: { /* 2006-04-18 gewirtz: get a double value from the column */
-
- return (sqlitegetcolumndoubleverb (hp1, v, bserror));
- } /* getcolumndoublefunc */
-
- case getcolumntextfunc: { /* 2006-04-18 gewirtz: get a text value from the column */
-
- return (sqlitegetcolumntextverb (hp1, v, bserror));
- } /* getcolumntextfunc */
-
- case getcolumnnamefunc: { /* 2006-04-18 gewirtz: get the field name of the column */
-
- return (sqlitegetcolumnnameverb (hp1, v, bserror));
- } /* getcolumnnamefunc */
-
- case getcolumnfunc: { /* 2006-04-20 gewirtz: get the value of the column */
-
- return (sqlitegetcolumnverb (hp1, v, bserror));
- } /* getcolumnfunc */
-
- case getrowfunc: { /* 2006-08-31 gewirtz: get the values in a row */
-
- return (sqlitegetrowverb (hp1, v, bserror));
- } /* getrowfunc */
-
- case geterrormessagefunc: { /* 2006-04-20 gewirtz: get the SQLite error message */
-
- return (sqlitegeterrormessageverb (hp1, v, bserror));
- } /* geterrormessagefunc */
-
- case closefunc: { /* 2006-03-15 gewirtz: close an SQLite db */
+ case closefunc: { /* 2007-04-08 gewirtz: close a MySQL db */
- return (sqlitecloseverb (hp1, v, bserror));
+ return (mysqlcloseverb (hp1, v, bserror));
} /* closefunc */
default:
@@ -198,58 +103,23 @@
return (false);
} /* switch */
- } /* sqlitefunctionvalue */
+ } /* mysqlfunctionvalue */
-boolean sqliteinitverbs (void) {
+boolean mysqlinitverbs (void) {
- /* 2006-03-15 gewirtz: created, cribbed from cryptinitverbs */
-
- return (loadfunctionprocessor (idsqliteverbs, &sqlitefunctionvalue));
- } /* sqliteinitverbs */
+ return (loadfunctionprocessor (idmysqlverbs, &mysqlfunctionvalue));
+ } /* mysqlinitverbs */
+boolean mysqlinitverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
-static void sqliteOpenError (const char *errmsg, bigstring bserror) {
- bigstring bserrmsg;
-
- copyctopstring (errmsg, bserrmsg); /* This creates a pstring at bserrmsg */
- getstringlist (langerrorlist, sqliteopenerror, bserror);
- parsedialogstring (bserror, bserrmsg, nil, nil, nil, bserror);
-
- return;
- } /*sqliteOpenError*/
-
-
-static void sqliteDatabaseError (const char *errmsg, bigstring bserror) {
- bigstring bserrmsg;
-
- copyctopstring (errmsg, bserrmsg); /* This creates a pstring at bserrmsg */
- getstringlist (langerrorlist, sqlitedberror, bserror);
- parsedialogstring (bserror, bserrmsg, nil, nil, nil, bserror);
-
- return;
- } /*sqliteDatabaseError*/
-
-
-static void sqliteScriptError (const char *errmsg, bigstring bserror) {
- bigstring bserrmsg;
-
- copyctopstring (errmsg, bserrmsg); /* This creates a pstring at bserrmsg */
- getstringlist (langerrorlist, notfunctionerror, bserror);
- parsedialogstring (bserror, bserrmsg, nil, nil, nil, bserror);
-
- return;
- } /*sqliteScriptError*/
-
-
-boolean sqliteopenverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
-
Handle dbfile; // path to database file
- sqlite3 *dbid; // the SQLite database handle
+ MYSQL *dbid; // the MySQL object handle
int returnCode; // return code from SQLite call
- tyfilespec fs; // file specification
+ tyfilespec fs; // file specification
//
+ // 2007-04-08 DG: hacked up from sqlite for mysql
// 2006-11-06 creedon: use filespec as parameter, convert dbfile to UTF-8 for sqlite3_open
//
// 2006-10-08 DG: created
@@ -274,64 +144,17 @@
// SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_open
//
- newhandle ( MAXPATHLEN, &dbfile );
-
flnextparamislast = true; // makes sure Frontier throws an error if more than one param is passed
- if ( ! getfilespecvalue ( hparam1, 1, &fs ) ) // fs holds the file path
- return ( false );
-
- #ifdef MACVERSION
-
- boolean fl;
- OSStatus status;
- long len;
-
- fl = extendfilespec ( &fs, &fs );
-
- status = FSRefMakePath ( &fs.fsref, *dbfile, MAXPATHLEN ); // dbfile encoded in UTF-8
-
- len = strlen ( *dbfile );
-
- sethandlesize ( dbfile, len );
-
- if ( fs.path != NULL ) {
-
- Handle path;
-
- len = CFStringGetMaximumSizeForEncoding ( CFStringGetLength ( fs.path ), kCFStringEncodingUTF8 );
-
- newhandle ( ++len, &path );
-
- fl = CFStringGetCString ( fs.path, *path, len, kCFStringEncodingUTF8 );
-
- pushcharhandle ( '/', dbfile );
-
- pushhandle ( path, dbfile );
-
- }
-
- #endif // MACVERSION
-
- #ifdef WIN95VERSION
-
- filespectopath ( &fs, bs );
-
- newtexthandle ( bs, &handletext );
-
- convertCharset ( handletext, dbfile, BIGSTRING ( "\x0C" "Windows-1252" ), BIGSTRING ( "\x05" "utf-8" ) );
-
- #endif // WIN95VERSION
-
// Process the SQLite sequence
- returnCode = sqlite3_open ( *dbfile, &dbid );
+ dbid = mysql_init((MYSQL*) 0);
- if(returnCode) {
- sqliteOpenError(sqlite3_errmsg(dbid), bserror); // send database open error
- sqlite3_close(dbid);
- return (false);
- }
+// if(returnCode) {
+// sqliteOpenError(sqlite3_errmsg(dbid), bserror); // send database open error
+// sqlite3_close(dbid);
+// return (false);
+// }
// return the db address to the scripter
// return (setheapvalue ((Handle) dbid, longvaluetype, vreturned));
@@ -339,11 +162,11 @@
return (setlongvalue ((long) dbid, vreturned));
- } // sqliteopenverb
+ } // mysqlinitverb
-boolean sqlitecloseverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- sqlite3 *dbid; /* the SQLite database handle */
+boolean mysqlcloseverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
+ MYSQL *dbid; // the MySQL object handle
int returnCode; /* return code from SQLite call */
/*
@@ -364,650 +187,10 @@
return (false);
/* Process the SQLite sequence */
- returnCode = sqlite3_close(dbid);
+ mysql_close(dbid);
+ returnCode = 0; // placeholder for debugging. mysql_close doesn't return anything.
return setlongvalue (returnCode, vreturned);
-} /* sqlitecloseverb */
+} /* mysqlcloseverb */
-
-boolean sqlitecompilequeryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- Handle query; /* the SQL query passed to the SQLite engine */
- sqlite3 *dbid; /* the SQLite database handle */
- sqlite3_stmt *queryid = 0; /* the compiled query */
- int returnCode; /* return code from SQLite call */
-
- /*
- sqlite.compileQuery(dbid, query)
-
- Action: compile an SQLite query
- Params: a database id and a query string
- Returns: a query id
- Usage: call in a try statement
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_prepare.
-
- Code that is a good example of prepare in use:
- http://souptonuts.sourceforge.net/code/eatblob.c.html
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &dbid)) /* Get the long value, which becomes the db pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getreadonlytextvalue (hparam1, 2, &query)) /* get the query param */
- return (false);
-
- /* Process the SQLite sequence */
- returnCode = sqlite3_prepare(dbid, *query, gethandlesize(query), &queryid, 0);
- if(returnCode != SQLITE_OK || queryid == NULL) {
- sqliteDatabaseError(sqlite3_errmsg(dbid), bserror); /* send database error */
- return (false);
- }
-
- return (setlongvalue ((long) queryid, vreturned)); /* return the db address to the scripter */
-
-
-} /* sqlitecompilequeryverb */
-
-boolean sqliteclearqueryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
-
- /*
- sqlite.clearQuery(queryid)
-
- Action: clear an SQLite query
- Params: a query id
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_finalize.
- */
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
- return (false);
-
- /* Process the SQLite sequence */
- returnCode = sqlite3_finalize(queryid);
-
- return setlongvalue (returnCode, vreturned);
-
-} /* sqliteclearqueryverb */
-
-
-boolean sqliteresetqueryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
-
- /*
- sqlite.resetQuery(queryid)
-
- Action: reset an SQLite query, so you can scan again from the beginning
- Params: a query id
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_reset.
- */
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
- return (false);
-
- /* Process the SQLite sequence */
- returnCode = sqlite3_reset(queryid);
-
- return setlongvalue (returnCode, vreturned);
-
-} /* sqliteresetqueryverb */
-
-
-boolean sqlitestepqueryverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
-
- /*
- sqlite.stepQuery(queryid)
-
- Action: perform the query, moving the query cursor to the next row of results
- Params: a query id
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_step.
- */
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- /* Process the SQLite sequence */
- returnCode = sqlite3_step(queryid);
-
- return setlongvalue (returnCode, vreturned);
-
-} /* sqlitestepqueryverb */
-
-
-boolean sqlitegetcolumntypeverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber; /* column number */
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
- int columnCount;
-
- /*
- sqlite.getColumnType(queryid, columnNumber)
-
- Action: Retrieve the type of the specified column
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_type.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- returnCode = sqlite3_column_type(queryid, (int) columnNumber);
-
- switch(returnCode) {
-
- case SQLITE_INTEGER: {
- return setostypevalue (langgettypeid (longvaluetype), vreturned);
- }
- case SQLITE_FLOAT: {
- return setostypevalue (langgettypeid (doublevaluetype), vreturned);
- }
- case SQLITE_TEXT: {
- return setostypevalue (langgettypeid (stringvaluetype), vreturned);
- }
- case SQLITE_BLOB: {
- return setostypevalue (langgettypeid (binaryvaluetype), vreturned);
- }
- case SQLITE_NULL: {
- return setostypevalue (langgettypeid (novaluetype), vreturned);
- }
- default: {
- /* SQLite spec says sqlite3_column_type only returns the above 5 types. But,
- just in case it lied, we'll return an error type to help Frontier avoid
- getting a case of return value indigestion. */
- langerrormessage (SQLITE_COLUMN_ERROR_UNDEFINED);
- return (false);
- }
- } /* switch */
-
-} /* sqlitegetcolumntypeverb */
-
-
-boolean sqlitegetcolumnnameverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber; /* column number */
- Handle returnH;
- const char *column_name;
- sqlite3_stmt *queryid;
- int columnCount;
-
- /*
- sqlite.getColumnName(queryid, columnNumber)
-
- Action: Retrieve the name of the specified column
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_name.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- column_name = sqlite3_column_name(queryid, (int) columnNumber);
-
- /* Exit the verb, converting column_name back to Frontier handle */
- if (!newfilledhandle ((ptrvoid) column_name, strlen (column_name), &returnH))
- return false; /* Allocation failed */
-
- return (setheapvalue (returnH, stringvaluetype, vreturned));
-
-} /* sqlitegetcolumnnameverb */
-
-
-boolean sqlitegetcolumncountverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- sqlite3_stmt *queryid;
- int returnCode; /* return code from SQLite call */
-
- /*
- sqlite.getColumnCount(queryid)
-
- Action: Retrieve number of columns returned in a query
- Params: a query id
- Returns: the number of columns in the result set returned by the prepared SQL statement.
- Notes: do not pass the opened database ID across threads.
- returns 0 if pStmt is an SQL statement that does not return data (for example an UPDATE).
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_count.
- */
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- /* Process the SQLite sequence */
- returnCode = sqlite3_column_count(queryid);
-
- return setlongvalue (returnCode, vreturned);
-
-} /* sqlitegetcolumncountverb */
-
-
-boolean sqlitegetcolumnintverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber;
- sqlite3_stmt *queryid;
- long returnCode; /* return code from SQLite call */
- int columnCount;
-
- /*
- sqlite.getColumnInt(queryid, columnNumber)
-
- Action: Retrieve the value of the specified integer-type column
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_int.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- returnCode = sqlite3_column_int(queryid, (int) columnNumber);
-
- return (setlongvalue ((long) returnCode, vreturned));
-
-} /* sqlitegetcolumnintverb */
-
-
-boolean sqlitegetcolumndoubleverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber;
- sqlite3_stmt *queryid;
- double returnDouble; /* double value returned from SQLite call */
- int columnCount;
-
- /*
- sqlite.getColumnDouble(queryid, columnNumber)
-
- Action: Retrieve the value of the specified double-type column
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_double.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- returnDouble = sqlite3_column_double(queryid, (int) columnNumber);
-
- return (setdoublevalue (returnDouble, vreturned));
-
-} /* sqlitegetcolumndoubleverb */
-
-
-boolean sqlitegetcolumntextverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber;
- sqlite3_stmt *queryid;
- Handle returnH;
- const unsigned char *column_text;
- int columnCount;
-
- /*
- sqlite.getColumnText(queryid, columnNumber)
-
- Action: Retrieve the value of the specified text-type column
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_column_text.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the pline pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- column_text = sqlite3_column_text(queryid, (int) columnNumber);
-
- /* Exit the verb, converting column_name back to Frontier handle */
- if (!newfilledhandle ((ptrvoid) column_text, strlen (column_text), &returnH))
- return false; /* Allocation failed */
-
- return (setheapvalue (returnH, stringvaluetype, vreturned));
-
-} /* sqlitegetcolumntextverb */
-
-
-boolean sqlitegetcolumnverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber; /* column number */
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
- double returnDouble; /* double value returned from SQLite call */
- Handle returnH;
- int columnCount;
- const unsigned char *column_text;
- /* const unsigned char *column_blob; */
-
- /*
- sqlite.getColumn(queryid, columnNumber)
-
- Action: Retrieve the value of the specified column element
- Params: a query id and the number of the column (1 base)
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
- this implementation does not support blobs. If a blob column is requested, 0 is returned.
- */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
- return (false);
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- /* Enter the verb, convert the param to null-terminated string */
- if (!getlongvalue (hparam1, 2, &columnNumber))
- return (false);
-
- /* Validate the column number */
- if (columnNumber < 1) {
- langerrormessage (SQLITE_COLUMN_ERROR_0);
- return (false);
- }
- columnCount = sqlite3_column_count(queryid);
- if (columnNumber > columnCount) {
- langerrormessage (SQLITE_COLUMN_ERROR_MAX);
- return (false);
- }
-
- /* Process the SQLite sequence */
- --columnNumber; /* Frontier uses base 1, but SQLite uses a base of 0 for its column numbering */
- returnCode = sqlite3_column_type(queryid, (int) columnNumber);
-
- switch(returnCode) {
-
- case SQLITE_INTEGER: {
- returnCode = sqlite3_column_int(queryid, (int) columnNumber);
- return (setlongvalue ((long) returnCode, vreturned));
- }
- case SQLITE_FLOAT: {
- returnDouble = sqlite3_column_double(queryid, (int) columnNumber);
- return (setdoublevalue (returnDouble, vreturned));
- }
- case SQLITE_TEXT: {
- column_text = sqlite3_column_text(queryid, (int) columnNumber);
-
- /* Exit the verb, converting column_name back to Frontier handle */
- if (!newfilledhandle ((ptrvoid) column_text, strlen (column_text), &returnH))
- return false; /* Allocation failed */
- return (setheapvalue (returnH, stringvaluetype, vreturned));
- }
- case SQLITE_BLOB: {
- return (setlongvalue ((long) 0, vreturned));
-
- /* The following code is ignored. Andre suggested returning actual binary
- data to Frontier, but I'm concerned about reliability, moving that data
- back and forth, so in this implementation, I'm explicitly making blob
- data not supported -- DG */
-
- // column_blob = sqlite3_column_blob(queryid, (int) columnNumber);
-
- /* Exit the verb, converting column_name back to Frontier handle */
- //if (!newfilledhandle ((ptrvoid) column_blob, strlen (column_blob), &returnH))
- // return false; /* Allocation failed */
- //return (setbinaryvalue (returnH, '\?\?\?\?', vreturned));
- }
- case SQLITE_NULL: {
- return (setlongvalue ((long) 0, vreturned));
- }
- default: {
- /* SQLite spec says sqlite3_column_type only returns the above 5 types. But,
- just in case it lied, we'll return an error type to help Frontier avoid
- getting a case of return value indigestion. */
- langerrormessage ("\x29""SQLite returned an undefined column type.");
- return (false);
- }
- } /* switch */
-
-} /* sqlitegetcolumn */
-
-
-boolean sqlitegetrowverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- long columnNumber; /* column number */
- int columnCount; /* number of columns */
- sqlite3_stmt *queryid; /* query id */
- int returnCode; /* return code from SQLite call */
- double returnDouble; /* double value returned from SQLite call */
- Handle returnH;
- const unsigned char *column_text;
- hdllistrecord hlist;
- tyvaluerecord val;
-
- /*
- sqlite.getRow(queryid)
-
- Action: Retrieve a row as a list
- Params: a query id
- Returns: an SQLite result code
- Notes: do not pass the opened database ID across threads.
- this implementation does not support blobs. If a blob column is requested, 0 is returned.
- */
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &queryid)) /* Get the long value, which becomes the queryid pointer */
- return (false);
-
- /* Process the SQLite sequence */
- columnCount = sqlite3_column_count(queryid); /* first, figure out how many columns we've got */
-
- if (columnCount == 0) {
- langerrormessage ("\x2F""SQLite.getRow requires a minimum of one column.");
- return (false);
- }
-
- if (!opnewlist (&hlist, false)) /* fail out if we can't create the list */
- return (false);
-
- for (columnNumber = 0 ; columnNumber < columnCount ; ++columnNumber) {
-
- returnCode = sqlite3_column_type(queryid, (int) columnNumber);
-
- switch(returnCode) {
-
- case SQLITE_INTEGER: {
- returnCode = sqlite3_column_int(queryid, (int) columnNumber);
- if (!langpushlistlong (hlist, (long) returnCode))
- goto error;
- break;
- }
- case SQLITE_FLOAT: {
- returnDouble = sqlite3_column_double(queryid, (int) columnNumber);
- if (!setdoublevalue (returnDouble, &val))
- goto error;
- if (!langpushlistval (hlist, nil, &val))
- goto error;
- break;
- }
- case SQLITE_TEXT: {
- column_text = sqlite3_column_text(queryid, (int) columnNumber);
-
- /* Exit the verb, converting column_name back to Frontier handle */
- if (!newfilledhandle ((ptrvoid) column_text, strlen (column_text), &returnH))
- return false; /* Allocation failed */
- if (!setheapvalue (returnH, stringvaluetype, &val)) /* convert handle to value */
- goto error;
- if (!langpushlistval (hlist, nil, &val))
- goto error;
- break;
- }
- case SQLITE_BLOB: {
- if (!langpushlistlong (hlist, (long) 0))
- goto error;
- break;
- }
- case SQLITE_NULL: {
- if (!langpushlistlong (hlist, (long) 0))
- goto error;
- break;
- }
- default: {
- /* SQLite spec says sqlite3_column_type only returns the above 5 types. But,
- just in case it lied, this time we return a 0, so the rest of the fields
- can be read properly. */
- if (!langpushlistlong (hlist, (long) 0))
- goto error;
- }
- } /* switch */
- } /* for */
-
- return (setheapvalue ((Handle) hlist, listvaluetype, vreturned));
-
- error: {
- opdisposelist (hlist);
- return (false);
- }
-
-} /* sqlitegetrow */
-
-
-boolean sqlitegeterrormessageverb (hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) {
- const char *sqliteError; /* pointer to the error message */
- sqlite3 *db; /* the SQLite database handle */
- Handle returnH = nil; /* The handle being returned back to Frontier */
-
- /*
- Frontier verb: sqlite.getErrorMessage(dbfile)
-
- Returns the error message for the most recent SQLite API call.
- Takes a database ID.
- Returns a string containing the error message.
- NOTE: do not pass the opened database ID across threads.
-
- SQLite docs: http://www.sqlite.org/capi3ref.html#sqlite3_errmsg.
- */
-
- flnextparamislast = true; /* makes sure Frontier throws an error if more than one param is passed */
-
- if (!getlongvalue (hparam1, 1, (long *) &db)) /* Get the long value, which becomes the db pointer */
- return (false);
-
- /* Process the SQLite sequence */
- sqliteError = sqlite3_errmsg(db);
-
- /* Exit the verb, converting errMsg back to Frontier handle */
- if(!newfilledhandle ((ptrvoid) sqliteError, strlen (sqliteError), &returnH))
- return false; /* Allocation failed */
-
- return (setheapvalue (returnH, stringvaluetype, vreturned));
-
-} /* sqlitegeterrormessageverb */
-
Modified: Frontier/branches/mysql/build_VC2K5/Frontier.vcproj
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
