From 413c2b4f74090a2bb0e5571426f0b2b4a1695c47 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 19 Jun 2012 10:24:06 +0000 Subject: [PATCH] 2012-06-19 12:21 UTC+0200 Viktor Szakats (harbour syenar.net) + contrib/hbsqlit3/tests/pngtest.png ! added missing file for test code * contrib/hbsqlit3/tests/authoriz.prg * contrib/hbsqlit3/tests/blob.prg * formatting --- harbour/ChangeLog | 10 +++++++++- harbour/contrib/hbsqlit3/tests/authoriz.prg | 20 ++++++++++---------- harbour/contrib/hbsqlit3/tests/blob.prg | 18 +++++++++--------- harbour/contrib/hbsqlit3/tests/pngtest.png | Bin 0 -> 3615 bytes 4 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 harbour/contrib/hbsqlit3/tests/pngtest.png diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9d086baefd..16bfe50b7a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-06-19 12:21 UTC+0200 Viktor Szakats (harbour syenar.net) + + contrib/hbsqlit3/tests/pngtest.png + ! added missing file for test code + + * contrib/hbsqlit3/tests/authoriz.prg + * contrib/hbsqlit3/tests/blob.prg + * formatting + 2012-06-19 08:14 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/src/common/hbffind.c * ulAttr -> nAttr @@ -31,7 +39,7 @@ * contrib/hbqt/qtcore/hbqt_bind.cpp + Added: static HB_CRITICAL_NEW( s_qtMtx ); and parts. + Tuned: compilable with or without TSD protocol. - To turn on TSD protocol, change + To turn on TSD protocol, change __HBQT_WITH_MT_SUPPORT__NO => __HBQT_WITH_MT_SUPPORT__ 2012-06-18 21:12 UTC+0200 Viktor Szakats (harbour syenar.net) diff --git a/harbour/contrib/hbsqlit3/tests/authoriz.prg b/harbour/contrib/hbsqlit3/tests/authoriz.prg index 0e9c8ee000..385a83313c 100644 --- a/harbour/contrib/hbsqlit3/tests/authoriz.prg +++ b/harbour/contrib/hbsqlit3/tests/authoriz.prg @@ -83,7 +83,7 @@ PROCEDURE main() LOCAL cSQLTEXT LOCAL pDb, cb - IF Empty( pDb := PrepareDB(cFile) ) + IF Empty( pDb := PrepareDB( cFile ) ) ErrorLevel( 1 ) RETURN ENDIF @@ -92,25 +92,25 @@ PROCEDURE main() QOut( cSQLTEXT := "SELECT * FROM main.person WHERE age BETWEEN 20 AND 40" ) cb := @CallBack() // "CallBack" - Qout( cErrorMsg(sqlite3_exec(pDb, cSQLTEXT, cb)) ) + QOut( cErrorMsg( sqlite3_exec( pDb, cSQLTEXT, cb ) ) ) sqlite3_sleep( 3000 ) // Authorizer2 - Qout( cErrorMsg(sqlite3_set_authorizer(pDb, @Authorizer2() /*"Authorizer2"*/)) ) + QOut( cErrorMsg( sqlite3_set_authorizer( pDb, @Authorizer2() /*"Authorizer2"*/ ) ) ) QOut( cSQLTEXT := "SELECT * FROM main.person WHERE age BETWEEN 20 AND 40" ) - Qout( cErrorMsg(sqlite3_exec(pDb, cSQLTEXT, cb)) ) + QOut( cErrorMsg( sqlite3_exec( pDb, cSQLTEXT, cb ) ) ) sqlite3_sleep( 3000 ) // Authorizer3 - Qout( cErrorMsg(sqlite3_set_authorizer(pDb, @Authorizer3() /*"Authorizer3"*/)) ) + QOut( cErrorMsg( sqlite3_set_authorizer( pDb, @Authorizer3() /*"Authorizer3"*/ ) ) ) QOut( cSQLTEXT := "SELECT * FROM main.person WHERE age BETWEEN 20 AND 40" ) - Qout( cErrorMsg(sqlite3_exec(pDb, cSQLTEXT, cb), .F. ) ) + QOut( cErrorMsg( sqlite3_exec( pDb, cSQLTEXT, cb ), .F. ) ) sqlite3_sleep( 3000 ) // - pDb := Nil // close database + pDb := NIL // close database RETURN @@ -201,8 +201,8 @@ STATIC FUNCTION cErrorMsg( nError, lShortMsg ) IF nError == 0 cErrorMsg := "SQLITE_OK" ELSE - nIndex := AScan( aErrorCodes, {|x| x[1] == nError } ) - cErrorMsg := iif( nIndex > 0, aErrorCodes[ nIndex ][ iif(lShortMsg,2,3) ], cErrorMsg ) + nIndex := AScan( aErrorCodes, {| x | x[ 1 ] == nError } ) + cErrorMsg := iif( nIndex > 0, aErrorCodes[ nIndex ][ iif( lShortMsg, 2, 3 ) ], cErrorMsg ) ENDIF ENDIF @@ -250,7 +250,7 @@ STATIC FUNCTION PrepareDB( cFile ) FOR EACH enum IN hPerson sqlite3_reset( pStmt ) sqlite3_bind_text( pStmt, 1, enum:__enumKey() ) - sqlite3_bind_int( pStmt, 2, enum:__enumValue() ) + sqlite3_bind_int( pStmt, 2, enum:__enumValue() ) sqlite3_bind_text( pStmt, 3, hb_md5( enum:__enumKey() ) ) sqlite3_step( pStmt ) NEXT diff --git a/harbour/contrib/hbsqlit3/tests/blob.prg b/harbour/contrib/hbsqlit3/tests/blob.prg index 88c6e3ad9f..dee6404055 100644 --- a/harbour/contrib/hbsqlit3/tests/blob.prg +++ b/harbour/contrib/hbsqlit3/tests/blob.prg @@ -54,8 +54,8 @@ #define TABLE_SQL "CREATE TABLE image( id INTEGER PRIMARY KEY AUTOINCREMENT, title TEXT(50), image BLOB )" -PROCEDURE main() - LOCAL lCreateIfNotExist := .t. +PROCEDURE Main() + LOCAL lCreateIfNotExist := .T. LOCAL db := sqlite3_open( "test.s3db", lCreateIfNotExist ) LOCAL stmt LOCAL buff, blob @@ -76,7 +76,7 @@ PROCEDURE main() IF sqlite3_bind_text( stmt, 1, "pngtest.png" ) == SQLITE_OK .AND. ; sqlite3_bind_blob( stmt, 2, @buff ) == SQLITE_OK IF sqlite3_step( stmt ) == SQLITE_DONE - ?"Save pngtest.png into BLOB" + ? "Save pngtest.png into BLOB" ? "INSERT INTO image( title, image ) VALUES( 'pngtest.png', 'pngtest.png' ) - Done" ENDIF ENDIF @@ -92,7 +92,7 @@ PROCEDURE main() sqlite3_sleep( 3000 ) blob := sqlite3_blob_open( db, NIL, "image", "image", sqlite3_last_insert_rowid( db ), 0 /* 0 - RO; 1- RW */ ) - IF !Empty( blob ) + IF ! Empty( blob ) ? "Open BLOB image - Ok" buff := sqlite3_blob_read( blob ) @@ -101,7 +101,7 @@ PROCEDURE main() ? "The size in bytes of the blob - ", sqlite3_blob_bytes( blob ) - IF ( sqlite3_buff_to_file( "pngtest1.png", @buff ) == SQLITE_OK ) + IF sqlite3_buff_to_file( "pngtest1.png", @buff ) == SQLITE_OK ? "Save BLOB into pngtest1.png - Done" ENDIF @@ -112,14 +112,14 @@ PROCEDURE main() ENDIF sqlite3_sleep( 3000 ) - ?"" - ?"Save BLOB using sqlite3_column_blob()" + ? "" + ? "Save BLOB using sqlite3_column_blob()" stmt := sqlite3_prepare( db, "SELECT image FROM image WHERE id == ?5 ") - IF !Empty( stmt ) + IF ! Empty( stmt ) IF sqlite3_bind_int64( stmt, 5, sqlite3_last_insert_rowid( db ) ) == SQLITE_OK IF sqlite3_step( stmt ) == SQLITE_ROW buff := sqlite3_column_blob( stmt, 1 ) - IF ( sqlite3_buff_to_file( "pngtest2.png", @buff ) == SQLITE_OK ) + IF sqlite3_buff_to_file( "pngtest2.png", @buff ) == SQLITE_OK ? "Save BLOB into pngtest2.png - Done" ENDIF buff := NIL diff --git a/harbour/contrib/hbsqlit3/tests/pngtest.png b/harbour/contrib/hbsqlit3/tests/pngtest.png new file mode 100644 index 0000000000000000000000000000000000000000..ee2ac040b698326e5650e2a747e4af274aa0f378 GIT binary patch literal 3615 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 literal 0 HcmV?d00001