diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 77ce37c1e5..c77f145f70 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-14 21:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/hbapirdd.h + * harbour/include/hbusrrdd.ch + * harbour/contrib/rddsql/sddodbc/odbcdd.c + * harbour/contrib/rddads/ads1.c + * harbour/source/rdd/workarea.c + * harbour/source/rdd/sdf1.c + * harbour/source/rdd/delim1.c + * harbour/source/rdd/dbf1.c + * changed HB_FT_DAYTIME to HB_FT_TIMESTAMP + 2009-06-14 21:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/pp/Makefile ! fixed / used as directory separator in $(RM) command with non *nix like diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index 88a249976a..192001931a 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -1645,7 +1645,7 @@ static HB_ERRCODE adsCreateFields( ADSAREAP pArea, PHB_ITEM pStruct ) if( pArea->iFileType == ADS_ADT ) #endif { - dbFieldInfo.uiType = HB_FT_DAYTIME; + dbFieldInfo.uiType = HB_FT_TIMESTAMP; dbFieldInfo.uiTypeExtended = ADS_TIMESTAMP; dbFieldInfo.uiLen = 8; } @@ -1686,7 +1686,7 @@ static HB_ERRCODE adsCreateFields( ADSAREAP pArea, PHB_ITEM pStruct ) { if( ( iNameLen == 1 && uiLen == 8 ) || iNameLen > 4 ) { - dbFieldInfo.uiType = HB_FT_DAYTIME; + dbFieldInfo.uiType = HB_FT_TIMESTAMP; dbFieldInfo.uiTypeExtended = ADS_TIMESTAMP; dbFieldInfo.uiLen = 8; } @@ -1893,7 +1893,7 @@ static HB_ERRCODE adsFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PHB_ hb_itemPutC( pItem, "TIME" ); break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: hb_itemPutC( pItem, "TIMESTAMP" ); break; @@ -2060,7 +2060,7 @@ static HB_ERRCODE adsGetValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case HB_FT_TIME: - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: case HB_FT_MODTIME: { SIGNED32 lTime = 0, lDate = 0; @@ -2453,7 +2453,7 @@ static HB_ERRCODE adsPutValue( ADSAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) break; case HB_FT_TIME: - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: case HB_FT_MODTIME: if( HB_IS_DATETIME( pItem ) ) { @@ -2774,7 +2774,7 @@ static HB_ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo ) case HB_FT_TIME: cType = "Time"; /* "T" */ break; - case HB_FT_DAYTIME: /* "@" */ + case HB_FT_TIMESTAMP: /* "@" */ cType = "TimeSt"; break; case HB_FT_MODTIME: /* "=" */ @@ -3274,7 +3274,7 @@ static HB_ERRCODE adsOpen( ADSAREAP pArea, LPDBOPENINFO pOpenInfo ) break; case ADS_TIMESTAMP: - dbFieldInfo.uiType = HB_FT_DAYTIME; + dbFieldInfo.uiType = HB_FT_TIMESTAMP; break; case ADS_MODTIME: diff --git a/harbour/contrib/rddsql/sddodbc/odbcdd.c b/harbour/contrib/rddsql/sddodbc/odbcdd.c index b1521095f9..2ba4bf9346 100644 --- a/harbour/contrib/rddsql/sddodbc/odbcdd.c +++ b/harbour/contrib/rddsql/sddodbc/odbcdd.c @@ -343,7 +343,7 @@ static HB_ERRCODE odbcOpen( SQLBASEAREAP pArea ) /* SQL_DATETIME = SQL_DATE = 9 */ case SQL_TIMESTAMP: case SQL_TYPE_TIMESTAMP: - pFieldInfo.uiType = HB_FT_DAYTIME; + pFieldInfo.uiType = HB_FT_TIMESTAMP; break; default: @@ -403,7 +403,7 @@ static HB_ERRCODE odbcOpen( SQLBASEAREAP pArea ) pItem = hb_itemPutTDT( NULL, 0, 0 ); break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: pItem = hb_itemPutTDT( NULL, 0, 0 ); break; @@ -569,7 +569,7 @@ static HB_ERRCODE odbcGoTo( SQLBASEAREAP pArea, ULONG ulRecNo ) break; } - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: { TIMESTAMP_STRUCT val = {0,0,0,0,0,0,0}; if( SQL_SUCCEEDED( res = SQLGetData( hStmt, ui, SQL_C_TIMESTAMP, &val, sizeof( val ), &iLen ) ) ) diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index a1761b4c26..4d793d2577 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -103,7 +103,7 @@ HB_EXTERN_BEGIN #define HB_FT_INTEGER 6 /* "I" */ #define HB_FT_DOUBLE 7 /* "B" */ #define HB_FT_TIME 8 /* "T" */ -#define HB_FT_DAYTIME 9 /* "@" */ +#define HB_FT_TIMESTAMP 9 /* "@" */ #define HB_FT_MODTIME 10 /* "=" */ #define HB_FT_ROWVER 11 /* "^" */ #define HB_FT_AUTOINC 12 /* "+" */ diff --git a/harbour/include/hbusrrdd.ch b/harbour/include/hbusrrdd.ch index c9cf6e5c16..c614956822 100644 --- a/harbour/include/hbusrrdd.ch +++ b/harbour/include/hbusrrdd.ch @@ -188,7 +188,7 @@ #define HB_FT_INTEGER 6 /* "I" */ #define HB_FT_DOUBLE 7 /* "B" */ #define HB_FT_TIME 8 /* "T" */ -#define HB_FT_DAYTIME 9 /* "@" */ +#define HB_FT_TIMESTAMP 9 /* "@" */ #define HB_FT_MODTIME 10 /* "=" */ #define HB_FT_ROWVER 11 /* "^" */ #define HB_FT_AUTOINC 12 /* "+" */ diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index 060a03cd13..8e43fe600b 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -1956,7 +1956,7 @@ static HB_ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem /* no break */ case HB_FT_MODTIME: - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: hb_itemPutTDT( pItem, HB_GET_LE_INT32( pArea->pRecord + pArea->pFieldOffset[ uiIndex ] ), HB_GET_LE_INT32( pArea->pRecord + pArea->pFieldOffset[ uiIndex ] + 4 ) ); break; @@ -2399,14 +2399,14 @@ static HB_ERRCODE hb_dbfPutValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem memcpy( pArea->pRecord + pArea->pFieldOffset[ uiIndex ], szBuffer, 8 ); } } - else if( pField->uiType == HB_FT_DAYTIME || + else if( pField->uiType == HB_FT_TIMESTAMP || pField->uiType == HB_FT_TIME ) { long lDate, lTime; hb_itemGetTDT( pItem, &lDate, &lTime ); ptr = pArea->pRecord + pArea->pFieldOffset[ uiIndex ]; - if( pField->uiType == HB_FT_DAYTIME ) + if( pField->uiType == HB_FT_TIMESTAMP ) { HB_PUT_LE_UINT32( ptr, lDate ); ptr += 4; @@ -3123,7 +3123,7 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo ) pArea->uiRecordLen += pField->uiLen; break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: pThisField->bType = pArea->bTableType == DB_DBF_VFP ? 'T' : '@'; pField->uiLen = 8; pThisField->bLen = ( BYTE ) pField->uiLen; @@ -4076,7 +4076,7 @@ static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) /* types which are not supported by VM - mapped to different ones */ case 'T': if( dbFieldInfo.uiLen == 8 ) - dbFieldInfo.uiType = HB_FT_DAYTIME; + dbFieldInfo.uiType = HB_FT_TIMESTAMP; else if( dbFieldInfo.uiLen == 4 ) dbFieldInfo.uiType = HB_FT_TIME; else @@ -4084,7 +4084,7 @@ static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo ) break; case '@': - dbFieldInfo.uiType = HB_FT_DAYTIME; + dbFieldInfo.uiType = HB_FT_TIMESTAMP; if( dbFieldInfo.uiLen != 8 ) errCode = HB_FAILURE; break; diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c index e67d26336d..78df3fc182 100644 --- a/harbour/source/rdd/delim1.c +++ b/harbour/source/rdd/delim1.c @@ -1119,7 +1119,7 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo ) pArea->fTransRec = FALSE; break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: case HB_FT_MODTIME: pFieldInfo->uiType = HB_FT_STRING; pFieldInfo->uiLen = 23; diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c index f14fc38faa..5434d1cd08 100644 --- a/harbour/source/rdd/sdf1.c +++ b/harbour/source/rdd/sdf1.c @@ -867,7 +867,7 @@ static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo ) pArea->fTransRec = FALSE; break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: case HB_FT_MODTIME: pFieldInfo->uiType = HB_FT_STRING; pFieldInfo->uiLen = 23; diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c index 91461761d3..23996f1434 100644 --- a/harbour/source/rdd/workarea.c +++ b/harbour/source/rdd/workarea.c @@ -385,7 +385,7 @@ static HB_ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) case 'T': if( uiLen == 8 ) { - pFieldInfo.uiType = HB_FT_DAYTIME; + pFieldInfo.uiType = HB_FT_TIMESTAMP; pFieldInfo.uiLen = 8; } else @@ -396,7 +396,7 @@ static HB_ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct ) break; case '@': - pFieldInfo.uiType = HB_FT_DAYTIME; + pFieldInfo.uiType = HB_FT_TIMESTAMP; pFieldInfo.uiLen = 8; break; @@ -527,7 +527,7 @@ static HB_ERRCODE hb_waFieldInfo( AREAP pArea, USHORT uiIndex, USHORT uiType, PH hb_itemPutC( pItem, "T" ); break; - case HB_FT_DAYTIME: + case HB_FT_TIMESTAMP: hb_itemPutC( pItem, "@" ); break;