Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-04-11 20:06:46 -05:00
commit 481bb0b9bd
3 changed files with 286 additions and 286 deletions

View File

@ -17,9 +17,9 @@ ERROR: cairo-error string ;
: cairo-png-error ( n -- ) : cairo-png-error ( n -- )
{ {
{ \ CAIRO_STATUS_NO_MEMORY [ "Cairo: no memory" cairo-error ] } { CAIRO_STATUS_NO_MEMORY [ "Cairo: no memory" cairo-error ] }
{ \ CAIRO_STATUS_FILE_NOT_FOUND [ "Cairo: file not found" cairo-error ] } { CAIRO_STATUS_FILE_NOT_FOUND [ "Cairo: file not found" cairo-error ] }
{ \ CAIRO_STATUS_READ_ERROR [ "Cairo: read error" cairo-error ] } { CAIRO_STATUS_READ_ERROR [ "Cairo: read error" cairo-error ] }
[ drop ] [ drop ]
} cond ; } cond ;

View File

@ -1,270 +1,270 @@
! Copyright (C) 2007 Chris Double. ! Copyright (C) 2007 Chris Double.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel alien alien.syntax combinators alien.c-types USING: kernel alien alien.syntax combinators alien.c-types
strings sequences namespaces words math threads ; strings sequences namespaces words math threads ;
IN: odbc IN: odbc
"odbc" "odbc32.dll" "stdcall" add-library "odbc" "odbc32.dll" "stdcall" add-library
LIBRARY: odbc LIBRARY: odbc
TYPEDEF: void* usb_dev_handle* TYPEDEF: void* usb_dev_handle*
TYPEDEF: short SQLRETURN TYPEDEF: short SQLRETURN
TYPEDEF: short SQLSMALLINT TYPEDEF: short SQLSMALLINT
TYPEDEF: short* SQLSMALLINT* TYPEDEF: short* SQLSMALLINT*
TYPEDEF: ushort SQLUSMALLINT TYPEDEF: ushort SQLUSMALLINT
TYPEDEF: uint* SQLUINTEGER* TYPEDEF: uint* SQLUINTEGER*
TYPEDEF: int SQLINTEGER TYPEDEF: int SQLINTEGER
TYPEDEF: char SQLCHAR TYPEDEF: char SQLCHAR
TYPEDEF: char* SQLCHAR* TYPEDEF: char* SQLCHAR*
TYPEDEF: void* SQLHANDLE TYPEDEF: void* SQLHANDLE
TYPEDEF: void* SQLHANDLE* TYPEDEF: void* SQLHANDLE*
TYPEDEF: void* SQLHENV TYPEDEF: void* SQLHENV
TYPEDEF: void* SQLHDBC TYPEDEF: void* SQLHDBC
TYPEDEF: void* SQLHSTMT TYPEDEF: void* SQLHSTMT
TYPEDEF: void* SQLHWND TYPEDEF: void* SQLHWND
TYPEDEF: void* SQLPOINTER TYPEDEF: void* SQLPOINTER
: SQL-HANDLE-ENV ( -- number ) 1 ; inline : SQL-HANDLE-ENV ( -- number ) 1 ; inline
: SQL-HANDLE-DBC ( -- number ) 2 ; inline : SQL-HANDLE-DBC ( -- number ) 2 ; inline
: SQL-HANDLE-STMT ( -- number ) 3 ; inline : SQL-HANDLE-STMT ( -- number ) 3 ; inline
: SQL-HANDLE-DESC ( -- number ) 4 ; inline : SQL-HANDLE-DESC ( -- number ) 4 ; inline
: SQL-NULL-HANDLE ( -- alien ) f ; inline : SQL-NULL-HANDLE ( -- alien ) f ; inline
: SQL-ATTR-ODBC-VERSION ( -- number ) 200 ; inline : SQL-ATTR-ODBC-VERSION ( -- number ) 200 ; inline
: SQL-OV-ODBC2 ( -- number ) 2 <alien> ; inline : SQL-OV-ODBC2 ( -- number ) 2 <alien> ; inline
: SQL-OV-ODBC3 ( -- number ) 3 <alien> ; inline : SQL-OV-ODBC3 ( -- number ) 3 <alien> ; inline
: SQL-SUCCESS ( -- number ) 0 ; inline : SQL-SUCCESS ( -- number ) 0 ; inline
: SQL-SUCCESS-WITH-INFO ( -- number ) 1 ; inline : SQL-SUCCESS-WITH-INFO ( -- number ) 1 ; inline
: SQL-NO-DATA-FOUND ( -- number ) 100 ; inline : SQL-NO-DATA-FOUND ( -- number ) 100 ; inline
: SQL-DRIVER-NOPROMPT ( -- number ) 0 ; inline : SQL-DRIVER-NOPROMPT ( -- number ) 0 ; inline
: SQL-DRIVER-PROMPT ( -- number ) 2 ; inline : SQL-DRIVER-PROMPT ( -- number ) 2 ; inline
: SQL-C-DEFAULT ( -- number ) 99 ; inline : SQL-C-DEFAULT ( -- number ) 99 ; inline
SYMBOL: SQL-CHAR SYMBOL: SQL-CHAR
SYMBOL: SQL-VARCHAR SYMBOL: SQL-VARCHAR
SYMBOL: SQL-LONGVARCHAR SYMBOL: SQL-LONGVARCHAR
SYMBOL: SQL-WCHAR SYMBOL: SQL-WCHAR
SYMBOL: SQL-WCHARVAR SYMBOL: SQL-WCHARVAR
SYMBOL: SQL-WLONGCHARVAR SYMBOL: SQL-WLONGCHARVAR
SYMBOL: SQL-DECIMAL SYMBOL: SQL-DECIMAL
SYMBOL: SQL-SMALLINT SYMBOL: SQL-SMALLINT
SYMBOL: SQL-NUMERIC SYMBOL: SQL-NUMERIC
SYMBOL: SQL-INTEGER SYMBOL: SQL-INTEGER
SYMBOL: SQL-REAL SYMBOL: SQL-REAL
SYMBOL: SQL-FLOAT SYMBOL: SQL-FLOAT
SYMBOL: SQL-DOUBLE SYMBOL: SQL-DOUBLE
SYMBOL: SQL-BIT SYMBOL: SQL-BIT
SYMBOL: SQL-TINYINT SYMBOL: SQL-TINYINT
SYMBOL: SQL-BIGINT SYMBOL: SQL-BIGINT
SYMBOL: SQL-BINARY SYMBOL: SQL-BINARY
SYMBOL: SQL-VARBINARY SYMBOL: SQL-VARBINARY
SYMBOL: SQL-LONGVARBINARY SYMBOL: SQL-LONGVARBINARY
SYMBOL: SQL-TYPE-DATE SYMBOL: SQL-TYPE-DATE
SYMBOL: SQL-TYPE-TIME SYMBOL: SQL-TYPE-TIME
SYMBOL: SQL-TYPE-TIMESTAMP SYMBOL: SQL-TYPE-TIMESTAMP
SYMBOL: SQL-TYPE-UTCDATETIME SYMBOL: SQL-TYPE-UTCDATETIME
SYMBOL: SQL-TYPE-UTCTIME SYMBOL: SQL-TYPE-UTCTIME
SYMBOL: SQL-INTERVAL-MONTH SYMBOL: SQL-INTERVAL-MONTH
SYMBOL: SQL-INTERVAL-YEAR SYMBOL: SQL-INTERVAL-YEAR
SYMBOL: SQL-INTERVAL-YEAR-TO-MONTH SYMBOL: SQL-INTERVAL-YEAR-TO-MONTH
SYMBOL: SQL-INTERVAL-DAY SYMBOL: SQL-INTERVAL-DAY
SYMBOL: SQL-INTERVAL-HOUR SYMBOL: SQL-INTERVAL-HOUR
SYMBOL: SQL-INTERVAL-MINUTE SYMBOL: SQL-INTERVAL-MINUTE
SYMBOL: SQL-INTERVAL-SECOND SYMBOL: SQL-INTERVAL-SECOND
SYMBOL: SQL-INTERVAL-DAY-TO-HOUR SYMBOL: SQL-INTERVAL-DAY-TO-HOUR
SYMBOL: SQL-INTERVAL-DAY-TO-MINUTE SYMBOL: SQL-INTERVAL-DAY-TO-MINUTE
SYMBOL: SQL-INTERVAL-DAY-TO-SECOND SYMBOL: SQL-INTERVAL-DAY-TO-SECOND
SYMBOL: SQL-INTERVAL-HOUR-TO-MINUTE SYMBOL: SQL-INTERVAL-HOUR-TO-MINUTE
SYMBOL: SQL-INTERVAL-HOUR-TO-SECOND SYMBOL: SQL-INTERVAL-HOUR-TO-SECOND
SYMBOL: SQL-INTERVAL-MINUTE-TO-SECOND SYMBOL: SQL-INTERVAL-MINUTE-TO-SECOND
SYMBOL: SQL-GUID SYMBOL: SQL-GUID
SYMBOL: SQL-TYPE-UNKNOWN SYMBOL: SQL-TYPE-UNKNOWN
: convert-sql-type ( number -- symbol ) : convert-sql-type ( number -- symbol )
{ {
{ 1 [ SQL-CHAR ] } { 1 [ SQL-CHAR ] }
{ 12 [ SQL-VARCHAR ] } { 12 [ SQL-VARCHAR ] }
{ -1 [ SQL-LONGVARCHAR ] } { -1 [ SQL-LONGVARCHAR ] }
{ -8 [ SQL-WCHAR ] } { -8 [ SQL-WCHAR ] }
{ -9 [ SQL-WCHARVAR ] } { -9 [ SQL-WCHARVAR ] }
{ -10 [ SQL-WLONGCHARVAR ] } { -10 [ SQL-WLONGCHARVAR ] }
{ 3 [ SQL-DECIMAL ] } { 3 [ SQL-DECIMAL ] }
{ 5 [ SQL-SMALLINT ] } { 5 [ SQL-SMALLINT ] }
{ 2 [ SQL-NUMERIC ] } { 2 [ SQL-NUMERIC ] }
{ 4 [ SQL-INTEGER ] } { 4 [ SQL-INTEGER ] }
{ 7 [ SQL-REAL ] } { 7 [ SQL-REAL ] }
{ 6 [ SQL-FLOAT ] } { 6 [ SQL-FLOAT ] }
{ 8 [ SQL-DOUBLE ] } { 8 [ SQL-DOUBLE ] }
{ -7 [ SQL-BIT ] } { -7 [ SQL-BIT ] }
{ -6 [ SQL-TINYINT ] } { -6 [ SQL-TINYINT ] }
{ -5 [ SQL-BIGINT ] } { -5 [ SQL-BIGINT ] }
{ -2 [ SQL-BINARY ] } { -2 [ SQL-BINARY ] }
{ -3 [ SQL-VARBINARY ] } { -3 [ SQL-VARBINARY ] }
{ -4 [ SQL-LONGVARBINARY ] } { -4 [ SQL-LONGVARBINARY ] }
{ 91 [ SQL-TYPE-DATE ] } { 91 [ SQL-TYPE-DATE ] }
{ 92 [ SQL-TYPE-TIME ] } { 92 [ SQL-TYPE-TIME ] }
{ 93 [ SQL-TYPE-TIMESTAMP ] } { 93 [ SQL-TYPE-TIMESTAMP ] }
[ drop SQL-TYPE-UNKNOWN ] [ drop SQL-TYPE-UNKNOWN ]
} case ; } case ;
: succeeded? ( n -- bool ) : succeeded? ( n -- bool )
#! Did the call succeed (SQL-SUCCESS or SQL-SUCCESS-WITH-INFO) #! Did the call succeed (SQL-SUCCESS or SQL-SUCCESS-WITH-INFO)
{ {
{ \ SQL-SUCCESS [ t ] } { SQL-SUCCESS [ t ] }
{ \ SQL-SUCCESS-WITH-INFO [ t ] } { SQL-SUCCESS-WITH-INFO [ t ] }
[ drop f ] [ drop f ]
} case ; } case ;
FUNCTION: SQLRETURN SQLAllocHandle ( SQLSMALLINT handleType, SQLHANDLE inputHandle, SQLHANDLE* outputHandlePtr ) ; FUNCTION: SQLRETURN SQLAllocHandle ( SQLSMALLINT handleType, SQLHANDLE inputHandle, SQLHANDLE* outputHandlePtr ) ;
FUNCTION: SQLRETURN SQLSetEnvAttr ( SQLHENV environmentHandle, SQLINTEGER attribute, SQLPOINTER valuePtr, SQLINTEGER stringLength ) ; FUNCTION: SQLRETURN SQLSetEnvAttr ( SQLHENV environmentHandle, SQLINTEGER attribute, SQLPOINTER valuePtr, SQLINTEGER stringLength ) ;
FUNCTION: SQLRETURN SQLDriverConnect ( SQLHDBC connectionHandle, SQLHWND windowHandle, SQLCHAR* inConnectionString, SQLSMALLINT stringLength, SQLCHAR* outConnectionString, SQLSMALLINT bufferLength, SQLSMALLINT* stringLength2Ptr, SQLUSMALLINT driverCompletion ) ; FUNCTION: SQLRETURN SQLDriverConnect ( SQLHDBC connectionHandle, SQLHWND windowHandle, SQLCHAR* inConnectionString, SQLSMALLINT stringLength, SQLCHAR* outConnectionString, SQLSMALLINT bufferLength, SQLSMALLINT* stringLength2Ptr, SQLUSMALLINT driverCompletion ) ;
FUNCTION: SQLRETURN SQLDisconnect ( SQLHDBC connectionHandle ) ; FUNCTION: SQLRETURN SQLDisconnect ( SQLHDBC connectionHandle ) ;
FUNCTION: SQLRETURN SQLPrepare ( SQLHSTMT statementHandle, SQLCHAR* statementText, SQLINTEGER length ) ; FUNCTION: SQLRETURN SQLPrepare ( SQLHSTMT statementHandle, SQLCHAR* statementText, SQLINTEGER length ) ;
FUNCTION: SQLRETURN SQLExecute ( SQLHSTMT statementHandle ) ; FUNCTION: SQLRETURN SQLExecute ( SQLHSTMT statementHandle ) ;
FUNCTION: SQLRETURN SQLFreeHandle ( SQLSMALLINT handleType, SQLHANDLE handle ) ; FUNCTION: SQLRETURN SQLFreeHandle ( SQLSMALLINT handleType, SQLHANDLE handle ) ;
FUNCTION: SQLRETURN SQLFetch ( SQLHSTMT statementHandle ) ; FUNCTION: SQLRETURN SQLFetch ( SQLHSTMT statementHandle ) ;
FUNCTION: SQLRETURN SQLNumResultCols ( SQLHSTMT statementHandle, SQLSMALLINT* columnCountPtr ) ; FUNCTION: SQLRETURN SQLNumResultCols ( SQLHSTMT statementHandle, SQLSMALLINT* columnCountPtr ) ;
FUNCTION: SQLRETURN SQLDescribeCol ( SQLHSTMT statementHandle, SQLSMALLINT columnNumber, SQLCHAR* columnName, SQLSMALLINT bufferLength, SQLSMALLINT* nameLengthPtr, SQLSMALLINT* dataTypePtr, SQLUINTEGER* columnSizePtr, SQLSMALLINT* decimalDigitsPtr, SQLSMALLINT* nullablePtr ) ; FUNCTION: SQLRETURN SQLDescribeCol ( SQLHSTMT statementHandle, SQLSMALLINT columnNumber, SQLCHAR* columnName, SQLSMALLINT bufferLength, SQLSMALLINT* nameLengthPtr, SQLSMALLINT* dataTypePtr, SQLUINTEGER* columnSizePtr, SQLSMALLINT* decimalDigitsPtr, SQLSMALLINT* nullablePtr ) ;
FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNumber, SQLSMALLINT targetType, SQLPOINTER targetValuePtr, SQLINTEGER bufferLength, SQLINTEGER* strlen_or_indPtr ) ; FUNCTION: SQLRETURN SQLGetData ( SQLHSTMT statementHandle, SQLUSMALLINT columnNumber, SQLSMALLINT targetType, SQLPOINTER targetValuePtr, SQLINTEGER bufferLength, SQLINTEGER* strlen_or_indPtr ) ;
: alloc-handle ( type parent -- handle ) : alloc-handle ( type parent -- handle )
f <void*> [ SQLAllocHandle ] keep swap succeeded? [ f <void*> [ SQLAllocHandle ] keep swap succeeded? [
*void* *void*
] [ ] [
drop f drop f
] if ; ] if ;
: alloc-env-handle ( -- handle ) : alloc-env-handle ( -- handle )
SQL-HANDLE-ENV SQL-NULL-HANDLE alloc-handle ; SQL-HANDLE-ENV SQL-NULL-HANDLE alloc-handle ;
: alloc-dbc-handle ( env -- handle ) : alloc-dbc-handle ( env -- handle )
SQL-HANDLE-DBC swap alloc-handle ; SQL-HANDLE-DBC swap alloc-handle ;
: alloc-stmt-handle ( dbc -- handle ) : alloc-stmt-handle ( dbc -- handle )
SQL-HANDLE-STMT swap alloc-handle ; SQL-HANDLE-STMT swap alloc-handle ;
: temp-string ( length -- byte-array length ) : temp-string ( length -- byte-array length )
[ CHAR: \space <string> string>char-alien ] keep ; [ CHAR: \space <string> string>char-alien ] keep ;
: odbc-init ( -- env ) : odbc-init ( -- env )
alloc-env-handle alloc-env-handle
[ [
SQL-ATTR-ODBC-VERSION SQL-OV-ODBC3 0 SQLSetEnvAttr SQL-ATTR-ODBC-VERSION SQL-OV-ODBC3 0 SQLSetEnvAttr
succeeded? [ "odbc-init failed" throw ] unless succeeded? [ "odbc-init failed" throw ] unless
] keep ; ] keep ;
: odbc-connect ( env dsn -- dbc ) : odbc-connect ( env dsn -- dbc )
>r alloc-dbc-handle dup r> >r alloc-dbc-handle dup r>
f swap dup length 1024 temp-string 0 <short> SQL-DRIVER-NOPROMPT f swap dup length 1024 temp-string 0 <short> SQL-DRIVER-NOPROMPT
SQLDriverConnect succeeded? [ "odbc-connect failed" throw ] unless ; SQLDriverConnect succeeded? [ "odbc-connect failed" throw ] unless ;
: odbc-disconnect ( dbc -- ) : odbc-disconnect ( dbc -- )
SQLDisconnect succeeded? [ "odbc-disconnect failed" throw ] unless ; SQLDisconnect succeeded? [ "odbc-disconnect failed" throw ] unless ;
: odbc-prepare ( dbc string -- statement ) : odbc-prepare ( dbc string -- statement )
>r alloc-stmt-handle dup r> dup length SQLPrepare succeeded? [ "odbc-prepare failed" throw ] unless ; >r alloc-stmt-handle dup r> dup length SQLPrepare succeeded? [ "odbc-prepare failed" throw ] unless ;
: odbc-free-statement ( statement -- ) : odbc-free-statement ( statement -- )
SQL-HANDLE-STMT swap SQLFreeHandle succeeded? [ "odbc-free-statement failed" throw ] unless ; SQL-HANDLE-STMT swap SQLFreeHandle succeeded? [ "odbc-free-statement failed" throw ] unless ;
: odbc-execute ( statement -- ) : odbc-execute ( statement -- )
SQLExecute succeeded? [ "odbc-execute failed" throw ] unless ; SQLExecute succeeded? [ "odbc-execute failed" throw ] unless ;
: odbc-next-row ( statement -- bool ) : odbc-next-row ( statement -- bool )
SQLFetch succeeded? ; SQLFetch succeeded? ;
: odbc-number-of-columns ( statement -- number ) : odbc-number-of-columns ( statement -- number )
0 <short> [ SQLNumResultCols succeeded? ] keep swap [ 0 <short> [ SQLNumResultCols succeeded? ] keep swap [
*short *short
] [ ] [
drop f drop f
] if ; ] if ;
TUPLE: column nullable digits size type name number ; TUPLE: column nullable digits size type name number ;
C: <column> column C: <column> column
: odbc-describe-column ( statement n -- column ) : odbc-describe-column ( statement n -- column )
dup >r dup >r
1024 CHAR: \space <string> string>char-alien dup >r 1024 CHAR: \space <string> string>char-alien dup >r
1024 1024
0 <short> 0 <short>
0 <short> dup >r 0 <short> dup >r
0 <uint> dup >r 0 <uint> dup >r
0 <short> dup >r 0 <short> dup >r
0 <short> dup >r 0 <short> dup >r
SQLDescribeCol succeeded? [ SQLDescribeCol succeeded? [
r> *short r> *short
r> *short r> *short
r> *uint r> *uint
r> *short convert-sql-type r> *short convert-sql-type
r> alien>char-string r> alien>char-string
r> <column> r> <column>
] [ ] [
r> drop r> drop r> drop r> drop r> drop r> drop r> drop r> drop r> drop r> drop r> drop r> drop
"odbc-describe-column failed" throw "odbc-describe-column failed" throw
] if ; ] if ;
: dereference-type-pointer ( byte-array column -- object ) : dereference-type-pointer ( byte-array column -- object )
column-type { column-type {
{ SQL-CHAR [ alien>char-string ] } { SQL-CHAR [ alien>char-string ] }
{ SQL-VARCHAR [ alien>char-string ] } { SQL-VARCHAR [ alien>char-string ] }
{ SQL-LONGVARCHAR [ alien>char-string ] } { SQL-LONGVARCHAR [ alien>char-string ] }
{ SQL-WCHAR [ alien>char-string ] } { SQL-WCHAR [ alien>char-string ] }
{ SQL-WCHARVAR [ alien>char-string ] } { SQL-WCHARVAR [ alien>char-string ] }
{ SQL-WLONGCHARVAR [ alien>char-string ] } { SQL-WLONGCHARVAR [ alien>char-string ] }
{ SQL-SMALLINT [ *short ] } { SQL-SMALLINT [ *short ] }
{ SQL-INTEGER [ *long ] } { SQL-INTEGER [ *long ] }
{ SQL-REAL [ *float ] } { SQL-REAL [ *float ] }
{ SQL-FLOAT [ *double ] } { SQL-FLOAT [ *double ] }
{ SQL-DOUBLE [ *double ] } { SQL-DOUBLE [ *double ] }
{ SQL-TINYINT [ *char ] } { SQL-TINYINT [ *char ] }
{ SQL-BIGINT [ *longlong ] } { SQL-BIGINT [ *longlong ] }
[ nip [ "Unknown SQL Type: " % word-name % ] "" make ] [ nip [ "Unknown SQL Type: " % word-name % ] "" make ]
} case ; } case ;
TUPLE: field value column ; TUPLE: field value column ;
C: <field> field C: <field> field
: odbc-get-field ( statement column -- field ) : odbc-get-field ( statement column -- field )
dup column? [ dupd odbc-describe-column ] unless dup >r column-number dup column? [ dupd odbc-describe-column ] unless dup >r column-number
SQL-C-DEFAULT SQL-C-DEFAULT
8192 CHAR: \space <string> string>char-alien dup >r 8192 CHAR: \space <string> string>char-alien dup >r
8192 8192
f SQLGetData succeeded? [ f SQLGetData succeeded? [
r> r> [ dereference-type-pointer ] keep <field> r> r> [ dereference-type-pointer ] keep <field>
] [ ] [
r> drop r> [ r> drop r> [
"SQLGetData Failed for Column: " % "SQLGetData Failed for Column: " %
dup column-name % dup column-name %
" of type: " % dup column-type word-name % " of type: " % dup column-type word-name %
] "" make swap <field> ] "" make swap <field>
] if ; ] if ;
: odbc-get-row-fields ( statement -- seq ) : odbc-get-row-fields ( statement -- seq )
[ [
dup odbc-number-of-columns [ dup odbc-number-of-columns [
1+ odbc-get-field field-value , 1+ odbc-get-field field-value ,
] with each ] with each
] { } make ; ] { } make ;
: (odbc-get-all-rows) ( statement -- ) : (odbc-get-all-rows) ( statement -- )
dup odbc-next-row [ dup odbc-get-row-fields , yield (odbc-get-all-rows) ] [ drop ] if ; dup odbc-next-row [ dup odbc-get-row-fields , yield (odbc-get-all-rows) ] [ drop ] if ;
: odbc-get-all-rows ( statement -- seq ) : odbc-get-all-rows ( statement -- seq )
[ (odbc-get-all-rows) ] { } make ; [ (odbc-get-all-rows) ] { } make ;
: odbc-query ( string dsn -- result ) : odbc-query ( string dsn -- result )
odbc-init swap odbc-connect [ odbc-init swap odbc-connect [
swap odbc-prepare swap odbc-prepare
dup odbc-execute dup odbc-execute
dup odbc-get-all-rows dup odbc-get-all-rows
swap odbc-free-statement swap odbc-free-statement
] keep odbc-disconnect ; ] keep odbc-disconnect ;

View File

@ -35,18 +35,18 @@ C: <connection> connection
: check-result ( result -- ) : check-result ( result -- )
{ {
{ \ OCI_SUCCESS [ ] } { OCI_SUCCESS [ ] }
{ \ OCI_ERROR [ err get get-oci-error ] } { OCI_ERROR [ err get get-oci-error ] }
{ \ OCI_INVALID_HANDLE [ "invalid handle" throw ] } { OCI_INVALID_HANDLE [ "invalid handle" throw ] }
[ "operation failed" throw ] [ "operation failed" throw ]
} case ; } case ;
: check-status ( status -- bool ) : check-status ( status -- bool )
{ {
{ \ OCI_SUCCESS [ t ] } { OCI_SUCCESS [ t ] }
{ \ OCI_ERROR [ err get get-oci-error ] } { OCI_ERROR [ err get get-oci-error ] }
{ \ OCI_INVALID_HANDLE [ "invalid handle" throw ] } { OCI_INVALID_HANDLE [ "invalid handle" throw ] }
{ \ OCI_NO_DATA [ f ] } { OCI_NO_DATA [ f ] }
[ "operation failed" throw ] [ "operation failed" throw ]
} case ; } case ;
@ -155,12 +155,12 @@ C: <connection> connection
: calculate-size ( type -- size ) : calculate-size ( type -- size )
{ {
{ \ SQLT_INT [ "int" heap-size ] } { SQLT_INT [ "int" heap-size ] }
{ \ SQLT_FLT [ "float" heap-size ] } { SQLT_FLT [ "float" heap-size ] }
{ \ SQLT_CHR [ "char" heap-size ] } { SQLT_CHR [ "char" heap-size ] }
{ \ SQLT_NUM [ "int" heap-size 10 * ] } { SQLT_NUM [ "int" heap-size 10 * ] }
{ \ SQLT_STR [ 64 ] } { SQLT_STR [ 64 ] }
{ \ SQLT_ODT [ 256 ] } { SQLT_ODT [ 256 ] }
} case ; } case ;
: define-by-position ( position type -- ) : define-by-position ( position type -- )