Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merge updates from trunk. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | core312 |
Files: | files | file ages | folders |
SHA1: |
bb297a629db93755714d877aab29699e |
User & Date: | mistachkin 2016-03-24 00:27:54.526 |
Context
2016-03-24
| ||
17:56 | Merge updates from trunk. check-in: e63fbd3565 user: mistachkin tags: core312 | |
00:27 | Merge updates from trunk. check-in: bb297a629d user: mistachkin tags: core312 | |
2016-03-23
| ||
23:40 | Compilation fix for the RELEASE build configuration. check-in: 024679a92b user: mistachkin tags: trunk | |
2016-03-22
| ||
15:58 | Adapt to the new default page and cache sizes. check-in: b1aa416311 user: mistachkin tags: core312 | |
Changes
Changes to Doc/Extra/Provider/environment.html.
︙ | ︙ | |||
135 136 137 138 139 140 141 142 143 144 145 146 147 148 | <td>If this environment variable is set [to anything], it will be used instead of the application base directory by the native library pre-loader. This environment variable can be especially useful in ASP.NET and other hosted environments where direct control of the location of the managed assemblies is not under the control of the application.</td> </tr> <tr valign="top"> <td>PreLoadSQLite_ProcessorArchitecture</td> <td>If this environment variable is set [to anything], it will be used instead of the processor architecture value contained in the PROCESSOR_ARCHITECTURE environment variable to help build the path of the native library to pre-load.</td> </tr> | > > > > > > > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | <td>If this environment variable is set [to anything], it will be used instead of the application base directory by the native library pre-loader. This environment variable can be especially useful in ASP.NET and other hosted environments where direct control of the location of the managed assemblies is not under the control of the application.</td> </tr> <tr valign="top"> <td>PreLoadSQLite_LibraryFileNameOnly</td> <td>If this configuration variable is set [to anything], it will be used as the base file name (without directory information) for the native SQLite library to be pre-loaded (e.g. "sqlite3.dll" or "libsqlite3.so.0").</td> </tr> <tr valign="top"> <td>PreLoadSQLite_ProcessorArchitecture</td> <td>If this environment variable is set [to anything], it will be used instead of the processor architecture value contained in the PROCESSOR_ARCHITECTURE environment variable to help build the path of the native library to pre-load.</td> </tr> |
︙ | ︙ |
Changes to Doc/Extra/Provider/version.html.
︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 | </div> <div id="mainSection"> <div id="mainBody"> <h1 class="heading">Version History</h1> <p><b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for <a href="https://system.data.sqlite.org/index.html/info/5251bd0878">[5251bd0878]</a>.</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for <a href="https://system.data.sqlite.org/index.html/info/da685c0bac">[da685c0bac]</a>.</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> | > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | </div> <div id="mainSection"> <div id="mainBody"> <h1 class="heading">Version History</h1> <p><b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b></p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Support compiling and using the interop assembly on Linux and Mac OS X.</li> <li>Support running the test suite under Mono on Linux and Mac OS X.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for <a href="https://system.data.sqlite.org/index.html/info/5251bd0878">[5251bd0878]</a>.</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to <a href="https://system.data.sqlite.org/index.html/info/dbd65441a5">[dbd65441a5]</a>.</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for <a href="https://system.data.sqlite.org/index.html/info/da685c0bac">[da685c0bac]</a>.</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> |
︙ | ︙ |
Changes to Externals/Eagle/lib/Test1.0/constraints.eagle.
︙ | ︙ | |||
60 61 62 63 64 65 66 | # NOTE: This job of this procedure is to return the list of "known" # versions of Mono supported by the test suite infrastructure. # return [list \ [list 2 0] [list 2 2] [list 2 4] [list 2 6] [list 2 8] [list 2 10] \ [list 2 11] [list 2 12] [list 3 0] [list 3 1] [list 3 2] [list 3 3] \ [list 3 4] [list 3 5] [list 3 6] [list 3 8] [list 3 10] [list 3 12] \ | | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | # NOTE: This job of this procedure is to return the list of "known" # versions of Mono supported by the test suite infrastructure. # return [list \ [list 2 0] [list 2 2] [list 2 4] [list 2 6] [list 2 8] [list 2 10] \ [list 2 11] [list 2 12] [list 3 0] [list 3 1] [list 3 2] [list 3 3] \ [list 3 4] [list 3 5] [list 3 6] [list 3 8] [list 3 10] [list 3 12] \ [list 4 0] [list 4 2]] } # # NOTE: This procedure was adapted from the one listed on the Tcl Wiki page # at "http://wiki.tcl.tk/43". It is only intended to be used on very # small lists because of its heavy use of recursion and complexity on # the order of O(N!). |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2005.vcproj.
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Win32" |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File | | | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File RelativePath=".\src\generic\interop.h" > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2008.vcproj.
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Win32" |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File | | | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File RelativePath=".\src\generic\interop.h" > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.
︙ | ︙ | |||
491 492 493 494 495 496 497 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2010.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2010.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.2012.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2012.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2012.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.2013.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2013.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2013.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.2015.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2015.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.2015.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.CE.2005.vcproj.
︙ | ︙ | |||
1095 1096 1097 1098 1099 1100 1101 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)" |
︙ | ︙ | |||
1157 1158 1159 1160 1161 1162 1163 | </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File | | | 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 | </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File RelativePath=".\src\generic\interop.h" > </File> <File RelativePath=".\src\core\sqlite3.h" > </File> <File |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.CE.2008.vcproj.
︙ | ︙ | |||
1095 1096 1097 1098 1099 1100 1101 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Pocket PC 2003 (ARMV4)" |
︙ | ︙ | |||
1157 1158 1159 1160 1161 1162 1163 | </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File | | | 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 | </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > <File RelativePath=".\src\generic\interop.h" > </File> <File RelativePath=".\src\core\sqlite3.h" > </File> <File |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.CE.2012.vcxproj.
︙ | ︙ | |||
197 198 199 200 201 202 203 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2012.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.CE.2012.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.Static.2005.vcproj.
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Win32" |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File | | | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File RelativePath=".\src\generic\interop.h" > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2008.vcproj.
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File | | | 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 | > <Tool Name="VCCLCompilerTool" /> </FileConfiguration> </File> <File RelativePath=".\src\generic\interop.c" > </File> <File RelativePath=".\src\core\sqlite3.c" > <FileConfiguration Name="Debug|Win32" |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File | | | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 | > </File> <File RelativePath=".\src\core\sqlite3ext.h" > </File> <File RelativePath=".\src\generic\interop.h" > </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.
︙ | ︙ | |||
491 492 493 494 495 496 497 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2010.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2010.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.Static.2012.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2012.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2012.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.Static.2013.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2013.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2013.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/SQLite.Interop.Static.2015.vcxproj.
︙ | ︙ | |||
498 499 500 501 502 503 504 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> | | | | 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> <ClCompile Include="src\generic\interop.c" /> <ClCompile Include="src\core\sqlite3.c"> <ExcludedFromBuild>true</ExcludedFromBuild> </ClCompile> </ItemGroup> <ItemGroup> <None Include="props\SQLite.Interop.2015.props" /> <None Include="props\sqlite3.props" /> </ItemGroup> <ItemGroup> <ClInclude Include="src\core\sqlite3.h" /> <ClInclude Include="src\core\sqlite3ext.h" /> <ClInclude Include="src\generic\interop.h" /> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <LogicalName>System.Data.SQLite.%(Filename).resources</LogicalName> |
︙ | ︙ |
Changes to SQLite.Interop/SQLite.Interop.Static.2015.vcxproj.filters.
︙ | ︙ | |||
49 50 51 52 53 54 55 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | </ClCompile> <ClCompile Include="src\ext\totype.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\ext\vtshim.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\generic\interop.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="src\core\sqlite3.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> |
︙ | ︙ | |||
71 72 73 74 75 76 77 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> | | | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | <ItemGroup> <ClInclude Include="src\core\sqlite3.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\core\sqlite3ext.h"> <Filter>Header Files</Filter> </ClInclude> <ClInclude Include="src\generic\interop.h"> <Filter>Header Files</Filter> </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="src\win\SQLite.Interop.rc"> <Filter>Resource Files</Filter> </ResourceCompile> <EmbeddedResource Include="..\System.Data.SQLite\Resources\SR.resx"> <Filter>Resource Files</Filter> </EmbeddedResource> </ItemGroup> </Project> |
Changes to SQLite.Interop/src/contrib/extension-functions.c.
︙ | ︙ | |||
86 87 88 89 90 91 92 | power. 2007-02-07 posted by Mikey C to sqlite mailing list. Original code 2006 June 05 by relicoder. */ /* #include "config.h" */ | > | > | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | power. 2007-02-07 posted by Mikey C to sqlite mailing list. Original code 2006 June 05 by relicoder. */ /* #include "config.h" */ #if defined(_WIN32) # include <windows.h> #endif /* #define COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE */ /* NOTE: More functions are available with MSVC 2013. */ #if !defined(_WIN32) || (defined(_MSC_VER) && _MSC_VER >= 1800) # define HAVE_ACOSH 1 # define HAVE_ASINH 1 # define HAVE_ATANH 1 # define HAVE_ISBLANK 1 #endif #define HAVE_SINH 1 |
︙ | ︙ | |||
121 122 123 124 125 126 127 | #include <ctype.h> /* relicoder */ #include <math.h> #include <string.h> #include <stdio.h> #if !defined(_WIN32_WCE) || defined(HAVE_ERRNO_H) | | | | > > < | > > > | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 | #include <ctype.h> /* relicoder */ #include <math.h> #include <string.h> #include <stdio.h> #if !defined(_WIN32_WCE) || defined(HAVE_ERRNO_H) # include <errno.h> /* LMH 2007-03-25 */ #elif defined(_WIN32) int errno; # define strerror(x) "" #else # include <errno.h> #endif #include <stdlib.h> #include <assert.h> #ifndef _MAP_H_ #define _MAP_H_ #if defined(_WIN32) typedef signed char int8_t; typedef unsigned char uint8_t; typedef signed int int16_t; typedef unsigned int uint16_t; typedef signed long int int32_t; typedef unsigned long int uint32_t; typedef signed long long int int64_t; typedef unsigned long long int uint64_t; #else # include <stdint.h> #endif /* ** Simple binary tree implementation to use in median, mode and quartile calculations ** Tree is not necessarily balanced. That would require something like red&black trees of AVL */ typedef int(*cmp_func)(const void *, const void *); |
︙ | ︙ | |||
199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | ** compares 2 doubles ** to use with map_make */ int double_cmp(const void *a, const void *b); #endif /* _MAP_H_ */ typedef uint8_t u8; /* typedef uint16_t u16; */ typedef int64_t i64; static char *sqlite3StrDup( const char *z ) { char *res = sqlite3_malloc( strlen(z)+1 ); return strcpy( res, z ); } /* | > > | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | ** compares 2 doubles ** to use with map_make */ int double_cmp(const void *a, const void *b); #endif /* _MAP_H_ */ #if !defined(SQLITE_CORE) typedef uint8_t u8; /* typedef uint16_t u16; */ typedef int64_t i64; #endif static char *sqlite3StrDup( const char *z ) { char *res = sqlite3_malloc( strlen(z)+1 ); return strcpy( res, z ); } /* |
︙ | ︙ | |||
1449 1450 1451 1452 1453 1454 1455 | } } /* ** Auxiliary function that iterates all elements in a map and finds the mode ** (most frequent value) */ | | | | 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 | } } /* ** Auxiliary function that iterates all elements in a map and finds the mode ** (most frequent value) */ static void modeIterate(void* e, int64_t c, void* pp){ int64_t ei; double ed; ModeCtx *p = (ModeCtx*)pp; if( 0==p->is_double ){ ei = *(int*)(e); if( p->mcnt==c ){ |
︙ | ︙ | |||
1482 1483 1484 1485 1486 1487 1488 | } /* ** Auxiliary function that iterates all elements in a map and finds the median ** (the value such that the number of elements smaller is equal the the number of ** elements larger) */ | | | | 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 | } /* ** Auxiliary function that iterates all elements in a map and finds the median ** (the value such that the number of elements smaller is equal the the number of ** elements larger) */ static void medianIterate(void* e, int64_t c, void* pp){ int64_t ei; double ed; double iL; double iR; int il; int ir; ModeCtx *p = (ModeCtx*)pp; |
︙ | ︙ | |||
1933 1934 1935 1936 1937 1938 1939 | void map_destroy(map *m){ node_destroy(m->base); } int int_cmp(const void *a, const void *b){ int64_t aa = *(int64_t *)(a); int64_t bb = *(int64_t *)(b); | < < < < < < < < | 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 | void map_destroy(map *m){ node_destroy(m->base); } int int_cmp(const void *a, const void *b){ int64_t aa = *(int64_t *)(a); int64_t bb = *(int64_t *)(b); if(aa==bb) return 0; else if(aa<bb) return -1; else return 1; } int double_cmp(const void *a, const void *b){ double aa = *(double *)(a); double bb = *(double *)(b); if(aa==bb) return 0; else if(aa<bb) return -1; else return 1; } |
Name change from SQLite.Interop/src/win/interop.c to SQLite.Interop/src/generic/interop.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #define SQLITE_API __declspec(dllexport) #include "../core/sqlite3.c" #if defined(INTEROP_INCLUDE_EXTRA) #include "../ext/extra.c" #endif #if defined(INTEROP_INCLUDE_CEROD) #include "../ext/cerod.c" | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | /******************************************************** * ADO.NET 2.0 Data Provider for SQLite Version 3.X * Written by Robert Simpson (robert@blackcastlesoft.com) * * Released to the public domain, use at your own risk! ********************************************************/ #ifdef _WIN32 #define SQLITE_API __declspec(dllexport) #else #define WINAPI #endif #include "../core/sqlite3.c" #if !SQLITE_OS_WIN #include <wchar.h> #endif #if defined(INTEROP_INCLUDE_EXTRA) #include "../ext/extra.c" #endif #if defined(INTEROP_INCLUDE_CEROD) #include "../ext/cerod.c" |
︙ | ︙ | |||
28 29 30 31 32 33 34 | #if defined(INTEROP_EXTENSION_FUNCTIONS) #undef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE #include "../contrib/extension-functions.c" extern int RegisterExtensionFunctions(sqlite3 *db); #endif | < | | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | #if defined(INTEROP_EXTENSION_FUNCTIONS) #undef COMPILE_SQLITE_EXTENSIONS_AS_LOADABLE_MODULE #include "../contrib/extension-functions.c" extern int RegisterExtensionFunctions(sqlite3 *db); #endif #if defined(INTEROP_CODEC) && !defined(INTEROP_INCLUDE_SEE) #ifdef SQLITE_ENABLE_ZIPVFS #define INTEROP_CODEC_GET_PAGER(a,b,c) sqlite3PagerGet(a,b,c,0) #elif SQLITE_VERSION_NUMBER > 3009002 #define INTEROP_CODEC_GET_PAGER(a,b,c) sqlite3PagerGet(a,b,c,0) #else #define INTEROP_CODEC_GET_PAGER(a,b,c) sqlite3PagerGet(a,b,c) #endif #include "../win/crypt.c" #endif #include "interop.h" #define INTEROP_DEBUG_NONE (0x0000) #define INTEROP_DEBUG_CLOSE (0x0001) #define INTEROP_DEBUG_FINALIZE (0x0002) |
︙ | ︙ | |||
188 189 190 191 192 193 194 | #endif #if SQLITE_VERSION_NUMBER >= 3011000 sqlite3VXPrintf(&acc, zFormat, ap); #else sqlite3VXPrintf(&acc, 0, zFormat, ap); #endif va_end(ap); | | | | | 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | #endif #if SQLITE_VERSION_NUMBER >= 3011000 sqlite3VXPrintf(&acc, zFormat, ap); #else sqlite3VXPrintf(&acc, 0, zFormat, ap); #endif va_end(ap); #if SQLITE_OS_WIN && SQLITE_VERSION_NUMBER >= 3007013 sqlite3_win32_write_debug(sqlite3StrAccumFinish(&acc), -1); #elif SQLITE_OS_WIN && defined(SQLITE_WIN32_HAS_ANSI) OutputDebugStringA(sqlite3StrAccumFinish(&acc)); #elif SQLITE_OS_WIN && defined(SQLITE_WIN32_HAS_WIDE) { LPWSTR zWideMsg = utf8ToUnicode(sqlite3StrAccumFinish(&acc)); if( zWideMsg ){ OutputDebugStringW(zWideMsg); sqlite3_free(zWideMsg); } } |
︙ | ︙ | |||
897 898 899 900 901 902 903 | SQLITE_API const void * WINAPI sqlite3_column_origin_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_origin_name16(stmt, iCol); if (plen) *plen = pval ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } | | | 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 | SQLITE_API const void * WINAPI sqlite3_column_origin_name16_interop(sqlite3_stmt *stmt, int iCol, int *plen) { const void *pval = sqlite3_column_origin_name16(stmt, iCol); if (plen) *plen = pval ? wcslen((wchar_t *)pval) * sizeof(wchar_t) : 0; return pval; } SQLITE_API int WINAPI sqlite3_table_column_metadata_interop(sqlite3 *db, const char *zDbName, const char *zTableName, const char *zColumnName, char const **pzDataType, char const **pzCollSeq, int *pNotNull, int *pPrimaryKey, int *pAutoinc, int *pdtLen, int *pcsLen) { int n; n = sqlite3_table_column_metadata(db, zDbName, zTableName, zColumnName, pzDataType, pzCollSeq, pNotNull, pPrimaryKey, pAutoinc); if (pdtLen) *pdtLen = (pzDataType && *pzDataType) ? strlen(*pzDataType) : 0; if (pcsLen) *pcsLen = (pzCollSeq && *pzCollSeq) ? strlen(*pzCollSeq) : 0; |
︙ | ︙ | |||
954 955 956 957 958 959 960 | int n; int ret = -1; /* NOT FOUND */ if (!p || !db) return ret; sqlite3_mutex_enter(db->mutex); for (n = 0; n < p->nCursor && p->apCsr[n] != NULL; n++) { | | | 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 | int n; int ret = -1; /* NOT FOUND */ if (!p || !db) return ret; sqlite3_mutex_enter(db->mutex); for (n = 0; n < p->nCursor && p->apCsr[n] != NULL; n++) { if (p->apCsr[n]->isTable == 0) continue; if (p->apCsr[n]->iDb != iDb) continue; #if SQLITE_VERSION_NUMBER >= 3010000 if (p->apCsr[n]->uc.pCursor->pgnoRoot == tableRootPage) #else if (p->apCsr[n]->pCursor->pgnoRoot == tableRootPage) #endif { |
︙ | ︙ | |||
1055 1056 1057 1058 1059 1060 1061 | } break; } sqlite3_mutex_leave(db->mutex); return ret; } | < | 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 | } break; } sqlite3_mutex_leave(db->mutex); return ret; } /*****************************************************************************/ #if defined(SQLITE_CORE) #undef SQLITE_CORE #endif |
︙ | ︙ | |||
1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 | /* ** The INTEROP_TEST_EXTENSION block must be at the end of this source file ** because it includes the "sqlite3ext.h" file, which defines the sqlite3 ** public API function names to be macros and that would cause the code ** above this point to malfunction. */ #if defined(INTEROP_TEST_EXTENSION) #include "../core/sqlite3ext.h" SQLITE_EXTENSION_INIT1 /* ** The interopTest() SQL function returns its first argument or raises an ** error if there are not enough arguments. */ | > > > > | 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 | /* ** The INTEROP_TEST_EXTENSION block must be at the end of this source file ** because it includes the "sqlite3ext.h" file, which defines the sqlite3 ** public API function names to be macros and that would cause the code ** above this point to malfunction. */ #if defined(INTEROP_TEST_EXTENSION) #if !SQLITE_OS_WIN #include <unistd.h> #endif #include "../core/sqlite3ext.h" SQLITE_EXTENSION_INIT1 /* ** The interopTest() SQL function returns its first argument or raises an ** error if there are not enough arguments. */ |
︙ | ︙ | |||
1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 | ){ int m; if( argc!=1 ){ sqlite3_result_error(context, "need exactly one argument", -1); return; } m = sqlite3_value_int(argv[0]); #if SQLITE_OS_WINCE Sleep(m); sqlite3_result_int(context, WAIT_OBJECT_0); #else sqlite3_result_int(context, SleepEx(m, TRUE)); #endif } /* SQLite invokes this routine once when it loads the extension. ** Create new functions, collating sequences, and virtual table ** modules here. This is usually the only exported symbol in ** the shared library. | > > > > > > > > | 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 | ){ int m; if( argc!=1 ){ sqlite3_result_error(context, "need exactly one argument", -1); return; } m = sqlite3_value_int(argv[0]); #if SQLITE_OS_WIN #if SQLITE_OS_WINCE Sleep(m); sqlite3_result_int(context, WAIT_OBJECT_0); #else sqlite3_result_int(context, SleepEx(m, TRUE)); #endif #else if( m>0 ){ sqlite3_result_int64(context, sleep((unsigned)m)); }else{ sqlite3_result_null(context); } #endif } /* SQLite invokes this routine once when it loads the extension. ** Create new functions, collating sequences, and virtual table ** modules here. This is usually the only exported symbol in ** the shared library. |
︙ | ︙ | |||
1164 1165 1166 1167 1168 1169 1170 | interopTestFunc, 0, 0); if( rc==SQLITE_OK ){ rc = sqlite3_create_function(db, "interopSleep", 1, SQLITE_ANY, 0, interopSleepFunc, 0, 0); } return rc; } | | | 1182 1183 1184 1185 1186 1187 1188 1189 | interopTestFunc, 0, 0); if( rc==SQLITE_OK ){ rc = sqlite3_create_function(db, "interopSleep", 1, SQLITE_ANY, 0, interopSleepFunc, 0, 0); } return rc; } #endif /* SQLITE_OS_WIN */ |
Name change from SQLite.Interop/src/win/interop.h to SQLite.Interop/src/generic/interop.h.
︙ | ︙ |
Changes to SQLite.Interop/src/win/AssemblyInfo.cpp.
1 2 3 4 5 6 7 8 9 10 11 | /* * AssemblyInfo.cpp - * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ using namespace System::Reflection; using namespace System::Resources; using namespace System::Runtime::InteropServices; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* * AssemblyInfo.cpp - * * Written by Joe Mistachkin. * Released to the public domain, use at your own risk! */ using namespace System::Reflection; using namespace System::Resources; using namespace System::Runtime::InteropServices; #include "../generic/interop.h" [assembly:AssemblyTitleAttribute("SQLite.Interop")]; [assembly:AssemblyCompanyAttribute("https://system.data.sqlite.org/")]; [assembly:AssemblyDescriptionAttribute("System.Data.SQLite Interop Assembly")]; [assembly:AssemblyProductAttribute("System.Data.SQLite")]; [assembly:AssemblyCopyrightAttribute("Public Domain")]; [assembly:AssemblyVersionAttribute(INTEROP_VERSION)]; |
︙ | ︙ |
Changes to SQLite.Interop/src/win/SQLite.Interop.rc.
︙ | ︙ | |||
12 13 14 15 16 17 18 | #endif /* !defined(_WIN32_WCE) */ #if !defined(VS_FF_NONE) # define VS_FF_NONE 0x00000000L #endif /* !defined(VS_FF_NONE) */ #include "..\core\sqlite3.h" | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #endif /* !defined(_WIN32_WCE) */ #if !defined(VS_FF_NONE) # define VS_FF_NONE 0x00000000L #endif /* !defined(VS_FF_NONE) */ #include "..\core\sqlite3.h" #include "..\generic\interop.h" /* ** English (U.S.) resources */ #if defined(_WIN32) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US |
︙ | ︙ |
Changes to Setup/build.bat.
︙ | ︙ | |||
366 367 368 369 370 371 372 | ) ) ELSE ( ECHO WARNING: Property file modification skipped, disabled via NOPROPS environment variable. ) IF NOT DEFINED NOTAG ( IF EXIST Externals\Eagle\bin\EagleShell.exe ( | | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 | ) ) ELSE ( ECHO WARNING: Property file modification skipped, disabled via NOPROPS environment variable. ) IF NOT DEFINED NOTAG ( IF EXIST Externals\Eagle\bin\EagleShell.exe ( %__ECHO% Externals\Eagle\bin\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode SQLite.Interop\src\generic\interop.h IF ERRORLEVEL 1 ( ECHO Source tagging of "SQLite.Interop\src\generic\interop.h" failed. GOTO errors ) %__ECHO% Externals\Eagle\bin\EagleShell.exe -file Setup\sourceTag.eagle SourceIdMode System.Data.SQLite\SQLitePatchLevel.cs IF ERRORLEVEL 1 ( ECHO Source tagging of "System.Data.SQLite\SQLitePatchLevel.cs" failed. |
︙ | ︙ |
Changes to Setup/build_mono.bat.
︙ | ︙ | |||
30 31 32 33 34 35 36 | %_VECHO% Tools = '%TOOLS%' SET BUILD_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly SET PLATFORMS="Any CPU" SET YEARS=2008 2013 SET NOUSER=1 | | < | < < | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | %_VECHO% Tools = '%TOOLS%' SET BUILD_CONFIGURATIONS=DebugManagedOnly ReleaseManagedOnly SET PLATFORMS="Any CPU" SET YEARS=2008 2013 SET NOUSER=1 SET MSBUILD_ARGS=/property:UseSqliteStandardLibraryName=true SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropCodec=false SET MSBUILD_ARGS=%MSBUILD_ARGS% /property:InteropLog=false CALL :fn_ResetErrorLevel %__ECHO3% CALL "%TOOLS%\build_all.bat" IF ERRORLEVEL 1 ( ECHO Failed to build Mono binaries. |
︙ | ︙ |
Changes to Setup/data/verify.lst.
︙ | ︙ | |||
505 506 507 508 509 510 511 512 513 514 | SQLite.Interop/src/ext/ SQLite.Interop/src/ext/fts5.c SQLite.Interop/src/ext/json1.c SQLite.Interop/src/ext/percentile.c SQLite.Interop/src/ext/regexp.c SQLite.Interop/src/ext/totype.c SQLite.Interop/src/ext/vtshim.c SQLite.Interop/src/win/ SQLite.Interop/src/win/AssemblyInfo.cpp SQLite.Interop/src/win/crypt.c | > > < < | 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 | SQLite.Interop/src/ext/ SQLite.Interop/src/ext/fts5.c SQLite.Interop/src/ext/json1.c SQLite.Interop/src/ext/percentile.c SQLite.Interop/src/ext/regexp.c SQLite.Interop/src/ext/totype.c SQLite.Interop/src/ext/vtshim.c SQLite.Interop/src/generic/interop.c SQLite.Interop/src/generic/interop.h SQLite.Interop/src/win/ SQLite.Interop/src/win/AssemblyInfo.cpp SQLite.Interop/src/win/crypt.c SQLite.Interop/src/win/SQLite.Interop.rc SQLite.NET.2005.MSBuild.sln SQLite.NET.2005.sln SQLite.NET.2008.MSBuild.sln SQLite.NET.2008.sln SQLite.NET.2010.MSBuild.sln SQLite.NET.2010.sln |
︙ | ︙ |
Changes to System.Data.SQLite/Configurations/System.Data.SQLite.dll.config.
︙ | ︙ | |||
83 84 85 86 87 88 89 90 91 92 93 94 95 96 | useful in ASP.NET and other hosted environments where direct control of the location of the managed assemblies is not under the control of the application. --> <!-- <add key="PreLoadSQLite_BaseDirectory" value="" /> --> <!-- NOTE: If this configuration variable is set [to anything], it will be used instead of the processor architecture value contained in the PROCESSOR_ARCHITECTURE environment variable to help build the path of the native library to pre-load. --> | > > > > > > > > > > | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | useful in ASP.NET and other hosted environments where direct control of the location of the managed assemblies is not under the control of the application. --> <!-- <add key="PreLoadSQLite_BaseDirectory" value="" /> --> <!-- NOTE: If this configuration variable is set [to anything], it will be used as the base file name (without directory information) for the native SQLite library to be pre-loaded (e.g. "sqlite3.dll" or "libsqlite3.so.0"). --> <!-- <add key="PreLoadSQLite_LibraryFileNameOnly" value="" /> --> <!-- NOTE: If this configuration variable is set [to anything], it will be used instead of the processor architecture value contained in the PROCESSOR_ARCHITECTURE environment variable to help build the path of the native library to pre-load. --> |
︙ | ︙ |
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
︙ | ︙ | |||
56 57 58 59 60 61 62 | string version = #if NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 "4.0.0.0"; #else "3.5.0.0"; #endif | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | string version = #if NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 "4.0.0.0"; #else "3.5.0.0"; #endif _dbProviderServicesType = Type.GetType(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false); } /// <summary> /// Will provide a <see cref="IServiceProvider" /> object in .NET 3.5. /// </summary> /// <param name="serviceType">The class or interface type to query for.</param> /// <returns></returns> |
︙ | ︙ | |||
86 87 88 89 90 91 92 | string typeName = UnsafeNativeMethods.GetSettingValue( "TypeName_SQLiteProviderServices", null); Version version = this.GetType().Assembly.GetName().Version; if (typeName != null) { | | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | string typeName = UnsafeNativeMethods.GetSettingValue( "TypeName_SQLiteProviderServices", null); Version version = this.GetType().Assembly.GetName().Version; if (typeName != null) { typeName = HelperMethods.StringFormat( CultureInfo.InvariantCulture, typeName, version); } else { typeName = HelperMethods.StringFormat( CultureInfo.InvariantCulture, DefaultTypeName, version); } Type type = Type.GetType(typeName, false); if (type != null) { |
︙ | ︙ |
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /// <summary> /// The user-defined functions registered on this connection /// </summary> protected Dictionary<SQLiteFunctionAttribute, SQLiteFunction> _functions; #if INTEROP_VIRTUAL_TABLE /// <summary> /// The modules created using this connection. /// </summary> protected Dictionary<string, SQLiteModule> _modules; #endif /////////////////////////////////////////////////////////////////////////////////////////////// | > > > > > > > > > > > > > > > > > > > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | /// <summary> /// The user-defined functions registered on this connection /// </summary> protected Dictionary<SQLiteFunctionAttribute, SQLiteFunction> _functions; #if INTEROP_VIRTUAL_TABLE /// <summary> /// This is the name of the native library file that contains the /// "vtshim" extension [wrapper]. /// </summary> protected string _shimExtensionFileName = null; /// <summary> /// This is the flag indicate whether the native library file that /// contains the "vtshim" extension must be dynamically loaded by /// this class prior to use. /// </summary> protected bool? _shimIsLoadNeeded = null; /// <summary> /// This is the name of the native entry point for the "vtshim" /// extension [wrapper]. /// </summary> protected string _shimExtensionProcName = "sqlite3_vtshim_init"; /// <summary> /// The modules created using this connection. /// </summary> protected Dictionary<string, SQLiteModule> _modules; #endif /////////////////////////////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
244 245 246 247 248 249 250 | if (SQLiteBase.ResetConnection(_sql, _sql, canThrow)) { if (unbindFunctions) { if (SQLiteFunction.UnbindAllFunctions(this, _flags, false)) { #if !NET_COMPACT_20 && TRACE_CONNECTION | | | | | | | | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 | if (SQLiteBase.ResetConnection(_sql, _sql, canThrow)) { if (unbindFunctions) { if (SQLiteFunction.UnbindAllFunctions(this, _flags, false)) { #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "UnbindFunctions (Pool) Success: {0}", HandleToString())); #endif } else { #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "UnbindFunctions (Pool) Failure: {0}", HandleToString())); #endif } } #if INTEROP_VIRTUAL_TABLE DisposeModules(); #endif SQLiteConnectionPool.Add(_fileName, _sql, _poolVersion); SQLiteConnection.OnChanged(null, new ConnectionEventArgs( SQLiteConnectionEventType.ClosedToPool, null, null, null, null, _sql, _fileName, new object[] { typeof(SQLite3), canThrow, _fileName, _poolVersion })); #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Close (Pool) Success: {0}", HandleToString())); #endif } #if !NET_COMPACT_20 && TRACE_CONNECTION else { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Close (Pool) Failure: {0}", HandleToString())); } #endif } else { if (unbindFunctions) { if (SQLiteFunction.UnbindAllFunctions(this, _flags, false)) { #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "UnbindFunctions Success: {0}", HandleToString())); #endif } else { #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "UnbindFunctions Failure: {0}", HandleToString())); #endif } } |
︙ | ︙ | |||
905 906 907 908 909 910 911 | SQLiteConnection.OnChanged(null, new ConnectionEventArgs( SQLiteConnectionEventType.OpenedFromPool, null, null, null, null, _sql, strFilename, new object[] { typeof(SQLite3), strFilename, vfsName, connectionFlags, openFlags, maxPoolSize, usePool, _poolVersion })); #if !NET_COMPACT_20 && TRACE_CONNECTION | | | 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 | SQLiteConnection.OnChanged(null, new ConnectionEventArgs( SQLiteConnectionEventType.OpenedFromPool, null, null, null, null, _sql, strFilename, new object[] { typeof(SQLite3), strFilename, vfsName, connectionFlags, openFlags, maxPoolSize, usePool, _poolVersion })); #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Open (Pool): {0}", HandleToString())); #endif } if (_sql == null) { |
︙ | ︙ | |||
936 937 938 939 940 941 942 | else #endif { n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), ref db, openFlags, ToUTF8(vfsName)); } #if !NET_COMPACT_20 && TRACE_CONNECTION | | | 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 | else #endif { n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), ref db, openFlags, ToUTF8(vfsName)); } #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Open: {0}", db)); #endif if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null); _sql = new SQLiteConnectionHandle(db, true); } |
︙ | ︙ | |||
1262 1263 1264 1265 1266 1267 1268 | // data classes. // string baseSchemaName = (cnn != null) ? cnn._baseSchemaName : null; if (!String.IsNullOrEmpty(baseSchemaName)) { strSql = strSql.Replace( | | | | | 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 | // data classes. // string baseSchemaName = (cnn != null) ? cnn._baseSchemaName : null; if (!String.IsNullOrEmpty(baseSchemaName)) { strSql = strSql.Replace( HelperMethods.StringFormat(CultureInfo.InvariantCulture, "[{0}].", baseSchemaName), String.Empty); strSql = strSql.Replace( HelperMethods.StringFormat(CultureInfo.InvariantCulture, "{0}.", baseSchemaName), String.Empty); } } SQLiteConnectionFlags flags = (cnn != null) ? cnn.Flags : SQLiteConnectionFlags.Default; if ( #if !PLATFORM_COMPACTFRAMEWORK ForceLogPrepare() || #endif ((flags & SQLiteConnectionFlags.LogPrepare) == SQLiteConnectionFlags.LogPrepare)) { if ((strSql == null) || (strSql.Length == 0) || (strSql.Trim().Length == 0)) SQLiteLog.LogMessage("Preparing {<nothing>}..."); else SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Preparing {{{0}}}...", strSql)); } IntPtr stmt = IntPtr.Zero; IntPtr ptr = IntPtr.Zero; int len = 0; SQLiteErrorCode n = SQLiteErrorCode.Schema; |
︙ | ︙ | |||
1330 1331 1332 1333 1334 1335 1336 | #else n = UnsafeNativeMethods.sqlite3_prepare(_sql, psql, b.Length - 1, ref stmt, ref ptr); #endif len = -1; #endif #if !NET_COMPACT_20 && TRACE_STATEMENT | | | 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 | #else n = UnsafeNativeMethods.sqlite3_prepare(_sql, psql, b.Length - 1, ref stmt, ref ptr); #endif len = -1; #endif #if !NET_COMPACT_20 && TRACE_STATEMENT Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Prepare ({0}): {1}", n, stmt)); #endif if ((n == SQLiteErrorCode.Ok) && (stmt != IntPtr.Zero)) { if (statementHandle != null) statementHandle.Dispose(); |
︙ | ︙ | |||
1466 1467 1468 1469 1470 1471 1472 | } } protected static void LogBind(SQLiteStatementHandle handle, int index) { IntPtr handleIntPtr = handle; | | | | 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 | } } protected static void LogBind(SQLiteStatementHandle handle, int index) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} as NULL...", handleIntPtr, index)); } protected static void LogBind(SQLiteStatementHandle handle, int index, ValueType value) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...", handleIntPtr, index, value.GetType(), value)); } private static string FormatDateTime(DateTime value) { |
︙ | ︙ | |||
1499 1500 1501 1502 1503 1504 1505 | return result.ToString(); } protected static void LogBind(SQLiteStatementHandle handle, int index, DateTime value) { IntPtr handleIntPtr = handle; | | | | 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 | return result.ToString(); } protected static void LogBind(SQLiteStatementHandle handle, int index, DateTime value) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...", handleIntPtr, index, typeof(DateTime), FormatDateTime(value))); } protected static void LogBind(SQLiteStatementHandle handle, int index, string value) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...", handleIntPtr, index, typeof(String), (value != null) ? value : "<null>")); } private static string ToHexadecimalString( byte[] array |
︙ | ︙ | |||
1536 1537 1538 1539 1540 1541 1542 | return result.ToString(); } protected static void LogBind(SQLiteStatementHandle handle, int index, byte[] value) { IntPtr handleIntPtr = handle; | | | 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 | return result.ToString(); } protected static void LogBind(SQLiteStatementHandle handle, int index, byte[] value) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} as type {2} with value {{{3}}}...", handleIntPtr, index, typeof(Byte[]), (value != null) ? ToHexadecimalString(value) : "<null>")); } internal override void Bind_Double(SQLiteStatement stmt, SQLiteConnectionFlags flags, int index, double value) { |
︙ | ︙ | |||
1817 1818 1819 1820 1821 1822 1823 | SQLiteStatementHandle handle = stmt._sqlite_stmt; int value = UnsafeNativeMethods.sqlite3_bind_parameter_count(handle); if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind) { IntPtr handleIntPtr = handle; | | | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 | SQLiteStatementHandle handle = stmt._sqlite_stmt; int value = UnsafeNativeMethods.sqlite3_bind_parameter_count(handle); if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter count is {1}.", handleIntPtr, value)); } return value; } |
︙ | ︙ | |||
1842 1843 1844 1845 1846 1847 1848 | name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name(handle, index), -1); #endif if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind) { IntPtr handleIntPtr = handle; | | | | 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 | name = UTF8ToString(UnsafeNativeMethods.sqlite3_bind_parameter_name(handle, index), -1); #endif if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter #{1} name is {{{2}}}.", handleIntPtr, index, name)); } return name; } internal override int Bind_ParamIndex(SQLiteStatement stmt, SQLiteConnectionFlags flags, string paramName) { SQLiteStatementHandle handle = stmt._sqlite_stmt; int index = UnsafeNativeMethods.sqlite3_bind_parameter_index(handle, ToUTF8(paramName)); if ((flags & SQLiteConnectionFlags.LogBind) == SQLiteConnectionFlags.LogBind) { IntPtr handleIntPtr = handle; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Statement {0} paramter index of name {{{1}}} is #{2}.", handleIntPtr, paramName, index)); } return index; } |
︙ | ︙ | |||
1898 1899 1900 1901 1902 1903 1904 | internal override TypeAffinity ColumnAffinity(SQLiteStatement stmt, int index) { return UnsafeNativeMethods.sqlite3_column_type(stmt._sqlite_stmt, index); } internal override string ColumnType(SQLiteStatement stmt, int index, ref TypeAffinity nAffinity) { | | | | | | | > > | | > > > | > | | < < < < < < < < | < < < < | 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 | internal override TypeAffinity ColumnAffinity(SQLiteStatement stmt, int index) { return UnsafeNativeMethods.sqlite3_column_type(stmt._sqlite_stmt, index); } internal override string ColumnType(SQLiteStatement stmt, int index, ref TypeAffinity nAffinity) { int len; #if !SQLITE_STANDARD len = 0; IntPtr p = UnsafeNativeMethods.sqlite3_column_decltype_interop(stmt._sqlite_stmt, index, ref len); #else len = -1; IntPtr p = UnsafeNativeMethods.sqlite3_column_decltype(stmt._sqlite_stmt, index); #endif nAffinity = ColumnAffinity(stmt, index); if ((p != IntPtr.Zero) && ((len > 0) || (len == -1))) { string declType = UTF8ToString(p, len); if (!String.IsNullOrEmpty(declType)) return declType; } string[] ar = stmt.TypeDefinitions; if (ar != null) { if (index < ar.Length && ar[index] != null) return ar[index]; } return String.Empty; } internal override int ColumnIndex(SQLiteStatement stmt, string columnName) { int x = ColumnCount(stmt); for (int n = 0; n < x; n++) |
︙ | ︙ | |||
2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 | internal override void ReturnText(IntPtr context, string value) { byte[] b = ToUTF8(value); UnsafeNativeMethods.sqlite3_result_text(context, ToUTF8(value), b.Length - 1, (IntPtr)(-1)); } #if INTEROP_VIRTUAL_TABLE /// <summary> /// Calls the native SQLite core library in order to create a disposable /// module containing the implementation of a virtual table. /// </summary> /// <param name="module"> /// The module object to be used when creating the native disposable module. /// </param> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 | internal override void ReturnText(IntPtr context, string value) { byte[] b = ToUTF8(value); UnsafeNativeMethods.sqlite3_result_text(context, ToUTF8(value), b.Length - 1, (IntPtr)(-1)); } #if INTEROP_VIRTUAL_TABLE /// <summary> /// Determines the file name of the native library containing the native /// "vtshim" extension -AND- whether it should be dynamically loaded by /// this class. /// </summary> /// <param name="isLoadNeeded"> /// This output parameter will be set to non-zero if the returned native /// library file name should be dynamically loaded prior to attempting /// the creation of native disposable extension modules. /// </param> /// <returns> /// The file name of the native library containing the native "vtshim" /// extension -OR- null if it cannot be determined. /// </returns> private string GetShimExtensionFileName( ref bool isLoadNeeded /* out */ ) { if (_shimIsLoadNeeded != null) isLoadNeeded = (bool)_shimIsLoadNeeded; else isLoadNeeded = HelperMethods.IsWindows(); /* COMPAT */ string fileName = _shimExtensionFileName; if (fileName != null) return fileName; #if (SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK) && PRELOAD_NATIVE_LIBRARY return UnsafeNativeMethods.GetNativeLibraryFileNameOnly(); /* COMPAT */ #else return null; #endif } /// <summary> /// Calls the native SQLite core library in order to create a disposable /// module containing the implementation of a virtual table. /// </summary> /// <param name="module"> /// The module object to be used when creating the native disposable module. /// </param> |
︙ | ︙ | |||
2443 2444 2445 2446 2447 2448 2449 | module.LogErrors = ((flags & SQLiteConnectionFlags.LogModuleError) == SQLiteConnectionFlags.LogModuleError); module.LogExceptions = ((flags & SQLiteConnectionFlags.LogModuleException) == SQLiteConnectionFlags.LogModuleException); } if (_sql == null) throw new SQLiteException("connection has an invalid handle"); | > > > > > > > > > > > | | > | | 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 | module.LogErrors = ((flags & SQLiteConnectionFlags.LogModuleError) == SQLiteConnectionFlags.LogModuleError); module.LogExceptions = ((flags & SQLiteConnectionFlags.LogModuleException) == SQLiteConnectionFlags.LogModuleException); } if (_sql == null) throw new SQLiteException("connection has an invalid handle"); bool isLoadNeeded = false; string fileName = GetShimExtensionFileName(ref isLoadNeeded); if (isLoadNeeded) { if (fileName == null) throw new SQLiteException("the file name for the \"vtshim\" extension is unknown"); if (_shimExtensionProcName == null) throw new SQLiteException("the entry point for the \"vtshim\" extension is unknown"); SetLoadExtension(true); LoadExtension(fileName, _shimExtensionProcName); } if (module.CreateDisposableModule(_sql)) { if (_modules == null) _modules = new Dictionary<string, SQLiteModule>(); _modules.Add(module.Name, module); if (_usePool) { _usePool = false; #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "CreateModule (Pool) Disabled: {0}", HandleToString())); #endif } } else |
︙ | ︙ | |||
2711 2712 2713 2714 2715 2716 2717 | if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); if (_usePool) { _usePool = false; #if !NET_COMPACT_20 && TRACE_CONNECTION | | | | 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 | if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); if (_usePool) { _usePool = false; #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "SetPassword (Pool) Disabled: {0}", HandleToString())); #endif } } internal override void ChangePassword(byte[] newPasswordBytes) { SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_rekey(_sql, newPasswordBytes, (newPasswordBytes == null) ? 0 : newPasswordBytes.Length); if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, GetLastError()); if (_usePool) { _usePool = false; #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "ChangePassword (Pool) Disabled: {0}", HandleToString())); #endif } } #endif |
︙ | ︙ |
Changes to System.Data.SQLite/SQLite3_UTF16.cs.
︙ | ︙ | |||
159 160 161 162 163 164 165 | SQLiteConnectionEventType.OpenedFromPool, null, null, null, null, _sql, strFilename, new object[] { typeof(SQLite3_UTF16), strFilename, vfsName, connectionFlags, openFlags, maxPoolSize, usePool, _poolVersion })); #if !NET_COMPACT_20 && TRACE_CONNECTION | | | 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | SQLiteConnectionEventType.OpenedFromPool, null, null, null, null, _sql, strFilename, new object[] { typeof(SQLite3_UTF16), strFilename, vfsName, connectionFlags, openFlags, maxPoolSize, usePool, _poolVersion })); #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Open16 (Pool): {0}", HandleToString())); #endif } if (_sql == null) |
︙ | ︙ | |||
198 199 200 201 202 203 204 | // a flags parameter. // if (((openFlags & SQLiteOpenFlagsEnum.Create) != SQLiteOpenFlagsEnum.Create) && !File.Exists(strFilename)) throw new SQLiteException(SQLiteErrorCode.CantOpen, strFilename); if (vfsName != null) { | | | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | // a flags parameter. // if (((openFlags & SQLiteOpenFlagsEnum.Create) != SQLiteOpenFlagsEnum.Create) && !File.Exists(strFilename)) throw new SQLiteException(SQLiteErrorCode.CantOpen, strFilename); if (vfsName != null) { throw new SQLiteException(SQLiteErrorCode.CantOpen, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "cannot open using UTF-16 and VFS \"{0}\": need interop assembly", vfsName)); } n = UnsafeNativeMethods.sqlite3_open16(strFilename, ref db); } #if !NET_COMPACT_20 && TRACE_CONNECTION Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Open16: {0}", db)); #endif if (n != SQLiteErrorCode.Ok) throw new SQLiteException(n, null); _sql = new SQLiteConnectionHandle(db, true); } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteCommandBuilder.cs.
︙ | ︙ | |||
104 105 106 107 108 109 110 | /// <summary> /// Returns a valid named parameter /// </summary> /// <param name="parameterName">The name of the parameter</param> /// <returns>Error</returns> protected override string GetParameterName(string parameterName) { | | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 | /// <summary> /// Returns a valid named parameter /// </summary> /// <param name="parameterName">The name of the parameter</param> /// <returns>Error</returns> protected override string GetParameterName(string parameterName) { return HelperMethods.StringFormat(CultureInfo.InvariantCulture, "@{0}", parameterName); } /// <summary> /// Returns a named parameter for the given ordinal /// </summary> /// <param name="parameterOrdinal">The i of the parameter</param> /// <returns>Error</returns> protected override string GetParameterName(int parameterOrdinal) { return HelperMethods.StringFormat(CultureInfo.InvariantCulture, "@param{0}", parameterOrdinal); } /// <summary> /// Returns a placeholder character for the specified parameter i. /// </summary> /// <param name="parameterOrdinal">The index of the parameter to provide a placeholder for</param> /// <returns>Returns a named parameter</returns> |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙ | ︙ | |||
934 935 936 937 938 939 940 | { string str = row[0].ToString(); if (String.Compare(str, "main", StringComparison.OrdinalIgnoreCase) != 0 && String.Compare(str, "temp", StringComparison.OrdinalIgnoreCase) != 0) { using (SQLiteCommand cmd = CreateCommand()) { | | | 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | { string str = row[0].ToString(); if (String.Compare(str, "main", StringComparison.OrdinalIgnoreCase) != 0 && String.Compare(str, "temp", StringComparison.OrdinalIgnoreCase) != 0) { using (SQLiteCommand cmd = CreateCommand()) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "ATTACH DATABASE '{0}' AS [{1}]", row[1], row[0]); cmd.ExecuteNonQuery(); } } } } } } |
︙ | ︙ | |||
1167 1168 1169 1170 1171 1172 1173 | break; } } catch (Exception e) { if ((_flags & SQLiteConnectionFlags.LogBackup) == SQLiteConnectionFlags.LogBackup) { | | | 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 | break; } } catch (Exception e) { if ((_flags & SQLiteConnectionFlags.LogBackup) == SQLiteConnectionFlags.LogBackup) { SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Caught exception while backing up database: {0}", e)); } throw; } finally |
︙ | ︙ | |||
1646 1647 1648 1649 1650 1651 1652 | protected override void Dispose(bool disposing) { #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (_noDispose) { | | | 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 | protected override void Dispose(bool disposing) { #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (_noDispose) { System.Diagnostics.Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "WARNING: Disposing of connection \"{0}\" with the no-dispose flag set.", _connectionString)); } } #endif |
︙ | ︙ | |||
2108 2109 2110 2111 2112 2113 2114 | if (UnsafeNativeMethods.GetSettingValue("No_SQLiteConnectionNewParser", null) != null) arParts = SQLiteConvert.Split(s, ';'); else arParts = SQLiteConvert.NewSplit(s, ';', true, ref error); if (arParts == null) { | | | 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 | if (UnsafeNativeMethods.GetSettingValue("No_SQLiteConnectionNewParser", null) != null) arParts = SQLiteConvert.Split(s, ';'); else arParts = SQLiteConvert.NewSplit(s, ';', true, ref error); if (arParts == null) { throw new ArgumentException(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Invalid ConnectionString format, cannot parse: {0}", (error != null) ? error : "could not split connection string into properties")); } int x = (arParts != null) ? arParts.Length : 0; // For each semi-colon piece, split into key and value pairs by the presence of the = sign |
︙ | ︙ | |||
2133 2134 2135 2136 2137 2138 2139 | int indexOf = arParts[n].IndexOf('='); if (indexOf != -1) ls.Add(UnwrapString(arParts[n].Substring(0, indexOf).Trim()), UnwrapString(arParts[n].Substring(indexOf + 1).Trim())); else if (allowNameOnly) ls.Add(UnwrapString(arParts[n].Trim()), String.Empty); else | | | 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 | int indexOf = arParts[n].IndexOf('='); if (indexOf != -1) ls.Add(UnwrapString(arParts[n].Substring(0, indexOf).Trim()), UnwrapString(arParts[n].Substring(indexOf + 1).Trim())); else if (allowNameOnly) ls.Add(UnwrapString(arParts[n].Trim()), String.Empty); else throw new ArgumentException(HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Invalid ConnectionString format for part \"{0}\", no equal sign found", arParts[n])); } return ls; } /// <summary> /// Parses a connection string using the built-in (i.e. framework provided) /// connection string parser class and returns the key/value pairs. An |
︙ | ︙ | |||
2333 2334 2335 2336 2337 2338 2339 | public void EnableExtensions( bool enable ) { CheckDisposed(); if (_sql == null) | | | 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 | public void EnableExtensions( bool enable ) { CheckDisposed(); if (_sql == null) throw new InvalidOperationException(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Database connection not valid for {0} extensions.", enable ? "enabling" : "disabling")); if ((_flags & SQLiteConnectionFlags.NoLoadExtension) == SQLiteConnectionFlags.NoLoadExtension) throw new SQLiteException("Loading extensions is disabled for this database connection."); |
︙ | ︙ | |||
2456 2457 2458 2459 2460 2461 2462 | StringBuilder result = new StringBuilder(); int length = array.Length; for (int index = 0; index < length; index++) #if NET_COMPACT_20 | | | 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 | StringBuilder result = new StringBuilder(); int length = array.Length; for (int index = 0; index < length; index++) #if NET_COMPACT_20 result.Append(HelperMethods.StringFormat( CultureInfo.InvariantCulture, "{0:x2}", array[index])); #else result.AppendFormat("{0:x2}", array[index]); #endif return result.ToString(); |
︙ | ︙ | |||
2508 2509 2510 2511 2512 2513 2514 | for (int index = 0; index < text.Length; index += 2) { string value = text.Substring(index, 2); if (!TryParseByte(value, NumberStyles.HexNumber, out result[index / 2])) { | | | 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 | for (int index = 0; index < text.Length; index += 2) { string value = text.Substring(index, 2); if (!TryParseByte(value, NumberStyles.HexNumber, out result[index / 2])) { error = HelperMethods.StringFormat( CultureInfo.CurrentCulture, "string contains \"{0}\", which cannot be converted to a byte value", value); return null; } } |
︙ | ︙ | |||
2664 2665 2666 2667 2668 2669 2670 | #if !NET_COMPACT_20 && TRACE_WARNING bool uri = false; #endif bool fullUri = false; string fileName; if (Convert.ToInt32(FindKey(opts, "Version", DefaultVersion.ToString()), CultureInfo.InvariantCulture) != DefaultVersion) | | | 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 | #if !NET_COMPACT_20 && TRACE_WARNING bool uri = false; #endif bool fullUri = false; string fileName; if (Convert.ToInt32(FindKey(opts, "Version", DefaultVersion.ToString()), CultureInfo.InvariantCulture) != DefaultVersion) throw new NotSupportedException(HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Only SQLite Version {0} is supported at this time", DefaultVersion)); #if INTEROP_INCLUDE_ZIPVFS bool useZipVfs = false; string zipVfsVersion = FindKey(opts, "ZipVfsVersion", DefaultZipVfsVersion); if (zipVfsVersion != null) { |
︙ | ︙ | |||
2688 2689 2690 2691 2692 2693 2694 | else if (String.Compare(zipVfsVersion, ZipVfs_V3) == 0) { UnsafeNativeMethods.zipvfsInit_v3(0); useZipVfs = true; } else { | | | | 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 | else if (String.Compare(zipVfsVersion, ZipVfs_V3) == 0) { UnsafeNativeMethods.zipvfsInit_v3(0); useZipVfs = true; } else { throw new NotSupportedException(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Only ZipVFS versions {0}, {1}, and {2} are supported at this time", ZipVfs_Automatic, ZipVfs_V2, ZipVfs_V3)); } } #endif fileName = FindKey(opts, "Data Source", DefaultDataSource); if (String.IsNullOrEmpty(fileName)) { fileName = FindKey(opts, "Uri", DefaultUri); if (String.IsNullOrEmpty(fileName)) { fileName = FindKey(opts, "FullUri", DefaultFullUri); if (String.IsNullOrEmpty(fileName)) throw new ArgumentException(HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Data Source cannot be empty. Use {0} to open an in-memory database", MemoryFileName)); else fullUri = true; } else { fileName = MapUriPath(fileName); #if !NET_COMPACT_20 && TRACE_WARNING |
︙ | ︙ | |||
2726 2727 2728 2729 2730 2731 2732 | #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (!uri && !fullUri && !isMemory && !String.IsNullOrEmpty(fileName) && fileName.StartsWith("\\", StringComparison.OrdinalIgnoreCase) && !fileName.StartsWith("\\\\", StringComparison.OrdinalIgnoreCase)) { | | | 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 | #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (!uri && !fullUri && !isMemory && !String.IsNullOrEmpty(fileName) && fileName.StartsWith("\\", StringComparison.OrdinalIgnoreCase) && !fileName.StartsWith("\\\\", StringComparison.OrdinalIgnoreCase)) { System.Diagnostics.Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "WARNING: Detected a possibly malformed UNC database file name \"{0}\" that " + "may have originally started with two backslashes; however, four leading " + "backslashes may be required, e.g.: \"Data Source=\\\\\\{0};\"", fileName)); } } |
︙ | ︙ | |||
2808 2809 2810 2811 2812 2813 2814 | if (hexPassword != null) { string error = null; byte[] hexPasswordBytes = FromHexString(hexPassword, ref error); if (hexPasswordBytes == null) { | | | 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 | if (hexPassword != null) { string error = null; byte[] hexPasswordBytes = FromHexString(hexPassword, ref error); if (hexPasswordBytes == null) { throw new FormatException(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Cannot parse 'HexPassword' property value into byte values: {0}", error)); } _sql.SetPassword(hexPasswordBytes); } |
︙ | ︙ | |||
2852 2853 2854 2855 2856 2857 2858 | if (boolValue) { using (SQLiteCommand cmd = CreateCommand()) { if (_busyTimeout != DefaultBusyTimeout) { | | | | | | | | | | | 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 | if (boolValue) { using (SQLiteCommand cmd = CreateCommand()) { if (_busyTimeout != DefaultBusyTimeout) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA busy_timeout={0}", _busyTimeout); cmd.ExecuteNonQuery(); } int intValue; if (!fullUri && !isMemory) { strValue = FindKey(opts, "Page Size", DefaultPageSize.ToString()); intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture); if (intValue != DefaultPageSize) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA page_size={0}", intValue); cmd.ExecuteNonQuery(); } } strValue = FindKey(opts, "Max Page Count", DefaultMaxPageCount.ToString()); intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture); if (intValue != DefaultMaxPageCount) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA max_page_count={0}", intValue); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Legacy Format", DefaultLegacyFormat.ToString()); boolValue = SQLiteConvert.ToBoolean(strValue); if (boolValue != DefaultLegacyFormat) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA legacy_file_format={0}", boolValue ? "ON" : "OFF"); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Synchronous", DefaultSynchronous.ToString()); enumValue = TryParseEnum(typeof(SQLiteSynchronousEnum), strValue, true); if (!(enumValue is SQLiteSynchronousEnum) || ((SQLiteSynchronousEnum)enumValue != DefaultSynchronous)) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA synchronous={0}", strValue); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Cache Size", DefaultCacheSize.ToString()); intValue = Convert.ToInt32(strValue, CultureInfo.InvariantCulture); if (intValue != DefaultCacheSize) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA cache_size={0}", intValue); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Journal Mode", DefaultJournalMode.ToString()); enumValue = TryParseEnum(typeof(SQLiteJournalModeEnum), strValue, true); if (!(enumValue is SQLiteJournalModeEnum) || ((SQLiteJournalModeEnum)enumValue != DefaultJournalMode)) { string pragmaStr = "PRAGMA journal_mode={0}"; #if INTEROP_INCLUDE_ZIPVFS if (useZipVfs) pragmaStr = "PRAGMA zipvfs_journal_mode={0}"; #endif cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, pragmaStr, strValue); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Foreign Keys", DefaultForeignKeys.ToString()); boolValue = SQLiteConvert.ToBoolean(strValue); if (boolValue != DefaultForeignKeys) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA foreign_keys={0}", boolValue ? "ON" : "OFF"); cmd.ExecuteNonQuery(); } strValue = FindKey(opts, "Recursive Triggers", DefaultRecursiveTriggers.ToString()); boolValue = SQLiteConvert.ToBoolean(strValue); if (boolValue != DefaultRecursiveTriggers) { cmd.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA recursive_triggers={0}", boolValue ? "ON" : "OFF"); cmd.ExecuteNonQuery(); } } } if (_progressHandler != null) _sql.SetProgressHook(_progressOps, _progressCallback); |
︙ | ︙ | |||
3465 3466 3467 3468 3469 3470 3471 | { if (sourceId == null) sourceId = "0000000000000000000000000000000000000000"; if (sourceTimeStamp == null) sourceTimeStamp = "0000-00-00 00:00:00 UTC"; | | | 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 | { if (sourceId == null) sourceId = "0000000000000000000000000000000000000000"; if (sourceTimeStamp == null) sourceTimeStamp = "0000-00-00 00:00:00 UTC"; return HelperMethods.StringFormat( CultureInfo.InvariantCulture, "{0} {1}", sourceId, sourceTimeStamp); } else { return null; } |
︙ | ︙ | |||
3541 3542 3543 3544 3545 3546 3547 | throw new InvalidOperationException("Database connection not valid for shutdown."); _sql.Close(true); /* NOTE: MUST be closed before shutdown. */ SQLiteErrorCode rc = _sql.Shutdown(); #if !NET_COMPACT_20 && TRACE_CONNECTION if (rc != SQLiteErrorCode.Ok) | | | 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 | throw new InvalidOperationException("Database connection not valid for shutdown."); _sql.Close(true); /* NOTE: MUST be closed before shutdown. */ SQLiteErrorCode rc = _sql.Shutdown(); #if !NET_COMPACT_20 && TRACE_CONNECTION if (rc != SQLiteErrorCode.Ok) System.Diagnostics.Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Shutdown (Instance) Failed: {0}", rc)); #endif return rc; } |
︙ | ︙ | |||
3571 3572 3573 3574 3575 3576 3577 | ) { SQLiteErrorCode rc = SQLite3.StaticShutdown(directories); if (rc != SQLiteErrorCode.Ok) { #if !NET_COMPACT_20 && TRACE_CONNECTION | | | 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 | ) { SQLiteErrorCode rc = SQLite3.StaticShutdown(directories); if (rc != SQLiteErrorCode.Ok) { #if !NET_COMPACT_20 && TRACE_CONNECTION System.Diagnostics.Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Shutdown (Static) Failed: {0}", rc)); #endif if (!noThrow) throw new SQLiteException(rc, null); } |
︙ | ︙ | |||
4171 4172 4173 4174 4175 4176 4177 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; | | | | 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; using (SQLiteCommand cmdTables = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table' OR [type] LIKE 'view'", strCatalog, master), this)) using (SQLiteDataReader rdTables = cmdTables.ExecuteReader()) { while (rdTables.Read()) { if (String.IsNullOrEmpty(strTable) || String.Compare(strTable, rdTables.GetString(2), StringComparison.OrdinalIgnoreCase) == 0) { try { using (SQLiteCommand cmd = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdTables.GetString(2)), this)) using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader(CommandBehavior.SchemaOnly)) using (DataTable tblSchema = rd.GetSchemaTable(true, true)) { foreach (DataRow schemaRow in tblSchema.Rows) { if (String.Compare(schemaRow[SchemaTableColumn.ColumnName].ToString(), strColumn, StringComparison.OrdinalIgnoreCase) == 0 || strColumn == null) |
︙ | ︙ | |||
4274 4275 4276 4277 4278 4279 4280 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; | | | | 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; using (SQLiteCommand cmdTables = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this)) using (SQLiteDataReader rdTables = cmdTables.ExecuteReader()) { while (rdTables.Read()) { maybeRowId = false; primaryKeys.Clear(); if (String.IsNullOrEmpty(strTable) || String.Compare(rdTables.GetString(2), strTable, StringComparison.OrdinalIgnoreCase) == 0) { // First, look for any rowid indexes -- which sqlite defines are INTEGER PRIMARY KEY columns. // Such indexes are not listed in the indexes list but count as indexes just the same. try { using (SQLiteCommand cmdTable = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this)) using (SQLiteDataReader rdTable = cmdTable.ExecuteReader()) { while (rdTable.Read()) { if (rdTable.GetInt32(5) != 0) { primaryKeys.Add(rdTable.GetInt32(0)); |
︙ | ︙ | |||
4314 4315 4316 4317 4318 4319 4320 | { row = tbl.NewRow(); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rdTables.GetString(2); row["INDEX_CATALOG"] = strCatalog; row["PRIMARY_KEY"] = true; | | | | | | 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 | { row = tbl.NewRow(); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rdTables.GetString(2); row["INDEX_CATALOG"] = strCatalog; row["PRIMARY_KEY"] = true; row["INDEX_NAME"] = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master); row["UNIQUE"] = true; if (String.Compare((string)row["INDEX_NAME"], strIndex, StringComparison.OrdinalIgnoreCase) == 0 || strIndex == null) { tbl.Rows.Add(row); } primaryKeys.Clear(); } // Now fetch all the rest of the indexes. try { using (SQLiteCommand cmd = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_list([{1}])", strCatalog, rdTables.GetString(2)), this)) using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (String.Compare(rd.GetString(1), strIndex, StringComparison.OrdinalIgnoreCase) == 0 || strIndex == null) { row = tbl.NewRow(); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rdTables.GetString(2); row["INDEX_CATALOG"] = strCatalog; row["INDEX_NAME"] = rd.GetString(1); row["UNIQUE"] = SQLiteConvert.ToBoolean(rd.GetValue(2), CultureInfo.InvariantCulture, false); row["PRIMARY_KEY"] = false; // get the index definition using (SQLiteCommand cmdIndexes = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [name] LIKE '{1}'", strCatalog, rd.GetString(1).Replace("'", "''"), master), this)) using (SQLiteDataReader rdIndexes = cmdIndexes.ExecuteReader()) { while (rdIndexes.Read()) { if (rdIndexes.IsDBNull(4) == false) row["INDEX_DEFINITION"] = rdIndexes.GetString(4); break; } } // Now for the really hard work. Figure out which index is the primary key index. // The only way to figure it out is to check if the index was an autoindex and if we have a non-rowid // primary key, and all the columns in the given index match the primary key columns if (primaryKeys.Count > 0 && rd.GetString(1).StartsWith("sqlite_autoindex_" + rdTables.GetString(2), StringComparison.InvariantCultureIgnoreCase) == true) { using (SQLiteCommand cmdDetails = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rd.GetString(1)), this)) using (SQLiteDataReader rdDetails = cmdDetails.ExecuteReader()) { int nMatches = 0; while (rdDetails.Read()) { if (primaryKeys.Contains(rdDetails.GetInt32(1)) == false) { |
︙ | ︙ | |||
4420 4421 4422 4423 4424 4425 4426 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(table)) table = null; if (String.IsNullOrEmpty(catalog)) catalog = "main"; string master = (String.Compare(catalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; | | | 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(table)) table = null; if (String.IsNullOrEmpty(catalog)) catalog = "main"; string master = (String.Compare(catalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; using (SQLiteCommand cmd = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'trigger'", catalog, master), this)) using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (String.Compare(rd.GetString(1), triggerName, StringComparison.OrdinalIgnoreCase) == 0 || triggerName == null) { |
︙ | ︙ | |||
4475 4476 4477 4478 4479 4480 4481 | tbl.Columns.Add("TABLE_DEFINITION", typeof(string)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; | | | 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 | tbl.Columns.Add("TABLE_DEFINITION", typeof(string)); tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; using (SQLiteCommand cmd = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT [type], [name], [tbl_name], [rootpage], [sql], [rowid] FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this)) using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { strItem = rd.GetString(0); if (String.Compare(rd.GetString(2), 0, "SQLITE_", 0, 7, StringComparison.OrdinalIgnoreCase) == 0) strItem = "SYSTEM_TABLE"; |
︙ | ︙ | |||
4541 4542 4543 4544 4545 4546 4547 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; | | | 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 | tbl.BeginLoadData(); if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; using (SQLiteCommand cmd = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this)) using (SQLiteDataReader rd = (SQLiteDataReader)cmd.ExecuteReader()) { while (rd.Read()) { if (String.Compare(rd.GetString(1), strView, StringComparison.OrdinalIgnoreCase) == 0 || String.IsNullOrEmpty(strView)) { |
︙ | ︙ | |||
4690 4691 4692 4693 4694 4695 4696 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); | | | | 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); using (SQLiteCommand cmdTables = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this)) using (SQLiteDataReader rdTables = cmdTables.ExecuteReader()) { while (rdTables.Read()) { maybeRowId = false; primaryKeys.Clear(); if (String.IsNullOrEmpty(strTable) || String.Compare(rdTables.GetString(2), strTable, StringComparison.OrdinalIgnoreCase) == 0) { try { using (SQLiteCommand cmdTable = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].table_info([{1}])", strCatalog, rdTables.GetString(2)), this)) using (SQLiteDataReader rdTable = cmdTable.ExecuteReader()) { while (rdTable.Read()) { if (rdTable.GetInt32(5) == 1) // is a primary key { primaryKeys.Add(new KeyValuePair<int, string>(rdTable.GetInt32(0), rdTable.GetString(1))); |
︙ | ︙ | |||
4724 4725 4726 4727 4728 4729 4730 | { } // This is a rowid row if (primaryKeys.Count == 1 && maybeRowId == true) { row = tbl.NewRow(); row["CONSTRAINT_CATALOG"] = strCatalog; | | | | | 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 | { } // This is a rowid row if (primaryKeys.Count == 1 && maybeRowId == true) { row = tbl.NewRow(); row["CONSTRAINT_CATALOG"] = strCatalog; row["CONSTRAINT_NAME"] = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "{1}_PK_{0}", rdTables.GetString(2), master); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = rdTables.GetString(2); row["COLUMN_NAME"] = primaryKeys[0].Value; row["INDEX_NAME"] = row["CONSTRAINT_NAME"]; row["ORDINAL_POSITION"] = 0; // primaryKeys[0].Key; row["COLLATION_NAME"] = "BINARY"; row["SORT_MODE"] = "ASC"; row["CONFLICT_OPTION"] = 2; if (String.IsNullOrEmpty(strIndex) || String.Compare(strIndex, (string)row["INDEX_NAME"], StringComparison.OrdinalIgnoreCase) == 0) tbl.Rows.Add(row); } using (SQLiteCommand cmdIndexes = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{2}] WHERE [type] LIKE 'index' AND [tbl_name] LIKE '{1}'", strCatalog, rdTables.GetString(2).Replace("'", "''"), master), this)) using (SQLiteDataReader rdIndexes = cmdIndexes.ExecuteReader()) { while (rdIndexes.Read()) { int ordinal = 0; if (String.IsNullOrEmpty(strIndex) || String.Compare(strIndex, rdIndexes.GetString(1), StringComparison.OrdinalIgnoreCase) == 0) { try { using (SQLiteCommand cmdIndex = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].index_info([{1}])", strCatalog, rdIndexes.GetString(1)), this)) using (SQLiteDataReader rdIndex = cmdIndex.ExecuteReader()) { while (rdIndex.Read()) { string columnName = rdIndex.IsDBNull(2) ? null : rdIndex.GetString(2); row = tbl.NewRow(); |
︙ | ︙ | |||
4852 4853 4854 4855 4856 4857 4858 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); | | | | 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); using (SQLiteCommand cmdViews = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'view'", strCatalog, master), this)) using (SQLiteDataReader rdViews = cmdViews.ExecuteReader()) { while (rdViews.Read()) { if (String.IsNullOrEmpty(strView) || String.Compare(strView, rdViews.GetString(2), StringComparison.OrdinalIgnoreCase) == 0) { using (SQLiteCommand cmdViewSelect = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}]", strCatalog, rdViews.GetString(2)), this)) { strSql = rdViews.GetString(4).Replace('\r', ' ').Replace('\n', ' ').Replace('\t', ' '); n = CultureInfo.InvariantCulture.CompareInfo.IndexOf(strSql, " AS ", CompareOptions.IgnoreCase); if (n < 0) continue; strSql = strSql.Substring(n + 4); |
︙ | ︙ | |||
4957 4958 4959 4960 4961 4962 4963 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); | | | | | 4957 4958 4959 4960 4961 4962 4963 4964 4965 4966 4967 4968 4969 4970 4971 4972 4973 4974 4975 4976 4977 4978 4979 4980 4981 4982 4983 4984 4985 4986 4987 4988 | if (String.IsNullOrEmpty(strCatalog)) strCatalog = "main"; string master = (String.Compare(strCatalog, "temp", StringComparison.OrdinalIgnoreCase) == 0) ? _tempmasterdb : _masterdb; tbl.BeginLoadData(); using (SQLiteCommand cmdTables = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT * FROM [{0}].[{1}] WHERE [type] LIKE 'table'", strCatalog, master), this)) using (SQLiteDataReader rdTables = cmdTables.ExecuteReader()) { while (rdTables.Read()) { if (String.IsNullOrEmpty(strTable) || String.Compare(strTable, rdTables.GetString(2), StringComparison.OrdinalIgnoreCase) == 0) { try { using (SQLiteCommandBuilder builder = new SQLiteCommandBuilder()) using (SQLiteCommand cmdKey = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].foreign_key_list([{1}])", strCatalog, rdTables.GetString(2)), this)) using (SQLiteDataReader rdKey = cmdKey.ExecuteReader()) { while (rdKey.Read()) { row = tbl.NewRow(); row["CONSTRAINT_CATALOG"] = strCatalog; row["CONSTRAINT_NAME"] = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "FK_{0}_{1}_{2}", rdTables[2], rdKey.GetInt32(0), rdKey.GetInt32(1)); row["TABLE_CATALOG"] = strCatalog; row["TABLE_NAME"] = builder.UnquoteIdentifier(rdTables.GetString(2)); row["CONSTRAINT_TYPE"] = "FOREIGN KEY"; row["IS_DEFERRABLE"] = false; row["INITIALLY_DEFERRED"] = false; row["FKEY_ID"] = rdKey[0]; row["FKEY_FROM_COLUMN"] = builder.UnquoteIdentifier(rdKey[3].ToString()); |
︙ | ︙ | |||
5128 5129 5130 5131 5132 5133 5134 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5128 5129 5130 5131 5132 5133 5134 5135 5136 5137 5138 5139 5140 5141 5142 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Progress\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5181 5182 5183 5184 5185 5186 5187 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5181 5182 5183 5184 5185 5186 5187 5188 5189 5190 5191 5192 5193 5194 5195 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Authorize\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5230 5231 5232 5233 5234 5235 5236 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5230 5231 5232 5233 5234 5235 5236 5237 5238 5239 5240 5241 5242 5243 5244 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Update\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5321 5322 5323 5324 5325 5326 5327 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5321 5322 5323 5324 5325 5326 5327 5328 5329 5330 5331 5332 5333 5334 5335 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Trace\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5383 5384 5385 5386 5387 5388 5389 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5383 5384 5385 5386 5387 5388 5389 5390 5391 5392 5393 5394 5395 5396 5397 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Commit\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5425 5426 5427 5428 5429 5430 5431 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 5439 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Rollback\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConvert.cs.
︙ | ︙ | |||
1148 1149 1150 1151 1152 1153 1154 | case TypeCode.Decimal: return ((decimal)obj) != Decimal.Zero ? true : false; case TypeCode.String: return viaFramework ? Convert.ToBoolean(obj, provider) : ToBoolean(ToStringWithProvider(obj, provider)); default: | | | 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 | case TypeCode.Decimal: return ((decimal)obj) != Decimal.Zero ? true : false; case TypeCode.String: return viaFramework ? Convert.ToBoolean(obj, provider) : ToBoolean(ToStringWithProvider(obj, provider)); default: throw new SQLiteException(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Cannot convert type {0} to boolean", typeCode)); } } /// <summary> |
︙ | ︙ | |||
1446 1447 1448 1449 1450 1451 1452 | DbType dbType, SQLiteConnectionFlags flags, string typeName ) { if ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { | | | 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 | DbType dbType, SQLiteConnectionFlags flags, string typeName ) { if ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "WARNING: Type mapping failed, returning default name \"{0}\" for type {1}.", typeName, dbType)); } } /// <summary> |
︙ | ︙ | |||
1475 1476 1477 1478 1479 1480 1481 | SQLiteConnectionFlags flags, DbType? dbType ) { if (!String.IsNullOrEmpty(typeName) && ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)) { | | | 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 | SQLiteConnectionFlags flags, DbType? dbType ) { if (!String.IsNullOrEmpty(typeName) && ((flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning)) { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "WARNING: Type mapping failed, returning default type {0} for name \"{1}\".", dbType, typeName)); } } #endif |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteDataReader.cs.
︙ | ︙ | |||
1123 1124 1125 1126 1127 1128 1129 | } } } if (wantDefaultValue) { // Determine the default value for the column, which sucks because we have to query the schema for each column | | | 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 | } } } if (wantDefaultValue) { // Determine the default value for the column, which sucks because we have to query the schema for each column using (SQLiteCommand cmdTable = new SQLiteCommand(HelperMethods.StringFormat(CultureInfo.InvariantCulture, "PRAGMA [{0}].TABLE_INFO([{1}])", row[SchemaTableOptionalColumn.BaseCatalogName], row[SchemaTableColumn.BaseTableName] ), _command.Connection)) using (DbDataReader rdTable = cmdTable.ExecuteReader()) { // Find the matching column while (rdTable.Read()) |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteDefineConstants.cs.
︙ | ︙ | |||
135 136 137 138 139 140 141 142 143 144 145 146 147 148 | #if RETARGETABLE "RETARGETABLE", #endif #if SQLITE_STANDARD "SQLITE_STANDARD", #endif #if THROW_ON_DISPOSED "THROW_ON_DISPOSED", #endif #if TRACE "TRACE", | > > > > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | #if RETARGETABLE "RETARGETABLE", #endif #if SQLITE_STANDARD "SQLITE_STANDARD", #endif #if SQLITE_STANDARD_LIBRARY_NAME "SQLITE_STANDARD_LIBRARY_NAME", #endif #if THROW_ON_DISPOSED "THROW_ON_DISPOSED", #endif #if TRACE "TRACE", |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteEnlistment.cs.
︙ | ︙ | |||
27 28 29 30 31 32 33 | { _transaction = cnn.BeginTransaction(GetSystemDataIsolationLevel( cnn, scope, defaultIsolationLevel, throwOnUnavailable, throwOnUnsupported)); _scope = scope; | | | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | { _transaction = cnn.BeginTransaction(GetSystemDataIsolationLevel( cnn, scope, defaultIsolationLevel, throwOnUnavailable, throwOnUnsupported)); _scope = scope; _scope.EnlistVolatile(this, EnlistmentOptions.None); } /////////////////////////////////////////////////////////////////////////// #region Private Methods private System.Data.IsolationLevel GetSystemDataIsolationLevel( SQLiteConnection connection, |
︙ | ︙ | |||
60 61 62 63 64 65 66 | throw new InvalidOperationException( "isolation level is unavailable"); } return defaultIsolationLevel; } | < | | 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | throw new InvalidOperationException( "isolation level is unavailable"); } return defaultIsolationLevel; } IsolationLevel isolationLevel = transaction.IsolationLevel; // // TODO: Are these isolation level mappings actually correct? // switch (isolationLevel) { case IsolationLevel.Unspecified: |
︙ | ︙ | |||
92 93 94 95 96 97 98 | // NOTE: When in "strict" mode, throw an exception if the isolation // level is not recognized; otherwise, fallback to the default // isolation level specified by the caller. // if (throwOnUnsupported) { throw new InvalidOperationException( | | | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | // NOTE: When in "strict" mode, throw an exception if the isolation // level is not recognized; otherwise, fallback to the default // isolation level specified by the caller. // if (throwOnUnsupported) { throw new InvalidOperationException( HelperMethods.StringFormat(CultureInfo.CurrentCulture, "unsupported isolation level {0}", isolationLevel)); } return defaultIsolationLevel; } /////////////////////////////////////////////////////////////////////////// |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteException.cs.
︙ | ︙ | |||
179 180 181 182 183 184 185 | /// <param name="message">Optional detailed error message.</param> /// <returns>Error message text for the return code.</returns> private static string GetStockErrorMessage( SQLiteErrorCode errorCode, string message ) { | | | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | /// <param name="message">Optional detailed error message.</param> /// <returns>Error message text for the return code.</returns> private static string GetStockErrorMessage( SQLiteErrorCode errorCode, string message ) { return HelperMethods.StringFormat( CultureInfo.CurrentCulture, "{0}{1}{2}", GetErrorString(errorCode), #if !NET_COMPACT_20 Environment.NewLine, message).Trim(); #else "\r\n", message).Trim(); |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFunction.cs.
︙ | ︙ | |||
416 417 418 419 420 421 422 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Invoke\" method: {0}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
454 455 456 457 458 459 460 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Compare\" (UTF8) method: {0}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
501 502 503 504 505 506 507 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Compare\" (UTF16) method: {0}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
574 575 576 577 578 579 580 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Step\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
629 630 631 632 633 634 635 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 | { try { if ((_flags & SQLiteConnectionFlags.LogCallbackException) == SQLiteConnectionFlags.LogCallbackException) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat(CultureInfo.CurrentCulture, "Caught exception in \"Final\" method: {1}", e)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
1545 1546 1547 1548 1549 1550 1551 | public override object Invoke( object[] args /* in */ ) { if (callback1 == null) { throw new InvalidOperationException( | | | 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 | public override object Invoke( object[] args /* in */ ) { if (callback1 == null) { throw new InvalidOperationException( HelperMethods.StringFormat( CultureInfo.CurrentCulture, NoCallbackError, "Invoke")); } SQLiteInvokeDelegate invokeDelegate = callback1 as SQLiteInvokeDelegate; |
︙ | ︙ | |||
1595 1596 1597 1598 1599 1600 1601 | int stepNumber, /* in */ ref object contextData /* in, out */ ) { if (callback1 == null) { throw new InvalidOperationException( | | | 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 | int stepNumber, /* in */ ref object contextData /* in, out */ ) { if (callback1 == null) { throw new InvalidOperationException( HelperMethods.StringFormat( CultureInfo.CurrentCulture, NoCallbackError, "Step")); } SQLiteStepDelegate stepDelegate = callback1 as SQLiteStepDelegate; if (stepDelegate != null) |
︙ | ︙ | |||
1644 1645 1646 1647 1648 1649 1650 | public override object Final( object contextData /* in */ ) { if (callback2 == null) { throw new InvalidOperationException( | | | 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 | public override object Final( object contextData /* in */ ) { if (callback2 == null) { throw new InvalidOperationException( HelperMethods.StringFormat( CultureInfo.CurrentCulture, NoCallbackError, "Final")); } SQLiteFinalDelegate finalDelegate = callback2 as SQLiteFinalDelegate; if (finalDelegate != null) |
︙ | ︙ | |||
1694 1695 1696 1697 1698 1699 1700 | string param1, /* in */ string param2 /* in */ ) { if (callback1 == null) { throw new InvalidOperationException( | | | 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 | string param1, /* in */ string param2 /* in */ ) { if (callback1 == null) { throw new InvalidOperationException( HelperMethods.StringFormat( CultureInfo.CurrentCulture, NoCallbackError, "Compare")); } SQLiteCompareDelegate compareDelegate = callback1 as SQLiteCompareDelegate; |
︙ | ︙ | |||
1717 1718 1719 1720 1721 1722 1723 | object result = callback1.DynamicInvoke(GetCompareArgs( param1, param2, false)); /* throw */ if (result is int) return (int)result; throw new InvalidOperationException( | | | 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 | object result = callback1.DynamicInvoke(GetCompareArgs( param1, param2, false)); /* throw */ if (result is int) return (int)result; throw new InvalidOperationException( HelperMethods.StringFormat( CultureInfo.CurrentCulture, ResultInt32Error, "Compare")); #else throw new NotImplementedException(); #endif } } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteKeyReader.cs.
︙ | ︙ | |||
54 55 56 57 58 59 60 | { _command = cnn.CreateCommand(); for (int n = 0; n < columns.Length; n++) { columns[n] = builder.QuoteIdentifier(columns[n]); } } | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | { _command = cnn.CreateCommand(); for (int n = 0; n < columns.Length; n++) { columns[n] = builder.QuoteIdentifier(columns[n]); } } _command.CommandText = HelperMethods.StringFormat(CultureInfo.InvariantCulture, "SELECT {0} FROM [{1}].[{2}] WHERE ROWID = ?", String.Join(",", columns), database, table); _command.Parameters.AddWithValue(null, (long)0); } internal bool IsValid { set { |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteLog.cs.
︙ | ︙ | |||
555 556 557 558 559 560 561 | { type = "trace"; } if ((errorCode != null) && !Object.ReferenceEquals(errorCode, String.Empty)) { | | | | 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 | { type = "trace"; } if ((errorCode != null) && !Object.ReferenceEquals(errorCode, String.Empty)) { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "SQLite {0} ({1}): {2}", type, errorCode, message)); } else { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "SQLite {0}: {1}", type, message)); } #endif } } } |
Changes to System.Data.SQLite/SQLiteModule.cs.
︙ | ︙ | |||
5553 5554 5555 5556 5557 5558 5559 | // try { if (LogExceptionsNoThrow) { /* throw */ SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5553 5554 5555 5556 5557 5558 5559 5560 5561 5562 5563 5564 5565 5566 5567 | // try { if (LogExceptionsNoThrow) { /* throw */ SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Caught exception in \"{0}\" method: {1}", destroy ? "xDestroy" : "xDisconnect", e)); } } catch { |
︙ | ︙ | |||
5613 5614 5615 5616 5617 5618 5619 | ) { try { if (logErrors) { SQLiteLog.LogMessage(SQLiteErrorCode.Error, | | | 5613 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 | ) { try { if (logErrors) { SQLiteLog.LogMessage(SQLiteErrorCode.Error, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Virtual table error: {0}", error)); /* throw */ } } catch { // do nothing. |
︙ | ︙ | |||
5661 5662 5663 5664 5665 5666 5667 | catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (logExceptions) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 5661 5662 5663 5664 5665 5666 5667 5668 5669 5670 5671 5672 5673 5674 5675 | catch (Exception e) /* NOTE: Must catch ALL. */ { try { if (logExceptions) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Caught exception in \"SetTableError\" method: {0}", e)); /* throw */ } } catch { |
︙ | ︙ | |||
6063 6064 6065 6066 6067 6068 6069 | if ((tables != null) && tables.TryGetValue(pVtab, out table)) { return table; } | | | 6063 6064 6065 6066 6067 6068 6069 6070 6071 6072 6073 6074 6075 6076 6077 | if ((tables != null) && tables.TryGetValue(pVtab, out table)) { return table; } SetTableError(pVtab, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "managed table for {0} not found", pVtab)); return null; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
6157 6158 6159 6160 6161 6162 6163 | if ((cursors != null) && cursors.TryGetValue(pCursor, out cursor)) { return cursor; } | | | 6157 6158 6159 6160 6161 6162 6163 6164 6165 6166 6167 6168 6169 6170 6171 | if ((cursors != null) && cursors.TryGetValue(pCursor, out cursor)) { return cursor; } SetTableError(pVtab, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "managed cursor for {0} not found", pCursor)); return null; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
6243 6244 6245 6246 6247 6248 6249 | /// </returns> protected virtual string GetFunctionKey( int argumentCount, string name, SQLiteFunction function ) { | | | 6243 6244 6245 6246 6247 6248 6249 6250 6251 6252 6253 6254 6255 6256 6257 | /// </returns> protected virtual string GetFunctionKey( int argumentCount, string name, SQLiteFunction function ) { return HelperMethods.StringFormat( CultureInfo.InvariantCulture, "{0}:{1}", argumentCount, name); } #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
8117 8118 8119 8120 8121 8122 8123 | catch (Exception e) { try { if (LogExceptionsNoThrow) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, | | | 8117 8118 8119 8120 8121 8122 8123 8124 8125 8126 8127 8128 8129 8130 8131 | catch (Exception e) { try { if (LogExceptionsNoThrow) { SQLiteLog.LogMessage(SQLiteBase.COR_E_EXCEPTION, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Caught exception in \"Dispose\" method: {0}", e)); /* throw */ } } catch { |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModuleCommon.cs.
︙ | ︙ | |||
20 21 22 23 24 25 26 | { #region Private Constants /// <summary> /// The CREATE TABLE statement used to declare the schema for the /// virtual table. /// </summary> private static readonly string declareSql = | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | { #region Private Constants /// <summary> /// The CREATE TABLE statement used to declare the schema for the /// virtual table. /// </summary> private static readonly string declareSql = HelperMethods.StringFormat( CultureInfo.InvariantCulture, "CREATE TABLE {0}(x);", typeof(SQLiteModuleCommon).Name); #endregion /////////////////////////////////////////////////////////////////////// #region Private Data |
︙ | ︙ | |||
115 116 117 118 119 120 121 | protected virtual SQLiteErrorCode CursorTypeMismatchError( SQLiteVirtualTableCursor cursor, Type type ) { if (type != null) { | | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | protected virtual SQLiteErrorCode CursorTypeMismatchError( SQLiteVirtualTableCursor cursor, Type type ) { if (type != null) { SetCursorError(cursor, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "not a \"{0}\" cursor", type)); } else { SetCursorError(cursor, "cursor type mismatch"); } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModuleEnumerable.cs.
︙ | ︙ | |||
499 500 501 502 503 504 505 | SQLiteIndex index ) { CheckDisposed(); if (!table.BestIndex(index)) { | | | 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 | SQLiteIndex index ) { CheckDisposed(); if (!table.BestIndex(index)) { SetTableError(table, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "failed to select best index for virtual table \"{0}\"", table.TableName)); return SQLiteErrorCode.Error; } |
︙ | ︙ | |||
827 828 829 830 831 832 833 | SQLiteVirtualTable table, SQLiteValue[] values, ref long rowId ) { CheckDisposed(); | | | 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 | SQLiteVirtualTable table, SQLiteValue[] values, ref long rowId ) { CheckDisposed(); SetTableError(table, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "virtual table \"{0}\" is read-only", table.TableName)); return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
857 858 859 860 861 862 863 | string newName ) { CheckDisposed(); if (!table.Rename(newName)) { | | | 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 | string newName ) { CheckDisposed(); if (!table.Rename(newName)) { SetTableError(table, HelperMethods.StringFormat( CultureInfo.CurrentCulture, "failed to rename virtual table from \"{0}\" to \"{1}\"", table.TableName, newName)); return SQLiteErrorCode.Error; } |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteParameterCollection.cs.
︙ | ︙ | |||
423 424 425 426 427 428 429 | foreach(SQLiteParameter p in _parameterList) { y ++; s = p.ParameterName; if (s == null) { | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | foreach(SQLiteParameter p in _parameterList) { y ++; s = p.ParameterName; if (s == null) { s = HelperMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", nUnnamed); nUnnamed++; } int x; bool isMapped = false; if (activeStatement == null) |
︙ | ︙ | |||
452 453 454 455 456 457 458 | stmt = null; } // If the parameter has a name, but the SQL statement uses unnamed references, this can happen -- attempt to map // the parameter by its index in the collection if (isMapped == false) { | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | stmt = null; } // If the parameter has a name, but the SQL statement uses unnamed references, this can happen -- attempt to map // the parameter by its index in the collection if (isMapped == false) { s = HelperMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", y); stmt = activeStatement; for (n = 0; n < x; n++) { if (stmt == null) stmt = _command._statementList[n]; if (stmt._paramNames != null) { |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteStatement.cs.
︙ | ︙ | |||
81 82 83 84 85 86 87 | _paramValues = new SQLiteParameter[n]; for (x = 0; x < n; x++) { s = _sql.Bind_ParamName(this, _flags, x + 1); if (String.IsNullOrEmpty(s)) { | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | _paramValues = new SQLiteParameter[n]; for (x = 0; x < n; x++) { s = _sql.Bind_ParamName(this, _flags, x + 1); if (String.IsNullOrEmpty(s)) { s = HelperMethods.StringFormat(CultureInfo.InvariantCulture, ";{0}", nCmdStart); nCmdStart++; _unnamedParameters++; } _paramNames[x] = s; _paramValues[x] = null; } } |
︙ | ︙ | |||
254 255 256 257 258 259 260 | if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); if ((_flags & SQLiteConnectionFlags.LogPreBind) == SQLiteConnectionFlags.LogPreBind) { IntPtr handle = _sqlite_stmt; | | | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | if ((obj != null) && (objType == DbType.Object)) objType = SQLiteConvert.TypeToDbType(obj.GetType()); if ((_flags & SQLiteConnectionFlags.LogPreBind) == SQLiteConnectionFlags.LogPreBind) { IntPtr handle = _sqlite_stmt; SQLiteLog.LogMessage(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Binding statement {0} paramter #{1} with database type {2} and raw value {{{3}}}...", handle, index, objType, obj)); } if ((obj == null) || Convert.IsDBNull(obj)) { |
︙ | ︙ |
Changes to System.Data.SQLite/Targets/System.Data.SQLite.Properties.targets.
︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 | NOTE: For interaction with the native SQLite implementation, use the standard DLL (i.e. "sqlite3.dll")? --> <PropertyGroup Condition="'$(UseSqliteStandard)' != 'false'"> <DefineConstants>$(DefineConstants);SQLITE_STANDARD</DefineConstants> </PropertyGroup> <!-- NOTE: Is the project being built to support the .NET Compact Framework? --> <PropertyGroup Condition="'$(IsCompactFramework)' != 'false'"> <DefineConstants>$(DefineConstants);PLATFORM_COMPACTFRAMEWORK</DefineConstants> </PropertyGroup> | > > > > > > > > > | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | NOTE: For interaction with the native SQLite implementation, use the standard DLL (i.e. "sqlite3.dll")? --> <PropertyGroup Condition="'$(UseSqliteStandard)' != 'false'"> <DefineConstants>$(DefineConstants);SQLITE_STANDARD</DefineConstants> </PropertyGroup> <!-- NOTE: For interaction with the native SQLite implementation, use the standard DLL file name (i.e. "sqlite3.dll") even when compiled to use the interop DLL? --> <PropertyGroup Condition="'$(UseSqliteStandardLibraryName)' != 'false'"> <DefineConstants>$(DefineConstants);SQLITE_STANDARD_LIBRARY_NAME</DefineConstants> </PropertyGroup> <!-- NOTE: Is the project being built to support the .NET Compact Framework? --> <PropertyGroup Condition="'$(IsCompactFramework)' != 'false'"> <DefineConstants>$(DefineConstants);PLATFORM_COMPACTFRAMEWORK</DefineConstants> </PropertyGroup> |
︙ | ︙ |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
︙ | ︙ | |||
14 15 16 17 18 19 20 | using System.Diagnostics; #endif using System.Collections.Generic; using System.IO; using System.Reflection; | | > | < > > | > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 | using System.Diagnostics; #endif using System.Collections.Generic; using System.IO; using System.Reflection; #if !PLATFORM_COMPACTFRAMEWORK using System.Security; #endif using System.Runtime.InteropServices; #if !PLATFORM_COMPACTFRAMEWORK using System.Text; #endif #if !PLATFORM_COMPACTFRAMEWORK || COUNT_HANDLE using System.Threading; #endif using System.Xml; #region Debug Data Static Class #if COUNT_HANDLE || DEBUG /// <summary> /// This class encapsulates some tracking data that is used for debugging /// and testing purposes. /// </summary> internal static class DebugData { #region Private Data #region Critical Handle Counts (Debug Build Only) #if COUNT_HANDLE // // NOTE: These counts represent the total number of outstanding // (non-disposed) CriticalHandle derived object instances // created by this library and are primarily for use by // the test suite. These counts are incremented by the // associated constructors and are decremented upon the // successful completion of the associated ReleaseHandle // methods. // internal static int connectionCount; internal static int statementCount; internal static int backupCount; #endif #endregion ///////////////////////////////////////////////////////////////////////// #region Settings Read Counts (Debug Build Only) #if DEBUG /// <summary> /// This lock is used to protect the static /// <see cref="settingReadCounts" /> field. /// </summary> private static readonly object staticSyncRoot = new object(); ///////////////////////////////////////////////////////////////////////// /// <summary> /// This dictionary stores the read counts for the runtime configuration /// settings. This information is only recorded when compiled in the /// "Debug" build configuration. /// </summary> private static Dictionary<string, int> settingReadCounts; #endif #endregion #endregion ///////////////////////////////////////////////////////////////////////// #region Public Methods #if DEBUG /// <summary> /// Creates the dictionary used to store the read counts for each of the /// runtime configuration settings. These numbers are used for debugging /// and testing purposes only. /// </summary> public static void InitializeSettingReadCounts() { lock (staticSyncRoot) { // // NOTE: Create the list of statistics that will contain the // number of times each setting value has been read. // if (settingReadCounts == null) settingReadCounts = new Dictionary<string, int>(); } } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Increments the read count for the specified runtime configuration /// setting. These numbers are used for debugging and testing purposes /// only. /// </summary> /// <param name="name"> /// The name of the setting being read. /// </param> public static void IncrementSettingReadCount( string name ) { lock (staticSyncRoot) { // // NOTE: Update statistics for this setting value. // if (settingReadCounts != null) { int count; if (settingReadCounts.TryGetValue(name, out count)) settingReadCounts[name] = count + 1; else settingReadCounts.Add(name, 1); } } } #endif #endregion } #endif #endregion ///////////////////////////////////////////////////////////////////////////// #region Helper Methods Static Class /// <summary> /// This static class provides some methods that are shared between the /// native library pre-loader and other classes. /// </summary> internal static class HelperMethods { #region Private Data /// <summary> /// This lock is used to protect the static <see cref="isMono" /> field. /// </summary> private static readonly object staticSyncRoot = new object(); ///////////////////////////////////////////////////////////////////////// /// <summary> /// This type is only present when running on Mono. /// </summary> private static readonly string MonoRuntimeType = "Mono.Runtime"; ///////////////////////////////////////////////////////////////////////// /// <summary> /// Keeps track of whether we are running on Mono. Initially null, it is /// set by the <see cref="IsMono" /> method on its first call. Later, it /// is returned verbatim by the <see cref="IsMono" /> method. /// </summary> private static bool? isMono = null; #endregion ///////////////////////////////////////////////////////////////////////// #region Private Methods /// <summary> /// Determines whether or not this assembly is running on Mono. /// </summary> /// <returns> /// Non-zero if this assembly is running on Mono. /// </returns> private static bool IsMono() { try { lock (staticSyncRoot) { if (isMono == null) isMono = (Type.GetType(MonoRuntimeType) != null); return (bool)isMono; } } catch { // do nothing. } return false; } #endregion ///////////////////////////////////////////////////////////////////////// #region Internal Methods /// <summary> /// Determines if the current process is running on one of the Windows /// [sub-]platforms. /// </summary> /// <returns> /// Non-zero when running on Windows; otherwise, zero. /// </returns> internal static bool IsWindows() { PlatformID platformId = Environment.OSVersion.Platform; if ((platformId == PlatformID.Win32S) || (platformId == PlatformID.Win32Windows) || (platformId == PlatformID.Win32NT) || (platformId == PlatformID.WinCE)) { return true; } return false; } ///////////////////////////////////////////////////////////////////////// /// <summary> /// This is a wrapper around the /// <see cref="String.Format(IFormatProvider,String,Object[])" /> method. /// On Mono, it has to call the method overload without the /// <see cref="IFormatProvider" /> parameter, due to a bug in Mono. /// </summary> /// <param name="provider"> /// This is used for culture-specific formatting. /// </param> /// <param name="format"> /// The format string. /// </param> /// <param name="args"> /// An array the objects to format. /// </param> /// <returns> /// The resulting string. /// </returns> internal static string StringFormat( IFormatProvider provider, string format, params object[] args ) { if (IsMono()) return String.Format(format, args); else return String.Format(provider, format, args); } #endregion } #endregion ///////////////////////////////////////////////////////////////////////////// #region Native Library Helper Class /// <summary> /// This static class provides a thin wrapper around the native library /// loading features of the underlying platform. /// </summary> internal static class NativeLibraryHelper { #region Private Delegates /// <summary> /// This delegate is used to wrap the concept of loading a native /// library, based on a file name, and returning the loaded module /// handle. /// </summary> /// <param name="fileName"> /// The file name of the native library to load. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> private delegate IntPtr LoadLibraryCallback( string fileName ); #endregion ///////////////////////////////////////////////////////////////////////// #region Private Methods /// <summary> /// Attempts to load the specified native library file using the Win32 /// API. /// </summary> /// <param name="fileName"> /// The file name of the native library to load. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> private static IntPtr LoadLibraryWin32( string fileName ) { return UnsafeNativeMethodsWin32.LoadLibrary(fileName); } ///////////////////////////////////////////////////////////////////////// #if !PLATFORM_COMPACTFRAMEWORK /// <summary> /// Attempts to load the specified native library file using the POSIX /// API. /// </summary> /// <param name="fileName"> /// The file name of the native library to load. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> private static IntPtr LoadLibraryPosix( string fileName ) { return UnsafeNativeMethodsPosix.dlopen( fileName, UnsafeNativeMethodsPosix.RTLD_DEFAULT); } #endif #endregion ///////////////////////////////////////////////////////////////////////// #region Public Methods /// <summary> /// Attempts to load the specified native library file. /// </summary> /// <param name="fileName"> /// The file name of the native library to load. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> public static IntPtr LoadLibrary( string fileName ) { LoadLibraryCallback callback = LoadLibraryWin32; #if !PLATFORM_COMPACTFRAMEWORK if (!HelperMethods.IsWindows()) callback = LoadLibraryPosix; #endif return callback(fileName); } #endregion } #endregion ///////////////////////////////////////////////////////////////////////////// #region Unmanaged Interop Methods Static Class (POSIX) #if !PLATFORM_COMPACTFRAMEWORK /// <summary> /// This class declares P/Invoke methods to call native POSIX APIs. /// </summary> [SuppressUnmanagedCodeSecurity] internal static class UnsafeNativeMethodsPosix { ///////////////////////////////////////////////////////////////////////// /// <summary> /// This is the P/Invoke method that wraps the native Unix dlopen /// function. See the POSIX documentation for full details on what it /// does. /// </summary> /// <param name="fileName"> /// The name of the executable library. /// </param> /// <param name="mode"> /// This must be a combination of the individual bit flags RTLD_LAZY, /// RTLD_NOW, RTLD_GLOBAL, and/or RTLD_LOCAL. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> [DllImport("__Internal", EntryPoint = "dlopen", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, SetLastError = true)] internal static extern IntPtr dlopen(string fileName, int mode); ///////////////////////////////////////////////////////////////////////// /// <summary> /// For use with dlopen(), bind function calls lazily. /// </summary> internal const int RTLD_LAZY = 0x1; ///////////////////////////////////////////////////////////////////////// /// <summary> /// For use with dlopen(), bind function calls immediately. /// </summary> internal const int RTLD_NOW = 0x2; ///////////////////////////////////////////////////////////////////////// /// <summary> /// For use with dlopen(), make symbols globally available. /// </summary> internal const int RTLD_GLOBAL = 0x100; ///////////////////////////////////////////////////////////////////////// /// <summary> /// For use with dlopen(), opposite of RTLD_GLOBAL, and the default. /// </summary> internal const int RTLD_LOCAL = 0x000; ///////////////////////////////////////////////////////////////////////// /// <summary> /// For use with dlopen(), the defaults used by this class. /// </summary> internal const int RTLD_DEFAULT = RTLD_NOW | RTLD_GLOBAL; } #endif #endregion ///////////////////////////////////////////////////////////////////////////// #region Unmanaged Interop Methods Static Class (Win32) /// <summary> /// This class declares P/Invoke methods to call native Win32 APIs. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [SuppressUnmanagedCodeSecurity] #endif internal static class UnsafeNativeMethodsWin32 { ///////////////////////////////////////////////////////////////////////// /// <summary> /// This is the P/Invoke method that wraps the native Win32 LoadLibrary /// function. See the MSDN documentation for full details on what it /// does. /// </summary> /// <param name="fileName"> /// The name of the executable library. /// </param> /// <returns> /// The native module handle upon success -OR- IntPtr.Zero on failure. /// </returns> #if !PLATFORM_COMPACTFRAMEWORK [DllImport("kernel32", #else [DllImport("coredll", #endif CallingConvention = CallingConvention.Winapi, CharSet = CharSet.Auto, #if !PLATFORM_COMPACTFRAMEWORK BestFitMapping = false, ThrowOnUnmappableChar = true, #endif SetLastError = true)] internal static extern IntPtr LoadLibrary(string fileName); ///////////////////////////////////////////////////////////////////////// #if PLATFORM_COMPACTFRAMEWORK /// <summary> /// This is the P/Invoke method that wraps the native Win32 GetSystemInfo /// function. See the MSDN documentation for full details on what it /// does. /// </summary> /// <param name="systemInfo"> /// The system information structure to be filled in by the function. /// </param> [DllImport("coredll", CallingConvention = CallingConvention.Winapi)] internal static extern void GetSystemInfo(out SYSTEM_INFO systemInfo); ///////////////////////////////////////////////////////////////////////// /// <summary> /// This enumeration contains the possible values for the processor /// architecture field of the system information structure. /// </summary> internal enum ProcessorArchitecture : ushort /* COMPAT: Win32. */ { Intel = 0, MIPS = 1, Alpha = 2, PowerPC = 3, SHx = 4, ARM = 5, IA64 = 6, Alpha64 = 7, MSIL = 8, AMD64 = 9, IA32_on_Win64 = 10, Unknown = 0xFFFF } ///////////////////////////////////////////////////////////////////////// /// <summary> /// This structure contains information about the current computer. This /// includes the processor type, page size, memory addresses, etc. /// </summary> [StructLayout(LayoutKind.Sequential)] internal struct SYSTEM_INFO { public ProcessorArchitecture wProcessorArchitecture; public ushort wReserved; /* NOT USED */ public uint dwPageSize; /* NOT USED */ public IntPtr lpMinimumApplicationAddress; /* NOT USED */ public IntPtr lpMaximumApplicationAddress; /* NOT USED */ public uint dwActiveProcessorMask; /* NOT USED */ public uint dwNumberOfProcessors; /* NOT USED */ public uint dwProcessorType; /* NOT USED */ public uint dwAllocationGranularity; /* NOT USED */ public ushort wProcessorLevel; /* NOT USED */ public ushort wProcessorRevision; /* NOT USED */ } #endif } #endregion ///////////////////////////////////////////////////////////////////////////// #region Unmanaged Interop Methods Static Class (SQLite) /// <summary> /// This class declares P/Invoke methods to call native SQLite APIs. /// </summary> #if !PLATFORM_COMPACTFRAMEWORK [SuppressUnmanagedCodeSecurity] #endif internal static class UnsafeNativeMethods { #region Shared Native SQLite Library Pre-Loading Code #region Private Constants /// <summary> /// The file extension used for dynamic link libraries. /// </summary> private static readonly string DllFileExtension = ".dll"; |
︙ | ︙ | |||
86 87 88 89 90 91 92 | #region Private Data /// <summary> /// This lock is used to protect the static _SQLiteNativeModuleFileName, /// _SQLiteNativeModuleHandle, and processorArchitecturePlatforms fields. /// </summary> private static readonly object staticSyncRoot = new object(); | < < < < < < < < < < | 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | #region Private Data /// <summary> /// This lock is used to protect the static _SQLiteNativeModuleFileName, /// _SQLiteNativeModuleHandle, and processorArchitecturePlatforms fields. /// </summary> private static readonly object staticSyncRoot = new object(); ///////////////////////////////////////////////////////////////////////// /// <summary> /// This dictionary stores the mappings between processor architecture /// names and platform names. These mappings are now used for two /// purposes. First, they are used to determine if the assembly code /// base should be used instead of the location, based upon whether one /// or more of the named sub-directories exist within the assembly code |
︙ | ︙ | |||
119 120 121 122 123 124 125 | /// </summary> static UnsafeNativeMethods() { Initialize(); } ///////////////////////////////////////////////////////////////////////// | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > > > > > < < < < < < < < < | 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | /// </summary> static UnsafeNativeMethods() { Initialize(); } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Attempts to initialize this class by pre-loading the native SQLite /// library for the processor architecture of the current process. /// </summary> internal static void Initialize() { #if SQLITE_STANDARD || USE_INTEROP_DLL || PLATFORM_COMPACTFRAMEWORK #if PRELOAD_NATIVE_LIBRARY // // NOTE: If the "No_PreLoadSQLite" environment variable is set (to // anything), skip all our special code and simply return. // if (GetSettingValue("No_PreLoadSQLite", null) != null) return; #endif #endif #region Debug Build Only #if DEBUG // // NOTE: Create the list of statistics that will contain the // number of times each setting value has been read. // DebugData.InitializeSettingReadCounts(); #endif #endregion lock (staticSyncRoot) { // // TODO: Make sure this list is updated if the supported // processor architecture names and/or platform names // changes. // if (processorArchitecturePlatforms == null) { |
︙ | ︙ | |||
375 376 377 378 379 380 381 | if (name == null) return @default; ///////////////////////////////////////////////////////////////////// #region Debug Build Only #if DEBUG | < < < < < | < < < < < < < < < | | | | 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 | if (name == null) return @default; ///////////////////////////////////////////////////////////////////// #region Debug Build Only #if DEBUG DebugData.IncrementSettingReadCount(name); #endif #endregion ///////////////////////////////////////////////////////////////////// string value = null; #if !PLATFORM_COMPACTFRAMEWORK bool expand = true; if (Environment.GetEnvironmentVariable("No_Expand") != null) { expand = false; } else if (Environment.GetEnvironmentVariable( HelperMethods.StringFormat(CultureInfo.InvariantCulture, "No_Expand_{0}", name)) != null) { expand = false; } value = Environment.GetEnvironmentVariable(name); if (expand && !String.IsNullOrEmpty(value)) |
︙ | ︙ | |||
431 432 433 434 435 436 437 | if (fileName == null) return @default; XmlDocument document = new XmlDocument(); document.Load(fileName); | | | | 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 | if (fileName == null) return @default; XmlDocument document = new XmlDocument(); document.Load(fileName); XmlElement element = document.SelectSingleNode( HelperMethods.StringFormat(CultureInfo.InvariantCulture, "/configuration/appSettings/add[@key='{0}']", name)) as XmlElement; if (element != null) { if (element.HasAttribute("value")) value = element.GetAttribute("value"); |
︙ | ︙ | |||
459 460 461 462 463 464 465 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { | | | 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader failed to get setting " + "\"{0}\" value: {1}", name, e)); /* throw */ } catch { // do nothing. |
︙ | ︙ | |||
575 576 577 578 579 580 581 | directory, XmlConfigFileName); if (File.Exists(xmlConfigFileName)) { #if !NET_COMPACT_20 && TRACE_DETECTION try { | | | 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 | directory, XmlConfigFileName); if (File.Exists(xmlConfigFileName)) { #if !NET_COMPACT_20 && TRACE_DETECTION try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader found XML configuration file " + "via code base for currently executing assembly: \"{0}\"", xmlConfigFileName)); /* throw */ } catch { |
︙ | ︙ | |||
598 599 600 601 602 603 604 | List<string> matches = null; if (CheckForArchitecturesAndPlatforms(directory, ref matches) > 0) { #if !NET_COMPACT_20 && TRACE_DETECTION try { | | | 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 | List<string> matches = null; if (CheckForArchitecturesAndPlatforms(directory, ref matches) > 0) { #if !NET_COMPACT_20 && TRACE_DETECTION try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader found native sub-directories " + "via code base for currently executing assembly: \"{0}\"", ListToString(matches))); /* throw */ } catch { |
︙ | ︙ | |||
625 626 627 628 629 630 631 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { | | | 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader failed to check code base " + "for currently executing assembly: {0}", e)); /* throw */ } catch { // do nothing. |
︙ | ︙ | |||
692 693 694 695 696 697 698 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { | | | 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 | #else catch (Exception) #endif { #if !NET_COMPACT_20 && TRACE_SHARED try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader failed to get directory " + "for currently executing assembly: {0}", e)); /* throw */ } catch { // do nothing. |
︙ | ︙ | |||
733 734 735 736 737 738 739 740 | /// <summary> /// The name of the environment variable containing the processor /// architecture of the current process. /// </summary> private static readonly string PROCESSOR_ARCHITECTURE = "PROCESSOR_ARCHITECTURE"; ///////////////////////////////////////////////////////////////////////// | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | > > > > > > > > > > > > > > > > > > > > | 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 | /// <summary> /// The name of the environment variable containing the processor /// architecture of the current process. /// </summary> private static readonly string PROCESSOR_ARCHITECTURE = "PROCESSOR_ARCHITECTURE"; ///////////////////////////////////////////////////////////////////////// #region Private Data /// <summary> /// The native module file name for the native SQLite library or null. /// </summary> internal static string _SQLiteNativeModuleFileName = null; ///////////////////////////////////////////////////////////////////////// /// <summary> /// The native module handle for the native SQLite library or the value /// IntPtr.Zero. /// </summary> private static IntPtr _SQLiteNativeModuleHandle = IntPtr.Zero; #endregion ///////////////////////////////////////////////////////////////////////// /// <summary> /// Determines the base file name (without any directory information) /// for the native SQLite library to be pre-loaded by this class. /// </summary> /// <returns> /// The base file name for the native SQLite library to be pre-loaded by /// this class -OR- null if its value cannot be determined. /// </returns> internal static string GetNativeLibraryFileNameOnly() { string fileNameOnly = GetSettingValue( "PreLoadSQLite_LibraryFileNameOnly", null); if (fileNameOnly != null) return fileNameOnly; return SQLITE_DLL; /* COMPAT */ } ///////////////////////////////////////////////////////////////////////// /// <summary> /// Searches for the native SQLite library in the directory containing /// the assembly currently being executed as well as the base directory /// for the current application domain. /// </summary> |
︙ | ︙ | |||
860 861 862 863 864 865 866 867 868 869 870 871 872 873 | { if (GetSettingValue( "PreLoadSQLite_NoSearchForDirectory", null) != null) { return false; /* DISABLED */ } // // NOTE: Build the list of base directories and processor/platform // names. These lists will be used to help locate the native // SQLite core library (or interop assembly) to pre-load into // this process. // string[] directories = { | > > > > > > > > > | 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 | { if (GetSettingValue( "PreLoadSQLite_NoSearchForDirectory", null) != null) { return false; /* DISABLED */ } // // NOTE: Determine the base file name for the native SQLite library. // If this is not known by this class, we cannot continue. // string fileNameOnly = GetNativeLibraryFileNameOnly(); if (fileNameOnly == null) return false; // // NOTE: Build the list of base directories and processor/platform // names. These lists will be used to help locate the native // SQLite core library (or interop assembly) to pre-load into // this process. // string[] directories = { |
︙ | ︙ | |||
888 889 890 891 892 893 894 | foreach (string subDirectory in subDirectories) { if (subDirectory == null) continue; string fileName = FixUpDllFileName(MaybeCombinePath( | | > | 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 | foreach (string subDirectory in subDirectories) { if (subDirectory == null) continue; string fileName = FixUpDllFileName(MaybeCombinePath( MaybeCombinePath(directory, subDirectory), fileNameOnly)); // // NOTE: If the SQLite DLL file exists, return success. // Prior to returning, set the base directory and // processor architecture to reflect the location // where it was found. // |
︙ | ︙ | |||
978 979 980 981 982 983 984 | /// </returns> private static string FixUpDllFileName( string fileName /* in */ ) { if (!String.IsNullOrEmpty(fileName)) { | < | < < < < | 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 | /// </returns> private static string FixUpDllFileName( string fileName /* in */ ) { if (!String.IsNullOrEmpty(fileName)) { if (HelperMethods.IsWindows()) { if (!fileName.EndsWith(DllFileExtension, StringComparison.OrdinalIgnoreCase)) { return fileName + DllFileExtension; } } |
︙ | ︙ | |||
1062 1063 1064 1065 1066 1067 1068 | #if !NET_COMPACT_20 && TRACE_DETECTION try { // // NOTE: Show that we hit a fairly unusual situation (i.e. // the "wrong" processor architecture was detected). // | | | 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 | #if !NET_COMPACT_20 && TRACE_DETECTION try { // // NOTE: Show that we hit a fairly unusual situation (i.e. // the "wrong" processor architecture was detected). // Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader detected {0}-bit pointer " + "size with processor architecture \"{1}\", using " + "processor architecture \"{2}\" instead...", IntPtr.Size * 8 /* bits */, savedProcessorArchitecture, processorArchitecture)); /* throw */ } |
︙ | ︙ | |||
1091 1092 1093 1094 1095 1096 1097 | try { // // NOTE: The output of the GetSystemInfo function will be // placed here. Only the processor architecture field // is used by this method. // | | | | 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 | try { // // NOTE: The output of the GetSystemInfo function will be // placed here. Only the processor architecture field // is used by this method. // UnsafeNativeMethodsWin32.SYSTEM_INFO systemInfo; // // NOTE: Query the system information via P/Invoke, thus // filling the structure. // UnsafeNativeMethodsWin32.GetSystemInfo(out systemInfo); // // NOTE: Return the processor architecture value as a string. // processorArchitecture = systemInfo.wProcessorArchitecture.ToString(); } |
︙ | ︙ | |||
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 | // // NOTE: If we failed to query the base directory, stop now. // if (baseDirectory == null) return false; // // NOTE: If the native SQLite library exists in the base directory // itself, stop now. // | > > > > > > > > > | | | 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 | // // NOTE: If we failed to query the base directory, stop now. // if (baseDirectory == null) return false; // // NOTE: Determine the base file name for the native SQLite library. // If this is not known by this class, we cannot continue. // string fileNameOnly = GetNativeLibraryFileNameOnly(); if (fileNameOnly == null) return false; // // NOTE: If the native SQLite library exists in the base directory // itself, stop now. // string fileName = FixUpDllFileName(MaybeCombinePath(baseDirectory, fileNameOnly)); if (File.Exists(fileName)) return false; // // NOTE: If the specified processor architecture is null, use the // default. |
︙ | ︙ | |||
1238 1239 1240 1241 1242 1243 1244 | return false; // // NOTE: Build the full path and file name for the native SQLite // library using the processor architecture name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( | | | 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 | return false; // // NOTE: Build the full path and file name for the native SQLite // library using the processor architecture name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( baseDirectory, processorArchitecture), fileNameOnly)); // // NOTE: If the file name based on the processor architecture name // is not found, try using the associated platform name. // if (!File.Exists(fileName)) { |
︙ | ︙ | |||
1263 1264 1265 1266 1267 1268 1269 | return false; // // NOTE: Build the full path and file name for the native SQLite // library using the platform name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( | | | | > | | 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 | return false; // // NOTE: Build the full path and file name for the native SQLite // library using the platform name. // fileName = FixUpDllFileName(MaybeCombinePath(MaybeCombinePath( baseDirectory, platformName), fileNameOnly)); // // NOTE: If the file does not exist, skip trying to load it. // if (!File.Exists(fileName)) return false; } try { #if !NET_COMPACT_20 && TRACE_PRELOAD try { // // NOTE: Show exactly where we are trying to load the native // SQLite library from. // Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader is trying to load native " + "SQLite library \"{0}\"...", fileName)); /* throw */ } catch { // do nothing. } #endif // // NOTE: Attempt to load the native library. This will either // return a valid native module handle, return IntPtr.Zero, // or throw an exception. This must use the appropriate // P/Invoke method for the current operating system. // nativeModuleFileName = fileName; nativeModuleHandle = NativeLibraryHelper.LoadLibrary(fileName); return (nativeModuleHandle != IntPtr.Zero); } #if !NET_COMPACT_20 && TRACE_PRELOAD catch (Exception e) #else catch (Exception) |
︙ | ︙ | |||
1321 1322 1323 1324 1325 1326 1327 | int lastError = Marshal.GetLastWin32Error(); /* throw */ // // NOTE: Show where we failed to load the native SQLite // library from along with the Win32 error code and // exception information. // | | | 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 | int lastError = Marshal.GetLastWin32Error(); /* throw */ // // NOTE: Show where we failed to load the native SQLite // library from along with the Win32 error code and // exception information. // Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "Native library pre-loader failed to load native " + "SQLite library \"{0}\" (getLastError = {1}): {2}", fileName, lastError, e)); /* throw */ } catch { |
︙ | ︙ | |||
1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 | // // NOTE: On the .NET Compact Framework, the native interop assembly must // be used because it provides several workarounds to .NET Compact // Framework limitations important for proper operation of the core // System.Data.SQLite functionality (e.g. being able to bind // parameters and handle column values of types Int64 and Double). // internal const string SQLITE_DLL = "SQLite.Interop.100.dll"; #elif SQLITE_STANDARD // // NOTE: Otherwise, if the standard SQLite library is enabled, use it. // internal const string SQLITE_DLL = "sqlite3"; #elif USE_INTEROP_DLL | > > > > | > > > > | 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 | // // NOTE: On the .NET Compact Framework, the native interop assembly must // be used because it provides several workarounds to .NET Compact // Framework limitations important for proper operation of the core // System.Data.SQLite functionality (e.g. being able to bind // parameters and handle column values of types Int64 and Double). // #if SQLITE_STANDARD_LIBRARY_NAME internal const string SQLITE_DLL = "sqlite3"; #else internal const string SQLITE_DLL = "SQLite.Interop.100.dll"; #endif #elif SQLITE_STANDARD // // NOTE: Otherwise, if the standard SQLite library is enabled, use it. // internal const string SQLITE_DLL = "sqlite3"; #elif USE_INTEROP_DLL // // NOTE: Otherwise, if the native SQLite interop assembly is enabled, // use it. // #if SQLITE_STANDARD_LIBRARY_NAME internal const string SQLITE_DLL = "sqlite3"; #else internal const string SQLITE_DLL = "SQLite.Interop.dll"; #endif #else // // NOTE: Finally, assume that the mixed-mode assembly is being used. // internal const string SQLITE_DLL = "System.Data.SQLite.dll"; #endif |
︙ | ︙ | |||
2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 | public long estimatedRows; /* Estimated number of rows returned */ public SQLiteIndexFlags idxFlags; /* Mask of SQLITE_INDEX_SCAN_* flags */ public long colUsed; /* Input: Mask of columns used by statement */ } #endif #endregion } ///////////////////////////////////////////////////////////////////////////// #if PLATFORM_COMPACTFRAMEWORK internal abstract class CriticalHandle : IDisposable { private bool _isClosed; protected IntPtr handle; protected CriticalHandle(IntPtr invalidHandleValue) | > > | 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 | public long estimatedRows; /* Estimated number of rows returned */ public SQLiteIndexFlags idxFlags; /* Mask of SQLITE_INDEX_SCAN_* flags */ public long colUsed; /* Input: Mask of columns used by statement */ } #endif #endregion } #endregion ///////////////////////////////////////////////////////////////////////////// #region .NET Compact Framework (only) CriticalHandle Class #if PLATFORM_COMPACTFRAMEWORK internal abstract class CriticalHandle : IDisposable { private bool _isClosed; protected IntPtr handle; protected CriticalHandle(IntPtr invalidHandleValue) |
︙ | ︙ | |||
2981 2982 2983 2984 2985 2986 2987 | public abstract bool IsInvalid { get; } } | < > | 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 | public abstract bool IsInvalid { get; } } #endif #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteConnectionHandle Class // Handles the unmanaged database pointer, and provides finalization // support for it. internal sealed class SQLiteConnectionHandle : CriticalHandle |
︙ | ︙ | |||
3046 3047 3048 3049 3050 3051 3052 | /////////////////////////////////////////////////////////////////////// private SQLiteConnectionHandle(bool ownHandle) : base(IntPtr.Zero) { #if COUNT_HANDLE if (ownHandle) | | | 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 | /////////////////////////////////////////////////////////////////////// private SQLiteConnectionHandle(bool ownHandle) : base(IntPtr.Zero) { #if COUNT_HANDLE if (ownHandle) Interlocked.Increment(ref DebugData.connectionCount); #endif } /////////////////////////////////////////////////////////////////////// protected override bool ReleaseHandle() { |
︙ | ︙ | |||
3078 3079 3080 3081 3082 3083 3084 | if (localHandle != IntPtr.Zero) SQLiteBase.CloseConnection(this, localHandle); #endif #if !NET_COMPACT_20 && TRACE_HANDLE try { | | | < | | 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 | if (localHandle != IntPtr.Zero) SQLiteBase.CloseConnection(this, localHandle); #endif #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "CloseConnection: {0}", localHandle)); /* throw */ } catch { } #endif #else lock (syncRoot) { if (handle != IntPtr.Zero) { SQLiteBase.CloseConnection(this, handle); SetHandle(IntPtr.Zero); } } #endif #if COUNT_HANDLE Interlocked.Decrement(ref DebugData.connectionCount); #endif #if DEBUG return true; #endif } #if !NET_COMPACT_20 && TRACE_HANDLE catch (SQLiteException e) #else catch (SQLiteException) #endif { #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "CloseConnection: {0}, exception: {1}", handle, e)); /* throw */ } catch { } |
︙ | ︙ | |||
3144 3145 3146 3147 3148 3149 3150 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { | | < | 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { return Interlocked.Decrement(ref DebugData.connectionCount); } #endif /////////////////////////////////////////////////////////////////////// public bool OwnHandle { |
︙ | ︙ | |||
3245 3246 3247 3248 3249 3250 3251 | /////////////////////////////////////////////////////////////////////// private SQLiteStatementHandle() : base(IntPtr.Zero) { #if COUNT_HANDLE | | < | | < | | 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 | /////////////////////////////////////////////////////////////////////// private SQLiteStatementHandle() : base(IntPtr.Zero) { #if COUNT_HANDLE Interlocked.Increment(ref DebugData.statementCount); #endif } /////////////////////////////////////////////////////////////////////// protected override bool ReleaseHandle() { try { #if !PLATFORM_COMPACTFRAMEWORK IntPtr localHandle = Interlocked.Exchange( ref handle, IntPtr.Zero); if (localHandle != IntPtr.Zero) SQLiteBase.FinalizeStatement(cnn, localHandle); #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "FinalizeStatement: {0}", localHandle)); /* throw */ } catch { } #endif #else lock (syncRoot) { if (handle != IntPtr.Zero) { SQLiteBase.FinalizeStatement(cnn, handle); SetHandle(IntPtr.Zero); } } #endif #if COUNT_HANDLE Interlocked.Decrement(ref DebugData.statementCount); #endif #if DEBUG return true; #endif } #if !NET_COMPACT_20 && TRACE_HANDLE catch (SQLiteException e) #else catch (SQLiteException) #endif { #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "FinalizeStatement: {0}, exception: {1}", handle, e)); /* throw */ } catch { } |
︙ | ︙ | |||
3332 3333 3334 3335 3336 3337 3338 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { | | < | 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { return Interlocked.Decrement(ref DebugData.statementCount); } #endif /////////////////////////////////////////////////////////////////////// public override bool IsInvalid { |
︙ | ︙ | |||
3418 3419 3420 3421 3422 3423 3424 | /////////////////////////////////////////////////////////////////////// private SQLiteBackupHandle() : base(IntPtr.Zero) { #if COUNT_HANDLE | | < | | < | | 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 | /////////////////////////////////////////////////////////////////////// private SQLiteBackupHandle() : base(IntPtr.Zero) { #if COUNT_HANDLE Interlocked.Increment(ref DebugData.backupCount); #endif } /////////////////////////////////////////////////////////////////////// protected override bool ReleaseHandle() { try { #if !PLATFORM_COMPACTFRAMEWORK IntPtr localHandle = Interlocked.Exchange( ref handle, IntPtr.Zero); if (localHandle != IntPtr.Zero) SQLiteBase.FinishBackup(cnn, localHandle); #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "FinishBackup: {0}", localHandle)); /* throw */ } catch { } #endif #else lock (syncRoot) { if (handle != IntPtr.Zero) { SQLiteBase.FinishBackup(cnn, handle); SetHandle(IntPtr.Zero); } } #endif #if COUNT_HANDLE Interlocked.Decrement(ref DebugData.backupCount); #endif #if DEBUG return true; #endif } #if !NET_COMPACT_20 && TRACE_HANDLE catch (SQLiteException e) #else catch (SQLiteException) #endif { #if !NET_COMPACT_20 && TRACE_HANDLE try { Trace.WriteLine(HelperMethods.StringFormat( CultureInfo.CurrentCulture, "FinishBackup: {0}, exception: {1}", handle, e)); /* throw */ } catch { } |
︙ | ︙ | |||
3505 3506 3507 3508 3509 3510 3511 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { | | < | 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 | } /////////////////////////////////////////////////////////////////////// #if COUNT_HANDLE public int WasReleasedOk() { return Interlocked.Decrement(ref DebugData.backupCount); } #endif /////////////////////////////////////////////////////////////////////// public override bool IsInvalid { |
︙ | ︙ |
Changes to Targets/SQLite.NET.Settings.targets.
︙ | ︙ | |||
338 339 340 341 342 343 344 345 346 347 348 349 350 351 | standard DLL (i.e. "sqlite3.dll")? By default, this is disabled. This property is mutually exclusive with the "UseInteropDll" one, above. This should always be disabled in the project file that builds the NetModule target. --> <UseSqliteStandard Condition="'$(UseSqliteStandard)' == ''">false</UseSqliteStandard> <!-- NOTE: Is the project being built to support the .NET Compact Framework? --> <IsCompactFramework Condition="'$(IsCompactFramework)' == ''">false</IsCompactFramework> <!-- NOTE: Emit an AssemblyFlags attribute that includes the Retargetable | > > > > > > > > > | 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | standard DLL (i.e. "sqlite3.dll")? By default, this is disabled. This property is mutually exclusive with the "UseInteropDll" one, above. This should always be disabled in the project file that builds the NetModule target. --> <UseSqliteStandard Condition="'$(UseSqliteStandard)' == ''">false</UseSqliteStandard> <!-- NOTE: For interaction with the native SQLite implementation, use the standard DLL file name (i.e. "sqlite3.dll") even when compiled to use the interop DLL?? By default, this is disabled. This should always be disabled in the project file that builds the NetModule target. --> <UseSqliteStandardLibraryName Condition="'$(UseSqliteStandardLibraryName)' == ''">false</UseSqliteStandardLibraryName> <!-- NOTE: Is the project being built to support the .NET Compact Framework? --> <IsCompactFramework Condition="'$(IsCompactFramework)' == ''">false</IsCompactFramework> <!-- NOTE: Emit an AssemblyFlags attribute that includes the Retargetable |
︙ | ︙ |
Changes to Tests/backup.eagle.
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | for {set i 0} {$i < [llength $params(pages)]} {incr i} { set pages [lindex $params(pages) $i] set callback [lindex $params(callbacks) $i] runTest {test [appendArgs backup-1. $i] {BackupDatabase method} -setup { setupDb [set fileName(1) :memory:] "" "" "" "" "" \ false false false true memDb setupDb [set fileName(2) [appendArgs backup-1. $i .db]] } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName(2)] sql execute $memDb { CREATE TABLE t1(x TEXT); } | > > > > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | for {set i 0} {$i < [llength $params(pages)]} {incr i} { set pages [lindex $params(pages) $i] set callback [lindex $params(callbacks) $i] runTest {test [appendArgs backup-1. $i] {BackupDatabase method} -setup { setupDb [set fileName(1) :memory:] "" "" "" "" "" \ false false false true memDb useLegacyDbPageAndCacheSizes memDb setupDb [set fileName(2) [appendArgs backup-1. $i .db]] useLegacyDbPageAndCacheSizes db } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName(2)] sql execute $memDb { CREATE TABLE t1(x TEXT); } |
︙ | ︙ |
Changes to Tests/basic.eagle.
︙ | ︙ | |||
403 404 405 406 407 408 409 | } } cleanupDb $fileName unset -nocomplain result count interval savedCount savedInterval results \ errors code dataSource id db fileName | | | | 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 | } } cleanupDb $fileName unset -nocomplain result count interval savedCount savedInterval results \ errors code dataSource id db fileName } -constraints {eagle command.object windows monoBug28 command.sql compile.DATA\ SQLite System.Data.SQLite compileCSharp} -match regexp -result {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}} ############################################################################### runTest {test data-1.8 {properly closed database file (non-query)} -setup { set fileName data-1.8.db } -body { |
︙ | ︙ | |||
1112 1113 1114 1115 1116 1117 1118 | # The basic problem here is that the Parse [and TryParse] methods of # the DateTime structure seem to always return local time, even when # string value clearly indicates otherwise (i.e. the trailing "Z", # indicating UTC). # expr {round([object invoke System.Data.SQLite.SQLiteConvert ToUnixEpoch \ "2012-01-01 12:00:00Z"])} | | > | 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 | # The basic problem here is that the Parse [and TryParse] methods of # the DateTime structure seem to always return local time, even when # string value clearly indicates otherwise (i.e. the trailing "Z", # indicating UTC). # expr {round([object invoke System.Data.SQLite.SQLiteConvert ToUnixEpoch \ "2012-01-01 12:00:00Z"])} } -constraints {eagle command.object monoBug42 System.Data.SQLite} -result \ {1325390400}} ############################################################################### runTest {test data-1.21 {SQLiteConvert ToUnixEpoch (Local)} -body { # # NOTE: At first, the test result here may not seem correct; however, the # same result can be seen by compiling and running the following C# |
︙ | ︙ | |||
1682 1683 1684 1685 1686 1687 1688 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ | | | 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ [list [getDbDefaultPageSize] 1073741823 0 2 [getDbDefaultCacheSize] delete 0]} ############################################################################### runTest {test data-1.34 {SQLiteConnection.Open with SetDefaults=True} -setup { setupDb [set fileName data-1.34.db] "" "" "" "" SetDefaults=True } -body { set result [list] |
︙ | ︙ | |||
1706 1707 1708 1709 1710 1711 1712 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ | | | 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ [list [getDbDefaultPageSize] 1073741823 0 2 [getDbDefaultCacheSize] delete 0]} ############################################################################### runTest {test data-1.35 {SQLiteConnection.Open without SetDefaults} -setup { setupDb [set fileName data-1.35.db] } -body { set result [list] |
︙ | ︙ | |||
1730 1731 1732 1733 1734 1735 1736 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ | | | 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 | set result } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ [list [getDbDefaultPageSize] 1073741823 0 2 [getDbDefaultCacheSize] delete 0]} ############################################################################### runTest {test data-1.36 {SQLiteConnection.Open with PRAGMA overrides} -setup { # # NOTE: Attempt to open a connection with all available PRAGMA settings # set to non-default values in the connection string. |
︙ | ︙ | |||
1822 1823 1824 1825 1826 1827 1828 | $directory(temp)] setupDb [set fileName data-1.37.db] "" "" "" "" "" false false false false sql execute $db "CREATE TABLE t1(x NOT NULL);" for {set i 1} {$i < 100} {incr i} { | | > | > | 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 | $directory(temp)] setupDb [set fileName data-1.37.db] "" "" "" "" "" false false false false sql execute $db "CREATE TABLE t1(x NOT NULL);" for {set i 1} {$i < 100} {incr i} { sql execute $db "INSERT INTO t1 (x) VALUES(?);" \ [list param1 String [expr {randstr(1024)}]] } set found(data) [expr \ {[llength [file list $directory(data) $fileName]] == 1}] set t [object create -alias Thread threadStart] sql execute $db "BEGIN TRANSACTION;"; $t Start for {set i 1} {$i < 1000} {incr i} { # # NOTE: Execute a query that should force the creation of a temporary file # for its statement journal. # sql execute $db "UPDATE t1 SET x = ?;" \ [list param1 String [expr {randstr(1024)}]] # # NOTE: Give the other thread some time to notice the temporary file. # after [expr {int(rand() * 1000)}] # |
︙ | ︙ | |||
2502 2503 2504 2505 2506 2507 2508 | [list param1 DateTime [set dateTime [object invoke DateTime Parse \ "2000.02.29 13:59:58.1234567Z"]]]] [sql execute -execute reader \ -format list $db "SELECT x FROM t1;"] } -cleanup { cleanupDb $fileName unset -nocomplain dateTime db fileName | | | | 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 | [list param1 DateTime [set dateTime [object invoke DateTime Parse \ "2000.02.29 13:59:58.1234567Z"]]]] [sql execute -execute reader \ -format list $db "SELECT x FROM t1;"] } -cleanup { cleanupDb $fileName unset -nocomplain dateTime db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {1 630874007980000000}} ############################################################################### runTest {test data-1.54 {bind function to a connection} -setup { set fileName data-1.54.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
2651 2652 2653 2654 2655 2656 2657 | runTest {test data-1.56 {totype extension} -setup { setupDb [set fileName data-1.56.db] } -body { set connection [getDbConnection] set result [list] $connection EnableExtensions true | > | > | 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 | runTest {test data-1.56 {totype extension} -setup { setupDb [set fileName data-1.56.db] } -body { set connection [getDbConnection] set result [list] $connection EnableExtensions true $connection LoadExtension \ [getNativeLibraryFileName null] sqlite3_totype_init lappend result [sql execute -execute scalar $db "SELECT tointeger('1');"] lappend result [sql execute -execute scalar $db "SELECT tointeger('1x');"] lappend result [sql execute -execute scalar $db "SELECT toreal('1.01');"] lappend result [sql execute -execute scalar $db "SELECT toreal('1.0x');"] set result |
︙ | ︙ | |||
2682 2683 2684 2685 2686 2687 2688 | } -body { unset -nocomplain pattern result set connection [getDbConnection] set result(1) [list] $connection EnableExtensions true | > | > | 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 | } -body { unset -nocomplain pattern result set connection [getDbConnection] set result(1) [list] $connection EnableExtensions true $connection LoadExtension \ [getNativeLibraryFileName null] sqlite3_regexp_init set pattern(1) {^\d+ [A-Z]{1,3}$}; # valid set pattern(2) {^\d+ [C]($}; # invalid lappend result(1) [catch { sql execute -execute scalar $db "SELECT REGEXP('$pattern(1)', '1 AB');" } result(2)] $result(2) |
︙ | ︙ | |||
2780 2781 2782 2783 2784 2785 2786 | "---- largest free SQLite heap block... " $nLargest " bytes\n"] lappend result [list $code $nFree $resetOk $nLargest] } -cleanup { cleanupDb $fileName unset -nocomplain nLargest resetOk nFree code result db fileName | | > | > | 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 | "---- largest free SQLite heap block... " $nLargest " bytes\n"] lappend result [list $code $nFree $resetOk $nLargest] } -cleanup { cleanupDb $fileName unset -nocomplain nLargest resetOk nFree code result db fileName } -constraints {eagle command.object windows monoBug28 configuration.Release\ command.sql compile.DATA SQLite System.Data.SQLite} -match regexp -result \ {^\{Busy 0 False 0\} \{Busy \d+ False 0\} \{Ok 0 True \d+\}$}} ############################################################################### runTest {test data-1.59 {percentile extension} -setup { setupDb [set fileName data-1.59.db] } -body { set connection [getDbConnection] set result [list] $connection EnableExtensions true $connection LoadExtension \ [getNativeLibraryFileName null] sqlite3_percentile_init lappend result [sql execute $db "CREATE TABLE t1(x);"] lappend result [sql execute $db "INSERT INTO t1 VALUES(1),(2),(3),(4);"] lappend result [sql execute $db "SELECT percentile(x,25) FROM t1;"] lappend result [sql execute -execute scalar $db \ "SELECT percentile(x,25) FROM t1;"] |
︙ | ︙ | |||
3099 3100 3101 3102 3103 3104 3105 | file size [file join [getDatabaseDirectory] $fileName] } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ | | | 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 | file size [file join [getDatabaseDirectory] $fileName] } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ [expr {[getDbDefaultPageSize] * 2}]} ############################################################################### runTest {test data-1.67 {SQLiteConnection.SetChunkSize method} -setup { setupDb [set fileName data-1.67.db] } -body { set connection [getDbConnection] |
︙ | ︙ | |||
3224 3225 3226 3227 3228 3229 3230 | runTest {test data-1.71 {fts5 extension} -setup { setupDb [set fileName data-1.71.db] } -body { set connection [getDbConnection] set result [list] $connection EnableExtensions true | > | > | 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 | runTest {test data-1.71 {fts5 extension} -setup { setupDb [set fileName data-1.71.db] } -body { set connection [getDbConnection] set result [list] $connection EnableExtensions true $connection LoadExtension \ [getNativeLibraryFileName null] sqlite3_fts5_init lappend result [sql execute -execute scalar $db "SELECT fts5_source_id();"] lappend result [sql execute -execute scalar $db \ "CREATE VIRTUAL TABLE t1 USING fts5(x, prefix=\"1\");"] foreach x [list cat dog horse house] { |
︙ | ︙ | |||
3934 3935 3936 3937 3938 3939 3940 | INSERT INTO big (json) VALUES('{"a" : [8, 9.1, true, false, null, "y"]}'); } set connection [getDbConnection] set result [list] $connection EnableExtensions true | > | > | 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 | INSERT INTO big (json) VALUES('{"a" : [8, 9.1, true, false, null, "y"]}'); } set connection [getDbConnection] set result [list] $connection EnableExtensions true $connection LoadExtension \ [getNativeLibraryFileName null] sqlite3_json_init lappend result [sql execute -execute scalar $db \ {SELECT json('{ "this" : "is", "a": [ "test" ] }');}] lappend result [sql execute -execute reader -format list $db \ "SELECT rowid, json_type(json) FROM big;"] |
︙ | ︙ | |||
4049 4050 4051 4052 4053 4054 4055 | } lappend result [sql execute -execute scalar $db { PRAGMA page_size; }] lappend result [sql execute $db { | | | | 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 | } lappend result [sql execute -execute scalar $db { PRAGMA page_size; }] lappend result [sql execute $db { PRAGMA page_size=8192; }] lappend result [sql execute $db { VACUUM; }] lappend result [sql execute -execute scalar $db { PRAGMA page_size; }] } -cleanup { cleanupDb $fileName unset -nocomplain result db fileName } -constraints \ {eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \ [list [getDbDefaultPageSize] -1 1 8192]} ############################################################################### reportSQLiteResources $test_channel ############################################################################### runSQLiteTestFilesEpilogue runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/stress.eagle.
︙ | ︙ | |||
235 236 237 238 239 240 241 | } } } ############################################################################# proc useMem { ptr size } { | | | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | } } } ############################################################################# proc useMem { ptr size } { if {[isWindows] && ![isMono]} then { # # HACK: The type signature of the ZeroMemory method changed as of the # .NET Framework 4.5. The second argument went from being of # type UInt to type UIntPtr. # if {[haveConstraint dotNet40] && \ [haveConstraint dotNet45OrHigher]} then { |
︙ | ︙ |
Changes to Tests/thread.eagle.
︙ | ︙ | |||
454 455 456 457 458 459 460 | [collectGarbage $test_channel [expr {$count(1) * 1000}] false] \ [getSQLiteHandleCounts $test_channel] \ [reportSQLiteResources $test_channel] } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | > | | | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | [collectGarbage $test_channel [expr {$count(1) * 1000}] false] \ [getSQLiteHandleCounts $test_channel] \ [reportSQLiteResources $test_channel] } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -time true -constraints {eagle command.object monoBug28 monoCrash211\ monoCrash42 command.sql compile.DATA SQLite System.Data.SQLite compileCSharp} \ -match regexp -result [appendArgs "^Ok\ System#CodeDom#Compiler#CompilerResults#\\d+ \\{\\} 0 \\{\\d+ \\d+ " $count(1) \ "\\} \\{\\} \\{" $handle_counts "\\} " $memory_used \$]} ############################################################################### unset -nocomplain count ############################################################################### |
︙ | ︙ |
Changes to Tests/tkt-17045010df.eagle.
︙ | ︙ | |||
22 23 24 25 26 27 28 29 | runTest {test tkt-17045010df-1.1 {EnableExtensions & LoadExtension} -setup { setupDb [set fileName tkt-17045010df-1.1.db] } -body { set connection [getDbConnection] lappend result [catchAndReturn {$connection EnableExtensions false}] lappend result [catchAndReturn {$connection LoadExtension \ | > | > | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | runTest {test tkt-17045010df-1.1 {EnableExtensions & LoadExtension} -setup { setupDb [set fileName tkt-17045010df-1.1.db] } -body { set connection [getDbConnection] lappend result [catchAndReturn {$connection EnableExtensions false}] lappend result [catchAndReturn {$connection LoadExtension \ [getNativeLibraryFileName null] interop_test_extension_init}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test1');"}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test1', '1234');"}] lappend result [catchAndReturn {$connection EnableExtensions true}] lappend result [catchAndReturn {$connection LoadExtension \ [getNativeLibraryFileName null] interop_test_extension_init}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test2');"}] lappend result [catchAndReturn {sql execute -execute scalar $db \ "SELECT interopTest('test2', '5678');"}] set result |
︙ | ︙ |
Changes to Tests/tkt-343d392b51.eagle.
︙ | ︙ | |||
429 430 431 432 433 434 435 | } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName; unset -nocomplain db fileName cleanupDb $otherFileName unset -nocomplain result code results errors i sql otherTable otherDbName \ otherDataSource dataSource id otherFileName | | | | | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 | } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName; unset -nocomplain db fileName cleanupDb $otherFileName unset -nocomplain result code results errors i sql otherTable otherDbName \ otherDataSource dataSource id otherFileName } -constraints {eagle command.object monoBug28 monoBug211 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-393d954be0.eagle.
︙ | ︙ | |||
54 55 56 57 58 59 60 | catch {object invoke System.Data.SQLite.SQLiteConnection ConnectionPool null} unset -nocomplain db fileName exists counts openCount closeCount totalCount \ nullPool } -constraints {eagle command.object monoBug28 buildConfiguration.Debug\ command.sql compile.DATA SQLite System.Data.SQLite} -match regexp -result \ [string map [list \n \r\n] {^True False \{\} 0 0 0\ | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | catch {object invoke System.Data.SQLite.SQLiteConnection ConnectionPool null} unset -nocomplain db fileName exists counts openCount closeCount totalCount \ nullPool } -constraints {eagle command.object monoBug28 buildConfiguration.Debug\ command.sql compile.DATA SQLite System.Data.SQLite} -match regexp -result \ [string map [list \n \r\n] {^True False \{\} 0 0 0\ \{Remove\(".*?[/\\]tkt-393d954be0-1\.1\.db",\ 100, 0\) Add\(".*?[/\\]tkt-393d954be0-1\.1\.db", -?\d+, 0\) GetCounts\("tkt-393d954be0-1\.1\.db", , 0, 0, 0\) ClearPool\("tkt-393d954be0-1\.1\.db"\) ClearAllPools\(\) \}$}]} ############################################################################### |
︙ | ︙ |
Changes to Tests/tkt-47c6fa04d3.eagle.
︙ | ︙ | |||
113 114 115 116 117 118 119 | [expr {$code eq "Ok" ? [catch { object invoke -alias _Dynamic${id}.Test${id} GetDataTable } result] : [set result ""]}] $result [getRowsFromDataTable $result] } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | | | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 | [expr {$code eq "Ok" ? [catch { object invoke -alias _Dynamic${id}.Test${id} GetDataTable } result] : [set result ""]}] $result [getRowsFromDataTable $result] } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -constraints {eagle command.object monoBug211 monoBug40 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0\ System#Data#DataTable#\d+ \{\{\{id 2\} \{min 2\} \{max 3\} \{sum 5\}\} \{\{id\ 2\} \{min 1\} \{max 2\} \{sum 3\}\}\}$}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-4a791e70ab.eagle.
︙ | ︙ | |||
56 57 58 59 60 61 62 | string sql = command.CommandText; /* ObjectDisposedException? */ } } } } } | | | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | string sql = command.CommandText; /* ObjectDisposedException? */ } } } } } }] true true true results errors System.Data.SQLite.dll WarningLevel 0] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName } -constraints {eagle command.object monoBug211 monoBug40 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-5251bd0878.eagle.
︙ | ︙ | |||
64 65 66 67 68 69 70 | unset -nocomplain dataTable dataReader cleanupDb $fileName freeDbConnection unset -nocomplain column row result connection db fileName | | | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | unset -nocomplain dataTable dataReader cleanupDb $fileName freeDbConnection unset -nocomplain column row result connection db fileName } -constraints {eagle command.object monoBug28 monoBug211 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {{ColumnName x} {IsKey True}\ {ColumnName y} {IsKey False}}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-56b42d99c1.eagle.
︙ | ︙ | |||
95 96 97 98 99 100 101 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} TryEnlistInTransaction } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName | | | | | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} TryEnlistInTransaction } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName } -constraints {eagle command.object monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}} ############################################################################### runTest {test tkt-56b42d99c1-1.2 {enlisted transaction isolation} -setup { setupDb [set fileName tkt-56b42d99c1-1.2.db] } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
172 173 174 175 176 177 178 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -constraints {eagle command.object monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}} ############################################################################### runTest {test tkt-56b42d99c1-1.3 {enlisted transaction isolation} -setup { setupDb [set fileName tkt-56b42d99c1-1.3.db] } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
403 404 405 406 407 408 409 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | | | 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -constraints {eagle command.object monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 1$}} ############################################################################### set flags MapIsolationLevels ############################################################################### |
︙ | ︙ | |||
492 493 494 495 496 497 498 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} TryEnlistInTransaction } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName | | | | | 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} TryEnlistInTransaction } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName } -constraints {eagle command.object monoBug28 monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}} ############################################################################### runTest {test tkt-56b42d99c1-1.7 {enlisted transaction isolation} -setup { setupDb [set fileName tkt-56b42d99c1-1.7.db] } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
569 570 571 572 573 574 575 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | | | 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -constraints {eagle command.object monoBug28 monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}} ############################################################################### runTest {test tkt-56b42d99c1-1.8 {enlisted transaction isolation} -setup { setupDb [set fileName tkt-56b42d99c1-1.8.db] } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
800 801 802 803 804 805 806 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName | | | | | 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -constraints {eagle command.object monoBug28 monoBug211 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 1$}} ############################################################################### unset -nocomplain flags ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-58ed318f2f.eagle.
︙ | ︙ | |||
19 20 21 22 23 24 25 | runSQLiteTestPrologue ############################################################################### proc getSettingReadCount { name } { if {[haveConstraint buildConfiguration.Debug] && [catch { object invoke -flags +NonPublic -alias \ | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | runSQLiteTestPrologue ############################################################################### proc getSettingReadCount { name } { if {[haveConstraint buildConfiguration.Debug] && [catch { object invoke -flags +NonPublic -alias \ System.Data.SQLite.DebugData settingReadCounts } settingReadCounts] == 0} then { if {[$settingReadCounts TryGetValue $name value]} then { tputs $::test_channel [appendArgs \ "---- setting \"" $name "\" was read " $value " times\n"] return $value } |
︙ | ︙ |
Changes to Tests/tkt-7714b60d61.eagle.
︙ | ︙ | |||
51 52 53 54 55 56 57 | unset -nocomplain dataTable dataAdapter command freeDbConnection cleanupDb $fileName unset -nocomplain connection db fileName | | | | | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | unset -nocomplain dataTable dataAdapter command freeDbConnection cleanupDb $fileName unset -nocomplain connection db fileName } -constraints {eagle command.object monoBug28 monoBug211 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {{{x 1} y} {{x 2} {y False}}\ {{x 3} {y True}} {{x 4} {y False}} {{x 5} {y True}} {{x 6} {y False}} {{x 7}\ {y True}} {{x 8} {y False}} {{x 9} {y True}}}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-92dbf1229a.eagle.
︙ | ︙ | |||
44 45 46 47 48 49 50 | set result } -cleanup { unset -nocomplain dataTable dataReader cleanupDb $fileName unset -nocomplain column row result db fileName | | | | > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | set result } -cleanup { unset -nocomplain dataTable dataReader cleanupDb $fileName unset -nocomplain column row result db fileName } -constraints {eagle command.object monoBug28 monoBug211 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {{ColumnName x} {IsKey True}\ {ColumnName y} {IsKey True} {ColumnName w} {IsKey False} {ColumnName z} {IsKey\ False}}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-a7d04fb111.eagle.
︙ | ︙ | |||
50 51 52 53 54 55 56 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result \ {635598144000000000 635598144000000000 635598432000000000 True False False}} ############################################################################### runTest {test tkt-a7d04fb111-1.2 {Bind DateTime Local Ticks} -setup { setupDb [set fileName tkt-a7d04fb111-1.2.db] "" Ticks Local \ BindDateTimeWithKind |
︙ | ︙ | |||
86 87 88 89 90 91 92 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result \ {635598144000000000 635597856000000000 635598144000000000 False True False}} ############################################################################### runTest {test tkt-a7d04fb111-1.3 {Bind DateTime Utc ISO8601} -setup { setupDb [set fileName tkt-a7d04fb111-1.3.db] "" ISO8601 Utc \ BindDateTimeWithKind |
︙ | ︙ | |||
122 123 124 125 126 127 128 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | | 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {{2015-02-18 00:00:00Z}\ {2015-02-18 00:00:00Z} {2015-02-18 08:00:00Z} True False False}} ############################################################################### runTest {test tkt-a7d04fb111-1.4 {Bind DateTime Local ISO8601} -setup { setupDb [set fileName tkt-a7d04fb111-1.4.db] "" ISO8601 Local \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
158 159 160 161 162 163 164 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {{2015-02-18 00:00:00}\ {2015-02-17 16:00:00} {2015-02-18 00:00:00} False True False}} ############################################################################### runTest {test tkt-a7d04fb111-1.5 {Bind DateTime Utc JulianDay} -setup { setupDb [set fileName tkt-a7d04fb111-1.5.db] "" JulianDay Utc \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
194 195 196 197 198 199 200 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | > | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {2457071.5 2457071.5 2457071.83\ True False False}} ############################################################################### runTest {test tkt-a7d04fb111-1.6 {Bind DateTime Local JulianDay} -setup { setupDb [set fileName tkt-a7d04fb111-1.6.db] "" JulianDay Local \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
229 230 231 232 233 234 235 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | > | 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {2457071.5 2457071.17 2457071.5\ False True False}} ############################################################################### runTest {test tkt-a7d04fb111-1.7 {Bind DateTime Utc UnixEpoch} -setup { setupDb [set fileName tkt-a7d04fb111-1.7.db] "" UnixEpoch Utc \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
264 265 266 267 268 269 270 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | > | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {1424217600 1424217600\ 1424246400 True False False}} ############################################################################### runTest {test tkt-a7d04fb111-1.8 {Bind DateTime Local UnixEpoch} -setup { setupDb [set fileName tkt-a7d04fb111-1.8.db] "" UnixEpoch Local \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
299 300 301 302 303 304 305 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | > | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 | lappend result [expr {[lindex $result 0] == [lindex $result 1]}] lappend result [expr {[lindex $result 0] == [lindex $result 2]}] lappend result [expr {[lindex $result 1] == [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {1424217600 1424188800\ 1424217600 False True False}} ############################################################################### runTest {test tkt-a7d04fb111-1.9 {Bind DateTime Utc Invariant} -setup { setupDb [set fileName tkt-a7d04fb111-1.9.db] "" InvariantCulture Utc \ BindDateTimeWithKind } -body { |
︙ | ︙ | |||
334 335 336 337 338 339 340 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {2015-02-18T00:00:00.0000000\ 2015-02-18T00:00:00.0000000Z 2015-02-18T08:00:00.0000000Z False False False}} ############################################################################### runTest {test tkt-a7d04fb111-1.10 {Bind DateTime Local Invariant} -setup { setupDb [set fileName tkt-a7d04fb111-1.10.db] "" InvariantCulture Local \ BindDateTimeWithKind |
︙ | ︙ | |||
370 371 372 373 374 375 376 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName | | | | 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 | lappend result [expr {[lindex $result 0] eq [lindex $result 1]}] lappend result [expr {[lindex $result 0] eq [lindex $result 2]}] lappend result [expr {[lindex $result 1] eq [lindex $result 2]}] } -cleanup { cleanupDb $fileName unset -nocomplain result dateTimeValue db fileName } -constraints {eagle command.object monoBug28 monoBug42 command.sql\ compile.DATA SQLite System.Data.SQLite} -result {2015-02-18T00:00:00.0000000\ 2015-02-17T16:00:00.0000000-08:00 2015-02-18T00:00:00.0000000-08:00 False False\ False}} ############################################################################### unset -nocomplain rawDateTimeValue ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/tkt-aba4549801.eagle.
︙ | ︙ | |||
56 57 58 59 60 61 62 | } -cleanup { object invoke System.Data.SQLite.SQLiteConnection remove_Changed $callback catch {object removecallback $callback} unset -nocomplain rows transaction result callback db fileName rename onChanged "" | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | } -cleanup { object invoke System.Data.SQLite.SQLiteConnection remove_Changed $callback catch {object removecallback $callback} unset -nocomplain rows transaction result callback db fileName rename onChanged "" } -constraints {eagle command.object monoBug28 monoBug211 command.sql\ compile.DATA SQLite System.Data.SQLite} -match regexp -result \ {^\{System#Data#SQLite#SQLiteConnection#\d+ Opening \{\} \{\} \{\} \{\}\}\ \{System#Data#SQLite#SQLiteConnection#\d+ Closing \{\} \{\} \{\} \{\}\}\ \{System#Data#SQLite#SQLiteConnection#\d+ Closed \{\} \{\} \{\} \{\}\}\ \{System#Data#SQLite#SQLiteConnection#\d+ ConnectionString \{\} \{\} \{\}\ \{\}\} \{\{\} NewCriticalHandle \{\} \{\} \{\}\ System#Data#SQLite#SQLiteConnectionHandle#\d+\}\ \{System#Data#SQLite#SQLiteConnection#\d+ NewCommand \{\}\ |
︙ | ︙ |
Changes to Tests/tkt-ae5267b863.eagle.
︙ | ︙ | |||
142 143 144 145 146 147 148 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id db fileName | | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id db fileName } -constraints [fixConstraints {eagle command.object monoBug28 monoBug211\ command.sql compile.DATA SQLite System.Data.SQLite !mda compileCSharp\ !defineConstant.System.Data.SQLite.INTEROP_LEGACY_CLOSE}] -match regexp \ -result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to Tests/version.eagle.
︙ | ︙ | |||
1080 1081 1082 1083 1084 1085 1086 | [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ | | | 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 | [file join SQLite.Interop props SQLite.Interop.2012.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2013.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop props SQLite.Interop.2015.props] \ [file join SQLite.Interop src generic interop.h] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite AssemblyInfo.cs] \ [file join System.Data.SQLite SQLite3.cs] \ [file join System.Data.SQLite UnsafeNativeMethods.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ [file join System.Data.SQLite.Linq AssemblyInfo.cs] \ [file join test AssemblyInfo.cs] \ |
︙ | ︙ |
Changes to Tests/vtab.eagle.
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | ############################################################################### package require System.Data.SQLite.Test runSQLiteTestPrologue ############################################################################### runTest {test vtab-1.1 {basic virtual table support} -setup { set fileName vtab-1.1.db } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName] set sql { \ | > > > > > > > > > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | ############################################################################### package require System.Data.SQLite.Test runSQLiteTestPrologue ############################################################################### proc normalizeVtabResult { value } { set result $value if {[string first \r $result] != -1} then { set result [string map [list \r\n \n] $result] } return [string map [list \n " -- "] $result] } ############################################################################### runTest {test vtab-1.1 {basic virtual table support} -setup { set fileName vtab-1.1.db } -body { set id [object invoke Interpreter.GetActive NextId] set dataSource [file join [getDatabaseDirectory] $fileName] set sql { \ |
︙ | ︙ | |||
92 93 94 95 96 97 98 | } }] true true true results errors System.Data.SQLite.dll] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main | | | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | } }] true true true results errors System.Data.SQLite.dll] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} Main } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}]} ############################################################################### runTest {test vtab-1.2.1 {IEnumerable virtual table} -setup { set fileName vtab-1.2.1.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
197 198 199 200 201 202 203 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 | | | | | | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{one two three 4 5\.0 Error\ \{SQL logic error or missing database -- virtual table "t\d+" is\ read-only\}\}$}]} ############################################################################### runTest {test vtab-1.2.2 {IEnumerable virtual table} -setup { set fileName vtab-1.2.2.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
307 308 309 310 311 312 313 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 | | | | | | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{one two three 4 5\.0 Error\ \{SQL logic error or missing database -- virtual table "t\d+" is\ read-only\}\}$}]} ############################################################################### runTest {test vtab-1.3.1 {IEnumerable<T> virtual table} -setup { set fileName vtab-1.3.1.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
415 416 417 418 419 420 421 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList 1 2 3 4 5 | | | | < | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList 1 2 3 4 5 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{1 2 3 4 5 Error \{SQL\ logic error or missing database -- virtual table "t\d+" is read-only\}\}$}]} ############################################################################### runTest {test vtab-1.3.2 {IEnumerable<T> virtual table} -setup { set fileName vtab-1.3.2.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
526 527 528 529 530 531 532 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList 1 2 3 4 5 | | | | < | 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList 1 2 3 4 5 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{1 2 3 4 5 Error \{SQL\ logic error or missing database -- virtual table "t\d+" is read-only\}\}$}]} ############################################################################### runTest {test vtab-1.4 {virtual table function support} -setup { set fileName vtab-1.4.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
777 778 779 780 781 782 783 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList | | | | | < | | 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\{\} b25l \{SQL logic\ error or missing database -- unable to use function Base64 in the requested\ context\} \{SQL logic error or missing database -- no such function:\ Base65\}\}$}]} ############################################################################### runTest {test vtab-1.5 {virtual table function support} -setup { set fileName vtab-1.5.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
1030 1031 1032 1033 1034 1035 1036 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList | | | | < | | | 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\{\} b25l \{SQL logic\ error or missing database -- (?:unable to use function Base64 in the requested\ context|need exactly one argument, got 3)\} \{SQL logic error or missing\ database -- no such function: Base65\}\}$}]} ############################################################################### runTest {test vtab-1.6 {virtual table rename support} -setup { set fileName vtab-1.6.db } -body { set id [object invoke Interpreter.GetActive NextId] |
︙ | ︙ | |||
1209 1210 1211 1212 1213 1214 1215 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList | | | | 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\{\} t\d+ \{\} x\d+\}$}]} ############################################################################### runTest {test vtab-1.7 {virtual table xBestIndex marshalling (1)} -setup { set fileName vtab-1.7.db } -body { |
︙ | ︙ | |||
1351 1352 1353 1354 1355 1356 1357 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 | | | | 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 5 two three one 5\.0\ 4 \{ConstraintUsages is OK\}\}$}]} ############################################################################### runTest {test vtab-1.8 {virtual table xBestIndex marshalling (2)} -setup { set fileName vtab-1.8.db |
︙ | ︙ | |||
1495 1496 1497 1498 1499 1500 1501 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 | | | | 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 5 one three\ \{ConstraintUsages is OK\}\}$}]} ############################################################################### runTest {test vtab-1.9 {IEnumerable virtual table w/large byte array} -setup { set fileName vtab-1.9.db |
︙ | ︙ | |||
1573 1574 1575 1576 1577 1578 1579 | } }] true true true results errors System.Data.SQLite.dll] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetSum | | | | 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 | } }] true true true results errors System.Data.SQLite.dll] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetSum } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -time true -constraints {eagle command.object monoBug28 command.sql\ compile.DATA SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE compileCSharp} -match \ regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 (?:-)?\d+$}]} ############################################################################### runTest {test vtab-1.10 {virtual table xRowId uniqueness} -setup { set fileName vtab-1.10.db } -body { |
︙ | ︙ | |||
1670 1671 1672 1673 1674 1675 1676 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one one two one two two | | | | 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one one two one two two } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{0 4294967296 4294967296\ 8589934592 8589934592 12884901888 12884901888 17179869184 17179869184\ 21474836480 21474836480 25769803776 25769803776\}$}]} ############################################################################### runTest {test vtab-1.11 {IEnumerable virtual table w/object identity} -setup { |
︙ | ︙ | |||
1761 1762 1763 1764 1765 1766 1767 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 | | | | 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 | } }] true true true results errors [list System.Data.SQLite.dll Eagle.dll]] list $code $results \ [expr {[info exists errors] ? $errors : ""}] \ [expr {$code eq "Ok" ? [catch { object invoke _Dynamic${id}.Test${id} GetList one two three 4 5.0 } result] : [set result ""]}] [normalizeVtabResult $result] } -cleanup { cleanupDb $fileName unset -nocomplain result code results errors sql dataSource id fileName } -constraints {eagle command.object monoBug28 command.sql compile.DATA SQLite\ System.Data.SQLite defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE\ compileCSharp} -match regexp -result [normalizeVtabResult {^Ok\ System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{-?\d+ one -?\d+ two -?\d+\ three -?\d+ 4 -?\d+ 5\.0\}$}]} ############################################################################### runTest {test vtab-1.12 {SQLiteIndex managed-to-native-to-managed} -setup { set nConstraint 3; set nOrderBy 3 |
︙ | ︙ | |||
1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 | unset -nocomplain constraintUsage unset -nocomplain orderBy nOrderBy iOrderBy unset -nocomplain constraint nConstraint iConstraint unset -nocomplain pIndex index } -constraints {eagle command.object SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -result {}} ############################################################################### runSQLiteTestEpilogue runTestEpilogue | > > > > | 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 | unset -nocomplain constraintUsage unset -nocomplain orderBy nOrderBy iOrderBy unset -nocomplain constraint nConstraint iConstraint unset -nocomplain pIndex index } -constraints {eagle command.object SQLite System.Data.SQLite\ defineConstant.System.Data.SQLite.INTEROP_VIRTUAL_TABLE} -result {}} ############################################################################### rename normalizeVtabResult "" ############################################################################### runSQLiteTestEpilogue runTestEpilogue |
Changes to lib/System.Data.SQLite/common.eagle.
︙ | ︙ | |||
502 503 504 505 506 507 508 509 510 511 512 513 514 515 | # NOTE: Otherwise, return both the generic POSIX file name and the # Mac OS X file name, since we do not currently have an easy # way to detect which of those platforms we are running on. # return [list libsqlite3.so libsqlite3.dylib] } } proc isBuildAvailable { native directory {varName ""} } { # # NOTE: Build the fully qualified file name for the primary assembly # containing the System.Data.SQLite managed components. It # should be noted that this assembly file may also contain the # native components, if a native build is in use. | > > > > > > > > > > > > > > | 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 | # NOTE: Otherwise, return both the generic POSIX file name and the # Mac OS X file name, since we do not currently have an easy # way to detect which of those platforms we are running on. # return [list libsqlite3.so libsqlite3.dylib] } } proc getNativeLibraryFileName { {default ""} } { set directory [file dirname [getCoreBinaryFileName]] foreach fileNameOnly [getNativeLibraryFileNamesOnly] { set fileName [file join $directory $fileNameOnly] if {[file exists $fileName]} then { return $fileName } } return $default } proc isBuildAvailable { native directory {varName ""} } { # # NOTE: Build the fully qualified file name for the primary assembly # containing the System.Data.SQLite managed components. It # should be noted that this assembly file may also contain the # native components, if a native build is in use. |
︙ | ︙ | |||
1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 | } finally { if {[info exists db]} then { catch {sql close $db} unset -nocomplain db } } } proc extractSystemDataSQLiteExceptionMessage { value } { # # NOTE: If the string conforms to format of the normal exception # error strings, extract and return only the error message # portion itself. # | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 | } finally { if {[info exists db]} then { catch {sql close $db} unset -nocomplain db } } } proc getDbDefaultCacheSize {} { try { set db [sql open -type SQLite {Data Source=:memory:;}] return [sql execute -execute scalar $db "PRAGMA cache_size;"] } finally { if {[info exists db]} then { catch {sql close $db} unset -nocomplain db } } } proc useLegacyDbPageAndCacheSizes { varName } { # # NOTE: Refer to the specified variable (e.g. "db") in the context of our # caller. It contains the database connection handle that will be # used to execute queries used to set the page and cache sizes. # upvar 1 $varName db sql execute $db { PRAGMA page_size = 1024; PRAGMA cache_size = 2000; } return [list \ [sql execute -execute scalar $db "PRAGMA page_size;"] \ [sql execute -execute scalar $db "PRAGMA cache_size;"]] } proc extractSystemDataSQLiteExceptionMessage { value } { # # NOTE: If the string conforms to format of the normal exception # error strings, extract and return only the error message # portion itself. # |
︙ | ︙ | |||
2877 2878 2879 2880 2881 2882 2883 | defineConstant.System.Data.SQLite.COUNT_HANDLE]} then { # # NOTE: Add each critical handle count to the resulting list. # foreach name [list connectionCount statementCount backupCount] { if {[catch { object invoke -flags +NonPublic \ | | | 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 | defineConstant.System.Data.SQLite.COUNT_HANDLE]} then { # # NOTE: Add each critical handle count to the resulting list. # foreach name [list connectionCount statementCount backupCount] { if {[catch { object invoke -flags +NonPublic \ System.Data.SQLite.DebugData $name } value] == 0} then { if {!$quiet} then { tputs $channel [appendArgs \ "---- critical handle count \"" $name "\" is " $value \n] } lappend result $value |
︙ | ︙ | |||
3840 3841 3842 3843 3844 3845 3846 | INTEROP_INCLUDE_CEROD INTEROP_INCLUDE_EXTRA INTEROP_INCLUDE_SEE \ INTEROP_INCLUDE_ZIPVFS INTEROP_JSON1_EXTENSION \ INTEROP_LEGACY_CLOSE INTEROP_LOG INTEROP_PERCENTILE_EXTENSION \ INTEROP_REGEXP_EXTENSION INTEROP_TEST_EXTENSION \ INTEROP_TOTYPE_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \ NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_COMPACT_20 \ PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY RETARGETABLE \ | | | | | 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 | INTEROP_INCLUDE_CEROD INTEROP_INCLUDE_EXTRA INTEROP_INCLUDE_SEE \ INTEROP_INCLUDE_ZIPVFS INTEROP_JSON1_EXTENSION \ INTEROP_LEGACY_CLOSE INTEROP_LOG INTEROP_PERCENTILE_EXTENSION \ INTEROP_REGEXP_EXTENSION INTEROP_TEST_EXTENSION \ INTEROP_TOTYPE_EXTENSION INTEROP_VIRTUAL_TABLE NET_20 NET_35 \ NET_40 NET_45 NET_451 NET_452 NET_46 NET_461 NET_COMPACT_20 \ PLATFORM_COMPACTFRAMEWORK PRELOAD_NATIVE_LIBRARY RETARGETABLE \ SQLITE_STANDARD SQLITE_STANDARD_LIBRARY_NAME THROW_ON_DISPOSED \ TRACE TRACE_CONNECTION TRACE_DETECTION TRACE_HANDLE TRACE_PRELOAD \ TRACE_SHARED TRACE_STATEMENT TRACE_WARNING TRACK_MEMORY_BYTES \ USE_ENTITY_FRAMEWORK_6 USE_INTEROP_DLL USE_PREPARE_V2 WINDOWS] { # # NOTE: Check if the compile-time option is listed in the list of # "define constants" kept track of by the managed assembly. # checkForSQLiteDefineConstant $::test_channel $defineConstant } |
︙ | ︙ |
Changes to readme.htm.
︙ | ︙ | |||
209 210 211 212 213 214 215 216 217 218 219 220 221 222 | <h2><b>Version History</b></h2> <p> <b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> | > > | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | <h2><b>Version History</b></h2> <p> <b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Support compiling and using the interop assembly on Linux and Mac OS X.</li> <li>Support running the test suite under Mono on Linux and Mac OS X.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> |
︙ | ︙ |
Changes to www/build.wiki.
︙ | ︙ | |||
156 157 158 159 160 161 162 | <li><root>\SQLite.Designer\source.extension.vsixmanifest</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2005.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2008.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2010.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2012.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2013.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2015.props</li> | | | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 | <li><root>\SQLite.Designer\source.extension.vsixmanifest</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2005.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2008.vsprops</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2010.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2012.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2013.props</li> <li><root>\SQLite.Interop\props\SQLite.Interop.2015.props</li> <li><root>\SQLite.Interop\src\generic\interop.h</li> <li><root>\System.Data.SQLite\AssemblyInfo.cs</li> <li><root>\System.Data.SQLite\SQLite3.cs</li> <li><root>\System.Data.SQLite\UnsafeNativeMethods.cs</li> <li><root>\System.Data.SQLite.Linq\AssemblyInfo.cs</li> <li><root>\test\AssemblyInfo.cs</li> <li><root>\test\app.config</li> <li><root>\testce\AssemblyInfo.cs</li> |
︙ | ︙ |
Changes to www/news.wiki.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | <title>News</title> <b>Version History</b> <p> <b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> | > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | <title>News</title> <b>Version History</b> <p> <b>1.0.100.0 - April XX, 2016 <font color="red">(release scheduled)</font></b> </p> <ul> <li>Updated to <a href="https://www.sqlite.org/draft/releaselog/3_12_0.html">SQLite 3.12.0</a>.</li> <li>Support compiling and using the interop assembly on Linux and Mac OS X.</li> <li>Support running the test suite under Mono on Linux and Mac OS X.</li> <li>Properly handle NULL values in the "name" column of the results returned by PRAGMA index_info(). Fix for [5251bd0878].</li> <li>For column types that resolve to boolean, recognize case-insensitive prefixes of "True" and "False". Fix for [dbd65441a5].</li> <li>Add NoVerifyTextAffinity connection flag to skip type affinity checking when fetching a column value as a string. Pursuant to [dbd65441a5].</li> <li>The UnixEpoch DateTime format should use Int64 internally, not Int32. <b>** Potentially Incompatible Change **</b></li> <li>Avoid using Path.Combine with null values in the native library pre-loader. Fix for [da685c0bac].</li> <li>Fix the (unsupported) legacy CryptoAPI based codec so that it no longer prevents page size changes.</li> </ul> |
︙ | ︙ |