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

2011-02-18 21:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/rddads/ads.ch
    ! Deleted COMMIT command which collided with Clipper 
      command of the same name. If you need old ads.ch 
      functionality, replace these command with AdsWriteAllRecords() 
      call.

  * contrib/rddads/adsx.c
  * contrib/rddads/ads1.c
    ! Fixed to always defined ADSVFP and ADSVFPX.
      (otherwise the .hbx file content will be dependent 
      on version of the 3rd party dependency)
This commit is contained in:
Viktor Szakats
2011-02-18 20:44:43 +00:00
parent 70fb4f0ebf
commit 295ed16bff
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -16,6 +16,19 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-18 21:44 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/rddads/ads.ch
! Deleted COMMIT command which collided with Clipper
command of the same name. If you need old ads.ch
functionality, replace these command with AdsWriteAllRecords()
call.
* contrib/rddads/adsx.c
* contrib/rddads/ads1.c
! Fixed to always defined ADSVFP and ADSVFPX.
(otherwise the .hbx file content will be dependent
on version of the 3rd party dependency)
2011-02-18 21:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbrun/headers.prg
* contrib/hbrun/hbrun.prg

6
harbour/contrib/rddads/ads.ch
View File

@@ -294,12 +294,6 @@
#command SET CHARTYPE TO <x:ANSI,OEM> ;
=> AdsSetCharType( iif( Upper( <(x)> ) == "OEM", ADS_OEM, ADS_ANSI ) )
/* TOFIX: This command is clashing with std.ch one.
Remove it after redirecting dbCommitAll()
to AdsWriteAllRecords() on RDD level.
[vszakats] */
#command COMMIT => AdsWriteAllRecords()
#command BEGIN TRANSACTION => AdsBeginTransaction()
#command COMMIT TRANSACTION => AdsCommitTransaction()
#command ROLLBACK TRANSACTION => AdsRollback()

36
harbour/contrib/rddads/ads1.c
View File

@@ -1998,55 +1998,55 @@ static HB_ERRCODE adsFieldInfo( ADSAREAP pArea, HB_USHORT uiIndex, HB_USHORT uiT
else
hb_itemPutC( pItem, "C" );
break;
case HB_FT_LOGICAL:
hb_itemPutC( pItem, "L" );
break;
case HB_FT_DATE:
hb_itemPutC( pItem, "D" );
break;
case HB_FT_LONG:
hb_itemPutC( pItem, "N" );
break;
case HB_FT_INTEGER:
hb_itemPutC( pItem, "I" );
break;
case HB_FT_DOUBLE:
hb_itemPutC( pItem, "B" );
break;
case HB_FT_TIME:
hb_itemPutC( pItem, "T" );
break;
case HB_FT_TIMESTAMP:
hb_itemPutC( pItem, "@" );
break;
case HB_FT_MODTIME:
hb_itemPutC( pItem, "=" );
break;
case HB_FT_ROWVER:
hb_itemPutC( pItem, "^" );
break;
case HB_FT_AUTOINC:
hb_itemPutC( pItem, "+" );
break;
case HB_FT_CURRENCY:
hb_itemPutC( pItem, "Y" );
break;
case HB_FT_CURDOUBLE:
hb_itemPutC( pItem, "Z" );
break;
case HB_FT_VARLENGTH:
if( pField->uiFlags & HB_FF_BINARY )
hb_itemPutC( pItem, "VARBINARY" );
@@ -2055,22 +2055,22 @@ static HB_ERRCODE adsFieldInfo( ADSAREAP pArea, HB_USHORT uiIndex, HB_USHORT uiT
else
hb_itemPutC( pItem, "Q" );
break;
case HB_FT_MEMO:
if( pField->uiFlags & HB_FF_UNICODE )
hb_itemPutC( pItem, "NMEMO" );
else
hb_itemPutC( pItem, "M" );
break;
case HB_FT_IMAGE:
hb_itemPutC( pItem, "P" );
break;
case HB_FT_BLOB:
hb_itemPutC( pItem, "W" );
break;
default:
hb_itemPutC( pItem, "U" );
break;
@@ -5390,9 +5390,7 @@ HB_FUNC( ADS ) { ; }
HB_FUNC( ADSADT ) { ; }
HB_FUNC( ADSNTX ) { ; }
HB_FUNC( ADSCDX ) { ; }
#if ADS_LIB_VERSION >= 900
HB_FUNC( ADSVFP ) { ; }
#endif
static void hb_adsRddInit( void * cargo )
{

2
harbour/contrib/rddads/adsx.c
View File

@@ -1537,9 +1537,7 @@ HB_FUNC_STATIC( ADSADTX_GETFUNCTABLE )
HB_FUNC( ADSX ) { ; }
HB_FUNC( ADSNTXX ) { ; }
HB_FUNC( ADSCDXX ) { ; }
#if ADS_LIB_VERSION >= 900
HB_FUNC( ADSVFPX ) { ; }
#endif
HB_FUNC( ADSADTX ) { ; }
HB_FUNC_EXTERN( ADSCDX );