fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-10-15 13:43 UTC+0200 Jacek Kubica (jkubica/at/wssk.wroc.pl)

Browse Source 
* contrib/hbfbird/tfirebrd.prg
  * contrib/hbfbird/tfirebrd.prg
    + added support for aliases in sql queries
    ! proper transtaltion sql TIMESTAMP -> harbour`s T value type
This commit is contained in:
Jacek Kubica
2012-10-15 19:48:36 +00:00
parent 7473d79918
commit d9d8ecdfd8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/contrib/hbfbird/firebird.c
View File

@@ -412,13 +412,15 @@ HB_FUNC( FBQUERY )
if( var->sqltype & 1 )
var->sqlind = ( short * ) hb_xgrab( sizeof( short ) );
hb_arrayNew( aTemp, 5 );
hb_arrayNew( aTemp, 7 );
hb_arraySetC( aTemp, 1, sqlda->sqlvar[ i ].sqlname );
hb_arraySetNL( aTemp, 2, ( long ) dtype );
hb_arraySetNL( aTemp, 3, sqlda->sqlvar[ i ].sqllen );
hb_arraySetNL( aTemp, 4, sqlda->sqlvar[ i ].sqlscale );
hb_arraySetC( aTemp, 5, sqlda->sqlvar[ i ].relname );
hb_arraySetNL( aTemp, 6, sqlda->sqlvar[ i ].aliasname_length ); // support for aliases
hb_arraySetC( aTemp, 7, sqlda->sqlvar[ i ].aliasname ); // support for aliases
hb_arraySetForward( aNew, i + 1, aTemp );
}

6
harbour/contrib/hbfbird/tfirebrd.prg
View File

@@ -982,13 +982,13 @@ STATIC FUNCTION StructConvert( aStru, db, dialect )
IF HB_ISARRAY( qry )
DO WHILE FBFetch( qry ) == 0
AAdd( aDomains, { FBGetdata( qry, 1 ), FBGetdata( qry, 2 ), FBGetdata( qry, 3 ) } )
AAdd( aDomains, { IIF(FBGetdata( qry, 1 )==NIL,"",FBGetdata( qry, 1 )), IIF(FBGetdata( qry, 2 )==NIL,"",FBGetdata( qry, 2 )), IIF(FBGetdata( qry, 1 )==NIL,"",FBGetdata( qry, 3 )) } )
ENDDO
FBFree( qry )
FOR i := 1 TO Len( aStru )
cField := RTrim( aStru[ i ][ 1 ] )
cField := RTrim( aStru[ i ][ 7 ] )
nType := aStru[ i ][ 2 ]
nSize := aStru[ i ][ 3 ]
nDec := aStru[ i ][ 4 ] * -1
@@ -1039,7 +1039,7 @@ STATIC FUNCTION StructConvert( aStru, db, dialect )
nSize := 15
EXIT
CASE SQL_TIMESTAMP
cType := "D"
cType := "T"
nSize := 8
EXIT
CASE SQL_TYPE_DATE