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

2012-11-22 19:16 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/hbsqlit3/core.c
    ! fixed sqlite_prepare() to convert strings to UTF-8
      Patch by Marcelo Faria. Many thanks.
This commit is contained in:
Viktor Szakats
2012-11-22 18:17:31 +00:00
parent 89e8018140
commit 61a4e1ca92
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
harbour/ChangeLog
View File

@@ -10,6 +10,11 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-22 19:16 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbsqlit3/core.c
! fixed sqlite_prepare() to convert strings to UTF-8
Patch by Marcelo Faria. Many thanks.
2012-11-22 19:07 UTC+0100 Viktor Szakats (harbour syenar.net)
* include/hbwinuni.h
+ added HB_WINAPI_FUNCTION_NAME() macro to form a WinAPI

32
harbour/contrib/hbsqlit3/core.c
View File

@@ -825,28 +825,22 @@ HB_FUNC( SQLITE3_PREPARE )
if( pHbSqlite3 && pHbSqlite3->db )
{
PHB_ITEM SQL = hb_param( 2, HB_IT_STRING );
void * hSQLText;
HB_SIZE nSQLText;
if( SQL )
{
const char * pSQL = hb_itemGetCPtr( SQL );
int ulLen = ( int ) hb_itemGetCLen( SQL );
psqlite3_stmt pStmt;
const char * pszTail;
const char * pszSQLText = hb_parstr_utf8( 2, &hSQLText, &nSQLText );
psqlite3_stmt pStmt;
const char * pszTail;
if( sqlite3_prepare_v2( pHbSqlite3->db, pSQL, ulLen, &pStmt, &pszTail ) == SQLITE_OK )
{
hb_retptr( pStmt );
}
else
{
sqlite3_finalize( pStmt );
hb_retptr( NULL );
}
}
if( sqlite3_prepare_v2( pHbSqlite3->db, pszSQLText, ( int ) nSQLText, &pStmt, &pszTail ) == SQLITE_OK )
hb_retptr( pStmt );
else
hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 2 ) );
{
sqlite3_finalize( pStmt );
hb_retptr( NULL );
}
hb_strfree( hSQLText );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );