Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove the 'SQLITE_STANDARD_LIBRARY_NAME' compile-time define. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
822dfd12aa5e759114185ddbd95065d9 |
| User & Date: | mistachkin 2016-03-28 19:26:19 |
Context
|
2016-03-29
| ||
| 18:10 | Update SQLite core library to the 3.12.0 release. check-in: 6b199ba3e1 user: mistachkin tags: trunk | |
|
2016-03-28
| ||
| 19:26 | Remove the 'SQLITE_STANDARD_LIBRARY_NAME' compile-time define. check-in: 822dfd12aa user: mistachkin tags: trunk | |
| 17:06 | Update SQLite core library to the latest trunk. check-in: 7340ecee2f user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteDefineConstants.cs.
136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 |
"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",
#endif
|
< < < < |
136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
"RETARGETABLE",
#endif
#if SQLITE_STANDARD
"SQLITE_STANDARD",
#endif
#if THROW_ON_DISPOSED
"THROW_ON_DISPOSED",
#endif
#if TRACE
"TRACE",
#endif
|
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 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>
|
< < < < < < < < < |
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>
|
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
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 1711 1712 1713 1714 1715 |
//
// 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";
#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";
#endif
#else
//
// NOTE: Finally, assume that the mixed-mode assembly is being used.
//
internal const string SQLITE_DLL = "System.Data.SQLite";
#endif
// This section uses interop calls that also fetch text length to optimize conversion.
// When using the standard dll, we can replace these calls with normal sqlite calls and
// do unoptimized conversions instead afterwards
#region interop added textlength calls
|
< < < | < < < < | < | |
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 |
//
// 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
//
// NOTE: Otherwise, if the native SQLite interop assembly is enabled,
// use it.
//
internal const string SQLITE_DLL = "SQLite.Interop.dll";
#else
//
// NOTE: Finally, assume that the mixed-mode assembly is being used.
//
internal const string SQLITE_DLL = "System.Data.SQLite.dll";
#endif
// This section uses interop calls that also fetch text length to optimize conversion.
// When using the standard dll, we can replace these calls with normal sqlite calls and
// do unoptimized conversions instead afterwards
#region interop added textlength calls
|
Changes to Targets/SQLite.NET.Settings.targets.
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
|
< < < < < < < < < |
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
|
Changes to Tests/version.eagle.
782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 |
[appendArgs \" [string map [list . \\.] $version(full)] \"]
###############################################################################
# UnsafeNativeMethods.cs
###############################################################################
lappend patterns \
[appendArgs \"SQLite.Interop. [format %03d $version(build)] (?:.dll)?\"]
###############################################################################
# System.Data.SQLite.Linq/AssemblyInfo.cs
###############################################################################
lappend patterns \
[appendArgs AssemblyVersion\\(\" [string map [list . \\.] \
|
| |
782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 |
[appendArgs \" [string map [list . \\.] $version(full)] \"]
###############################################################################
# UnsafeNativeMethods.cs
###############################################################################
lappend patterns \
[appendArgs \"SQLite.Interop. [format %03d $version(build)] .dll\"]
###############################################################################
# System.Data.SQLite.Linq/AssemblyInfo.cs
###############################################################################
lappend patterns \
[appendArgs AssemblyVersion\\(\" [string map [list . \\.] \
|
Changes to lib/System.Data.SQLite/common.eagle.
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
....
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
|
}
}
#
# NOTE: Was the managed assembly compiled expecting to deal with the
# standard core library?
#
if {[haveSQLiteDefineConstant SQLITE_STANDARD] || \
[haveSQLiteDefineConstant SQLITE_STANDARD_LIBRARY_NAME]} then {
#
# NOTE: Fallback to returning the native-only standard SQLite library
# file name for the platform.
#
set fileNamesOnly [getNativeLibraryFileNamesOnly]
if {[llength $fileNamesOnly] == 0} then {
................................................................................
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
}
|
|
<
|
|
|
|
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
....
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
|
}
}
#
# NOTE: Was the managed assembly compiled expecting to deal with the
# standard core library?
#
if {[haveSQLiteDefineConstant SQLITE_STANDARD]} then {
#
# NOTE: Fallback to returning the native-only standard SQLite library
# file name for the platform.
#
set fileNamesOnly [getNativeLibraryFileNamesOnly]
if {[llength $fileNamesOnly] == 0} then {
................................................................................
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 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
}
|