From 410d3ac4692e99ea34bf7c0894b37d64cd6ead16 Mon Sep 17 00:00:00 2001 From: David Arturo Macias Corona Date: Wed, 5 Oct 2005 09:27:26 +0000 Subject: [PATCH] 2005-10-05 03:08 UTC-0500 David Arturo Macias Corona * harbour/include/hbextern.ch ! added missing declarations: DBRELATION, DBRSELECT, MENUMODAL, _PUSHBUTT_, _LISTBOX_ * harbour/contrib/mysql/tmysql.prg ! added conversion from tiny int MySQL type into numeric DBF. (an error before). Supplied by Mitja Podgornik --- harbour/ChangeLog | 10 ++++++++++ harbour/contrib/mysql/tmysql.prg | 16 +++++++++------- harbour/include/hbextern.ch | 7 ++++++- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b97857b14..a2e2ff768b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,16 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ + +2005-10-05 03:08 UTC-0500 David Arturo Macias Corona + * harbour/include/hbextern.ch + ! added missing declarations: + DBRELATION, DBRSELECT, MENUMODAL, _PUSHBUTT_, _LISTBOX_ + * harbour/contrib/mysql/tmysql.prg + ! added conversion from tiny int MySQL type into numeric DBF. (an error before). + Supplied by Mitja Podgornik + + 2005-09-28 13:05 UTC+0100 Ryszard Glab * makefile.bc * makefile.nt diff --git a/harbour/contrib/mysql/tmysql.prg b/harbour/contrib/mysql/tmysql.prg index 24d2a9bcc0..dbbe23e90c 100644 --- a/harbour/contrib/mysql/tmysql.prg +++ b/harbour/contrib/mysql/tmysql.prg @@ -240,7 +240,8 @@ METHOD FieldType(nNum) CLASS TMySQLRow ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_LONG_TYPE .OR.; ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_LONGLONG_TYPE .OR.; ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_FLOAT_TYPE .OR.; - ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DOUBLE_TYPE + ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DOUBLE_TYPE .OR.; + ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DECIMAL_TYPE cType := "N" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DATE_TYPE @@ -255,10 +256,10 @@ METHOD FieldType(nNum) CLASS TMySQLRow cType := "C" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_INT24_TYPE - cType := "I" + cType := "N" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_MEDIUM_BLOB_TYPE - cType := "B" + cType := "M" otherwise cType := "U" @@ -775,7 +776,8 @@ METHOD FieldType(nNum) CLASS TMySQLQuery ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_LONG_TYPE .OR.; ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_LONGLONG_TYPE .OR.; ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_FLOAT_TYPE .OR.; - ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DOUBLE_TYPE + ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DOUBLE_TYPE.OR.; + ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DECIMAL_TYPE cType := "N" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_DATE_TYPE @@ -790,10 +792,10 @@ METHOD FieldType(nNum) CLASS TMySQLQuery cType := "C" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_INT24_TYPE - cType := "I" + cType := "N" case ::aFieldStruct[nNum][MYSQL_FS_TYPE] == MYSQL_MEDIUM_BLOB_TYPE - cType := "B" + cType := "M" otherwise cType := "U" @@ -871,7 +873,6 @@ METHOD GetRow(nRow) CLASS TMySQLTable ::aOldvalue:={} for i := 1 to ::nNumFields - // ::aOldValue[i] := ::FieldGet(i) aadd(::aOldvalue,::fieldget(i)) next @@ -1396,6 +1397,7 @@ CLASS TMySQLServer DATA cPassword // his/her password DATA lError // .T. if occurred an error DATA cCreateQuery + METHOD New(cServer, cUser, cPassword) // Opens connection to a server, returns a server object METHOD Destroy() // Closes connection to server diff --git a/harbour/include/hbextern.ch b/harbour/include/hbextern.ch index b77e7c8f63..3f53b9da5e 100644 --- a/harbour/include/hbextern.ch +++ b/harbour/include/hbextern.ch @@ -116,8 +116,10 @@ EXTERNAL DBGOTO EXTERNAL DBGOTOP EXTERNAL DBRECALL EXTERNAL DBREINDEX +EXTERNAL DBRELATION EXTERNAL DBRLOCK EXTERNAL DBRLOCKLIST +EXTERNAL DBRSELECT EXTERNAL DBRUNLOCK EXTERNAL DBSEEK EXTERNAL DBSELECTAREA @@ -227,6 +229,7 @@ EXTERNAL MEMOREAD EXTERNAL MEMORY EXTERNAL MEMOTRAN EXTERNAL MEMOWRIT +EXTERNAL MENUMODAL EXTERNAL MEMVARBLOCK EXTERNAL MIN EXTERNAL MLCOUNT @@ -576,6 +579,8 @@ EXTERNAL SETTYPEAHEAD EXTERNAL __CAPTION EXTERNAL __GUICOLOR EXTERNAL _CHECKBOX_ +EXTERNAL _LISTBOX_ +EXTERNAL _PUSHBUTT_ EXTERNAL _RADIOGRP_ EXTERNAL CHECKBOX EXTERNAL CLIPPER530 @@ -689,4 +694,4 @@ EXTERNAL STRPOKE #endif /* HB_COMPAT_FLAGSHIP */ -#endif /* HB_EXTERN_CH_ */ +#endif /* HB_EXTERN_CH_ */ \ No newline at end of file