Jump to content

Recommended Posts

Posted

Hello

I have struggled with SQLite.au3 for a day now. I have it working.

Let me know if there is a better way to post this.
Thanks.
Regards Thomas Bodine

These are my changes

$ diff Include/SQLite.dll.au3 /cygdrive/c/Program\ Files\ \(x86\)/AutoIt3/Includ
    e/SQLite.dll.au3                                                                
    3d2                                                                             
    < #cs Original Functions                                                        
    10,17d8                                                                         
    < #ce New functions below                                                       
    <                                                                               
    < Func __SQLite_Inline_Modified()                                               
    <       Return "202410291545" ; 2024/10/29 15:45:00                             
    < EndFunc   ;==>__SQLite_Inline_Modified                                        
    < Func __SQLite_Inline_Version()                                                
    <       Return "304700000" ; 3.47.0.0                                           
    < EndFunc   ;==>__SQLite_Inline_Version                                         
    \ No newline at end of file    
----------------------------------------

Note: I wrapped all the single line if then statements to be three line to help with tracing

diff Include/SQLite.au3 /cygdrive/c/Program\ Files\ \(x86\)/AutoIt3/Include/SQLite.au3 
    8d7
    < #include <MsgBoxConstants.Au3>

    212,215c211
    <       Local $hDll

    <   If $sDll_Filename = Default Or $sDll_Filename = -1 Then

    <       $sDll_Filename = ""

    <   EndIf

    ---
    >   If $sDll_Filename = Default Or $sDll_Filename = -1 Then $sDll_Filename = ""

    221,223c217
    <   If $hPrintCallback = Default Then

    <       $hPrintCallback = __SQLite_ConsoleWrite

    <   EndIf

    ---
    >   If $hPrintCallback = Default Then $hPrintCallback = __SQLite_ConsoleWrite

    226,228c220
    <   If $bUTF8ErrorMsg = Default Then

    <       $bUTF8ErrorMsg = False

    <   EndIf

    ---
    >   If $bUTF8ErrorMsg = Default Then $bUTF8ErrorMsg = False

    231,236c223,224
    <   If $sDll_Filename = "" Then

    <       $sDll_Filename = "sqlite3.dll"

    <   EndIf

    <   If @AutoItX64 And (StringInStr($sDll_Filename, "_x64") = 0) Then

    <       $sDll_Filename = StringReplace($sDll_Filename, ".dll", "_x64.dll")

    <   EndIf

    ---
    >   If $sDll_Filename = "" Then $sDll_Filename = "sqlite3.dll"

    >   If @AutoItX64 And (StringInStr($sDll_Filename, "_x64") = 0) Then $sDll_Filename = StringReplace($sDll_Filename, ".dll", "_x64.dll")

    244,253c232
    <   ConsoleWrite("DLL File Name: " & $sDll_Filename & @CRLF)

    <   If FileExists($sDll_Filename) then

    <       $hDll = DllOpen($sDll_Filename)

    <   Else

    <       Local $iResult =MsgBox($MB_ICONERROR+$MB_OKCANCEL,"DLL File not Found",StringFormat("%s not found",$sDll_Filename))

    <       if ($iResult = $IDCANCEL) Then

    <           exit 1

    <       endif

    <       Return SetError(1, $iExtended, "")

    <   EndIf

    ---
    >   Local $hDll = DllOpen($sDll_Filename)

    269,271c248
    <   If $__g_hDll_SQLite > 0 Then

    <       DllClose($__g_hDll_SQLite)

    <   EndIf

    ---
    >   If $__g_hDll_SQLite > 0 Then DllClose($__g_hDll_SQLite)

    273,275c250
    <   If $__g_hMsvcrtDll_SQLite > 0 Then

    <       DllClose($__g_hMsvcrtDll_SQLite)

    <   EndIf

    ---
    >   If $__g_hMsvcrtDll_SQLite > 0 Then DllClose($__g_hMsvcrtDll_SQLite)

    284,289c259,260
    <   If Not $__g_hDll_SQLite Then

    <       Return SetError(3, $SQLITE_MISUSE, 0)

    <   EndIf

    <   If $sDatabase_Filename = Default Or Not IsString($sDatabase_Filename) Then

    <       $sDatabase_Filename = ":memory:"

    <   EndIf

    ---
    >   If Not $__g_hDll_SQLite Then Return SetError(3, $SQLITE_MISUSE, 0)

    >   If $sDatabase_Filename = Default Or Not IsString($sDatabase_Filename) Then $sDatabase_Filename = ":memory:"

    291,296c262,263
    <   If @error Then

    <       Return SetError(2, @error, 0)

    <   EndIf

    <   If $iAccessMode = Default Then

    <       $iAccessMode = BitOR($SQLITE_OPEN_READWRITE, $SQLITE_OPEN_CREATE)

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, 0)

    >   If $iAccessMode = Default Then $iAccessMode = BitOR($SQLITE_OPEN_READWRITE, $SQLITE_OPEN_CREATE)

    305,307c272
    <   If @error Then

    <       Return SetError(1, @error, 0) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, 0) ; DllCall error

    329,334c294,295
    <   If __SQLite_hChk($hDB, 1) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    <   If $iCharSize = "" Or $iCharSize < 1 Or $iCharSize = Default Then

    <       $iCharSize = -1

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 1) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    >   If $iCharSize = "" Or $iCharSize < 1 Or $iCharSize = Default Then $iCharSize = -1

    338,340c299
    <   If @error Then

    <       Return SetError(2, @error, $r)

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, $r)

    395,397c354
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    402,404c359
    <       If @error Then

    <           Return SetError(3, @error, $iRval)

    <       EndIf

    ---
    >       If @error Then Return SetError(3, @error, $iRval)

    408,410c363
    <   If @error Then

    <       Return SetError(4, @error, 0)

    <   EndIf

    ---
    >   If @error Then Return SetError(4, @error, 0)

    417,419c370
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    432,434c383
    <   If $__g_hDll_SQLite = 0 Then

    <       Return SetError(1, $SQLITE_MISUSE, 0)

    <   EndIf

    ---
    >   If $__g_hDll_SQLite = 0 Then Return SetError(1, $SQLITE_MISUSE, 0)

    436,438c385
    <   If @error Then

    <       Return SetError(1, @error, 0) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, 0) ; DllCall error

    446,448c393
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, @extended, 0)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, @extended, 0)

    450,452c395
    <   If @error Then

    <       Return SetError(1, @error, 0) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, 0) ; DllCall error

    460,462c403
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, @extended, 0)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, @extended, 0)

    464,466c405
    <   If @error Then

    <       Return SetError(1, @error, 0) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, 0) ; DllCall error

    474,476c413
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, @extended, 0)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, @extended, 0)

    478,480c415
    <   If @error Then

    <       Return SetError(1, @error, 0) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, 0) ; DllCall error

    488,490c423
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    492,494c425
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    503,505c434
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, @extended, "Library used incorrectly")

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, @extended, "Library used incorrectly")

    519,521c448
    <   If Not IsArray($aResult) Or UBound($aResult, $UBOUND_DIMENSIONS) <> 2 Or $iCellWidth < 0 Then

    <       Return SetError(1, 0, "")

    <   EndIf

    ---
    >   If Not IsArray($aResult) Or UBound($aResult, $UBOUND_DIMENSIONS) <> 2 Or $iCellWidth < 0 Then Return SetError(1, 0, "")

    523,531c450,452
    <   If $iCellWidth = Default Then

    <       $iCellWidth = 0

    <   EndIf

    <   If $sDelim_Col = Default Then

    <       $sDelim_Col = ""

    <   EndIf

    <   If $sDelim_Row = Default Then

    <       $sDelim_Row = @CRLF

    <   EndIf

    ---
    >   If $iCellWidth = Default Then $iCellWidth = 0

    >   If $sDelim_Col = Default Then $sDelim_Col = ""

    >   If $sDelim_Row = Default Then $sDelim_Row = @CRLF

    555,557c476
    <           If $iCol <> $iUBound_COLS Then

    <               $sOut &= $sDelim_Col

    <           EndIf

    ---
    >           If $iCol <> $iUBound_COLS Then $sOut &= $sDelim_Col

    566,568c485
    <       If $sDelim_Col <> "" Then

    <           $sOut = StringTrimRight($sOut, StringLen($sDelim_Row))

    <       EndIf

    ---
    >       If $sDelim_Col <> "" Then $sOut = StringTrimRight($sOut, StringLen($sDelim_Row))

    578,583c495,496
    <   If __SQLite_hChk($hDB, 1) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    <   If $iCharSize = "" Or $iCharSize < 1 Or $iCharSize = Default Then

    <       $iCharSize = -1

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 1) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    >   If $iCharSize = "" Or $iCharSize < 1 Or $iCharSize = Default Then $iCharSize = -1

    592,594c505
    <   If $bSwichDimensions = Default Then

    <       $bSwichDimensions = False

    <   EndIf

    ---
    >   If $bSwichDimensions = Default Then $bSwichDimensions = False

    597,599c508
    <   If @error Then

    <       Return SetError(2, @error, $r)

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, $r)

    705,710c614,615
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    <   If $iTimeout = Default Then

    <       $iTimeout = 1000

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    >   If $iTimeout = Default Then $iTimeout = 1000

    712,717c617,618
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    <   If $avRval[0] <> $SQLITE_OK Then

    <       SetError(-1)

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    >   If $avRval[0] <> $SQLITE_OK Then SetError(-1)

    726,728c627
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    735,737c634
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    753,761c650,652
    <   If __SQLite_hChk($hQuery, 7, False) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    <   If $bBinary = Default Then

    <       $bBinary = False

    <   EndIf

    <   If $bDoNotFinalize = Default Then

    <       $bDoNotFinalize = False

    <   EndIf

    ---
    >   If __SQLite_hChk($hQuery, 7, False) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    >   If $bBinary = Default Then $bBinary = False

    >   If $bDoNotFinalize = Default Then $bDoNotFinalize = False

    763,765c654
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    774,779c663,664
    <       If @error Then

    <           Return SetError(2, @error, $SQLITE_MISUSE) ; DllCall error

    <       EndIf

    <       If $iRval_ColCnt[0] <= 0 Then

    <           Return SetError(-1, 0, $SQLITE_DONE)

    <       EndIf

    ---
    >       If @error Then Return SetError(2, @error, $SQLITE_MISUSE) ; DllCall error

    >       If $iRval_ColCnt[0] <= 0 Then Return SetError(-1, 0, $SQLITE_DONE)

    783,785c668
    <   If Not $bAutoItTypeConversion Then

    <       $bAutoItTypeConversion = $__g_bAutoItType_SQLite

    <   EndIf

    ---
    >   If Not $bAutoItTypeConversion Then $bAutoItTypeConversion = $__g_bAutoItType_SQLite

    788,790c671
    <       If @error Then

    <           Return SetError(4, @error, $SQLITE_MISUSE) ; DllCall error

    <       EndIf

    ---
    >       If @error Then Return SetError(4, @error, $SQLITE_MISUSE) ; DllCall error

    803,805c684
    <                       If @error Then

    <                           Return SetError(8, 0, $SQLITE_MISUSE) ; DllCall error

    <                       EndIf

    ---
    >                       If @error Then Return SetError(8, 0, $SQLITE_MISUSE) ; DllCall error

    809,811c688
    <                       If @error Then

    <                           Return SetError(9, 0, $SQLITE_MISUSE) ; DllCall error

    <                       EndIf

    ---
    >                       If @error Then Return SetError(9, 0, $SQLITE_MISUSE) ; DllCall error

    815,817c692
    <                       If @error Then

    <                           Return SetError(16, @error, $SQLITE_MISUSE) ; DllCall error

    <                       EndIf

    ---
    >                       If @error Then Return SetError(16, @error, $SQLITE_MISUSE) ; DllCall error

    819,821c694
    <                       If @error Then

    <                           Return SetError(15, @error, $SQLITE_MISUSE) ; DllCall error

    <                       EndIf

    ---
    >                       If @error Then Return SetError(15, @error, $SQLITE_MISUSE) ; DllCall error

    825,827c698
    <                       If @error Then

    <                           Return SetError(13, @error, $SQLITE_MISUSE) ; DllCall error

    <                       EndIf

    ---
    >                       If @error Then Return SetError(13, @error, $SQLITE_MISUSE) ; DllCall error

    832,834c703
    <               If @error Then

    <                   Return SetError(3, @error, $SQLITE_MISUSE) ; DllCall error

    <               EndIf

    ---
    >               If @error Then Return SetError(3, @error, $SQLITE_MISUSE) ; DllCall error

    839,841c708
    <           If @error Then

    <               Return SetError(6, @error, $SQLITE_MISUSE) ; DllCall error

    <           EndIf

    ---
    >           If @error Then Return SetError(6, @error, $SQLITE_MISUSE) ; DllCall error

    843,845c710
    <           If @error Then

    <               Return SetError(5, @error, $SQLITE_MISUSE) ; DllCall error

    <           EndIf

    ---
    >           If @error Then Return SetError(5, @error, $SQLITE_MISUSE) ; DllCall error

    857,859c722
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    861,863c724
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    885,887c746
    <   If __SQLite_hChk($hQuery, 2, False) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hQuery, 2, False) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    889,891c748
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    893,895c750
    <   If $avRval[0] <> $SQLITE_OK Then

    <       SetError(-1)

    <   EndIf

    ---
    >   If $avRval[0] <> $SQLITE_OK Then SetError(-1)

    903,905c758
    <   If __SQLite_hChk($hQuery, 2, False) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hQuery, 2, False) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    907,912c760,761
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    <   If $avRval[0] <> $SQLITE_OK Then

    <       SetError(-1)

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    >   If $avRval[0] <> $SQLITE_OK Then SetError(-1)

    922,924c771
    <   If __SQLite_hChk($hQuery, 3, False) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hQuery, 3, False) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    926,931c773,774
    <   If @error Then

    <       Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    <   EndIf

    <   If $avDataCnt[0] <= 0 Then

    <       Return SetError(-1, 0, $SQLITE_DONE)

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, $SQLITE_MISUSE) ; DllCall error

    >   If $avDataCnt[0] <= 0 Then Return SetError(-1, 0, $SQLITE_DONE)

    936,938c779
    <       If @error Then

    <           Return SetError(2, @error, $SQLITE_MISUSE) ; DllCall error

    <       EndIf

    ---
    >       If @error Then Return SetError(2, @error, $SQLITE_MISUSE) ; DllCall error

    949,951c790
    <   If __SQLite_hChk($hDB, 2) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 2) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    980,982c819
    <       If Not FileExists($sSQLiteExeFilename) Then

    <           Return SetError(2, 0, $SQLITE_MISUSE) ; Can't Found sqlite3.exe

    <       EndIf

    ---
    >       If Not FileExists($sSQLiteExeFilename) Then Return SetError(2, 0, $SQLITE_MISUSE) ; Can't Found sqlite3.exe

    1004,1006c841
    <           If @error Then

    <               __SQLite_Print('@@ Debug(_SQLite_SQLiteExe) : $sCmd = ' & $sCmd & @CRLF & '>ErrorLevel: ' & $nErrorLevel & @CRLF)

    <           EndIf

    ---
    >           If @error Then __SQLite_Print('@@ Debug(_SQLite_SQLiteExe) : $sCmd = ' & $sCmd & @CRLF & '>ErrorLevel: ' & $nErrorLevel & @CRLF)

    1013,1015c848
    <           If StringInStr($sOutput, "SQL error:", $STR_CASESENSE) > 0 Or StringInStr($sOutput, "Incomplete SQL:", $STR_CASESENSE) > 0 Then

    <               $iRval = $SQLITE_ERROR ; SQL error / Incomplete SQL

    <           EndIf

    ---
    >           If StringInStr($sOutput, "SQL error:", $STR_CASESENSE) > 0 Or StringInStr($sOutput, "Incomplete SQL:", $STR_CASESENSE) > 0 Then $iRval = $SQLITE_ERROR ; SQL error / Incomplete SQL

    1020,1022c853
    <   If FileExists($sInputFile) Then

    <       FileDelete($sInputFile)

    <   EndIf

    ---
    >   If FileExists($sInputFile) Then FileDelete($sInputFile)

    1039,1044c870,871
    <   If IsNumber($vData) Then

    <       $vData = String($vData)

    <   EndIf

    <   If Not IsString($vData) And Not IsBinary($vData) Then

    <       Return SetError(1, 0, "")

    <   EndIf

    ---
    >   If IsNumber($vData) Then $vData = String($vData)

    >   If Not IsString($vData) And Not IsBinary($vData) Then Return SetError(1, 0, "")

    1053,1055c880
    <       If Not IsBinary($vData) Then

    <           $vData = StringToBinary($vData, 4)

    <       EndIf

    ---
    >       If Not IsBinary($vData) Then $vData = StringToBinary($vData, 4)

    1067,1072c892,893
    <   If $__g_hDll_SQLite = 0 Then

    <       Return SetError(1, $SQLITE_MISUSE, "")

    <   EndIf

    <   If IsNumber($sString) Then

    <       $sString = String($sString) ; to help number passing common error

    <   EndIf

    ---
    >   If $__g_hDll_SQLite = 0 Then Return SetError(1, $SQLITE_MISUSE, "")

    >   If IsNumber($sString) Then $sString = String($sString) ; to help number passing common error

    1074,1076c895
    <   If @error Then

    <       Return SetError(2, @error, 0)

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, 0)

    1078,1083c897,898
    <   If @error Then

    <       Return SetError(1, @error, "") ; DllCall error

    <   EndIf

    <   If $iBuffSize = Default Or $iBuffSize < 1 Then

    <       $iBuffSize = -1

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, "") ; DllCall error

    >   If $iBuffSize = Default Or $iBuffSize < 1 Then $iBuffSize = -1

    1085,1087c900
    <   If @error Then

    <       Return SetError(3, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(3, @error, "") ; DllCall error

    1096,1098c909
    <   If Not IsBinary($vData) Then

    <       $vData = Binary($vData)

    <   EndIf

    ---
    >   If Not IsBinary($vData) Then $vData = Binary($vData)

    1106,1111c917,918
    <   If IsNumber($sString) Then

    <       $sString = String($sString) ; don't raise error if passing a numeric parameter

    <   EndIf

    <   If Not IsString($sString) Then

    <       Return SetError(1, 0, "")

    <   EndIf

    ---
    >   If IsNumber($sString) Then $sString = String($sString) ; don't raise error if passing a numeric parameter

    >   If Not IsString($sString) Then Return SetError(1, 0, "")

    1120,1122c927
    <   If __SQLite_hChk($hDB, 1) Then

    <       Return SetError(@error, 0, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If __SQLite_hChk($hDB, 1) Then Return SetError(@error, 0, $SQLITE_MISUSE)

    1126,1128c931
    <   If @error Then

    <       Return SetError(2, @error, $r)

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, $r)

    1169,1171c972
    <   If $__g_hDll_SQLite = 0 Then

    <       Return SetError(1, $SQLITE_MISUSE, $SQLITE_MISUSE)

    <   EndIf

    ---
    >   If $__g_hDll_SQLite = 0 Then Return SetError(1, $SQLITE_MISUSE, $SQLITE_MISUSE)

    1173,1175c974
    <       If Not $bDB Then

    <           Return SetError($nError, 0, $SQLITE_ERROR)

    <       EndIf

    ---
    >       If Not $bDB Then Return SetError($nError, 0, $SQLITE_ERROR)

    1178,1180c977
    <   If Not $__g_bSafeModeState_SQLite Then

    <       Return $SQLITE_OK

    <   EndIf

    ---
    >   If Not $__g_bSafeModeState_SQLite Then Return $SQLITE_OK

    1182,1184c979
    <       If _ArraySearch($__g_ahDBs_SQLite, $hGeneric) > 0 Then

    <           Return $SQLITE_OK

    <       EndIf

    ---
    >       If _ArraySearch($__g_ahDBs_SQLite, $hGeneric) > 0 Then Return $SQLITE_OK

    1186,1188c981
    <       If _ArraySearch($__g_ahQuerys_SQLite, $hGeneric) > 0 Then

    <           Return $SQLITE_OK

    <       EndIf

    ---
    >       If _ArraySearch($__g_ahQuerys_SQLite, $hGeneric) > 0 Then Return $SQLITE_OK

    1199,1201c992
    <   If $iElement > 0 Then

    <       _ArrayDelete($ahLists, $iElement)

    <   EndIf

    ---
    >   If $iElement > 0 Then _ArrayDelete($ahLists, $iElement)

    1207,1209c998
    <   If @error Then

    <       Return $SQLITE_CORRUPT ; Not SQLite3.dll or Not found

    <   EndIf

    ---
    >   If @error Then Return $SQLITE_CORRUPT ; Not SQLite3.dll or Not found

    1213,1215c1002
    <   If $sFileVersion[0] = 4 Then

    <       $iMaintVersion = $sFileVersion[4]

    <   EndIf

    ---
    >   If $sFileVersion[0] = 4 Then $iMaintVersion = $sFileVersion[4]

    1217,1219c1004
    <   If $sVersion < 10000000 Then

    <       $sVersion = $sVersion * 100 ; SQLite.dll.au3::__SQLite_Inline_Version() before 3.7.0.1 does not contain maintenance number

    <   EndIf

    ---
    >   If $sVersion < 10000000 Then $sVersion = $sVersion * 100 ; SQLite.dll.au3::__SQLite_Inline_Version() before 3.7.0.1 does not contain maintenance number

    1221,1223c1006
    <   If $sFileVersion >= $sVersion Then

    <       Return $SQLITE_OK ; Version OK

    <   EndIf

    ---
    >   If $sFileVersion >= $sVersion Then Return $SQLITE_OK ; Version OK

    1240,1248c1023,1025
    <   If @Compiled Then

    <       Return SetError($iCurErr, $iCurExt)

    <   EndIf

    <   If $sError = Default Then

    <       $sError = _SQLite_ErrMsg($hDB)

    <   EndIf

    <   If $sQuery = Default Then

    <       $sQuery = ""

    <   EndIf

    ---
    >   If @Compiled Then Return SetError($iCurErr, $iCurExt)

    >   If $sError = Default Then $sError = _SQLite_ErrMsg($hDB)

    >   If $sQuery = Default Then $sQuery = ""

    1251,1253c1028
    <   If $sQuery <> "" Then

    <       $sOut &= "--> Query:    " & $sQuery & @CRLF

    <   EndIf

    ---
    >   If $sQuery <> "" Then $sOut &= "--> Query:    " & $sQuery & @CRLF

    1256,1258c1031
    <   If Not ($vReturnValue = Default) Then

    <       Return SetError($iCurErr, $iCurExt, $vReturnValue)

    <   EndIf

    ---
    >   If Not ($vReturnValue = Default) Then Return SetError($iCurErr, $iCurExt, $vReturnValue)

    1263,1268c1036,1037
    <   If $pPtr = 0 Then

    <       Return ""

    <   EndIf

    <   If $__g_hMsvcrtDll_SQLite < 1 Then

    <       $__g_hMsvcrtDll_SQLite = DllOpen("msvcrt.dll")

    <   EndIf

    ---
    >   If $pPtr = 0 Then Return ""

    >   If $__g_hMsvcrtDll_SQLite < 1 Then $__g_hMsvcrtDll_SQLite = DllOpen("msvcrt.dll")

    1270,1272c1039
    <   If @error Then

    <       Return SetError(1, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, "") ; DllCall error

    1275,1277c1042
    <   If @error Then

    <       Return SetError(2, @error, "")

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, "")

    1291,1293c1056
    <   If $pPtr <> 0 Then

    <       DllCall($__g_hDll_SQLite, "none:cdecl", "sqlite3_free", "ptr", $pPtr)

    <   EndIf

    ---
    >   If $pPtr <> 0 Then DllCall($__g_hDll_SQLite, "none:cdecl", "sqlite3_free", "ptr", $pPtr)

    1310,1312c1073
    <   If @error Then

    <       Return SetError(1, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, "") ; DllCall error

    1316,1318c1077
    <   If @error Then

    <       Return SetError(2, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, "") ; DllCall error

    1335,1337c1094
    <   If @error Then

    <       Return SetError(1, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(1, @error, "") ; DllCall error

    1341,1343c1098
    <   If @error Then

    <       Return SetError(2, @error, "") ; DllCall error

    <   EndIf

    ---
    >   If @error Then Return SetError(2, @error, "") ; DllCall error

    1394,1396c1149
    <       If @error Then

    <           $bDownloadDLL = False ; no valid SQLite version define so invalidate usage

    <       EndIf

    ---
    >       If @error Then $bDownloadDLL = False ; no valid SQLite version define so invalidate usage

    1401,1403c1154
    <           If $aVersion[0] = 4 Then

    <               $iMaintVersion = $aVersion[4]

    <           EndIf

    ---
    >           If $aVersion[0] = 4 Then $iMaintVersion = $aVersion[4]

Resulting Output:

>Running:(3.3.16.1):C:\Program Files (x86)\AutoIt3\autoit3_x64.exe "C:\Users\tbodine\Documents\home\austin\AA_Work\projects\AutoIt\DataBase\sqliteTest.au3"    
    +>Setting Hotkeys...--> Press Ctrl+Alt+Break to Restart or Ctrl+BREAK to Stop.
    DLL File Name: C:\opt\SQLite\sqlite3_x64.dll
    _SQLite_LibVersion=3.47.0
    +>08:15:48 AutoIt3.exe ended.rc:0

 

SQLite.au3 SQLite.dll.au3

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
  • Recently Browsing   0 members

    • No registered users viewing this page.
×
×
  • Create New...