Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix compilation and test issues with the INTEROP_LEGACY_CLOSE compile-time option. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | legacyClose |
| Files: | files | file ages | folders |
| SHA1: |
a75bb0a659a3e2544f26c68b7df04aaf |
| User & Date: | mistachkin 2013-02-15 04:36:50 |
Context
|
2013-02-15
| ||
| 21:43 | Merge support for the INTEROP_LEGACY_CLOSE compile-time option to trunk. check-in: ec6819f0bf user: mistachkin tags: trunk | |
| 04:36 | Fix compilation and test issues with the INTEROP_LEGACY_CLOSE compile-time option. Closed-Leaf check-in: a75bb0a659 user: mistachkin tags: legacyClose | |
| 01:14 | Add the ability to select the legacy connection closing algorithm at compile-time. check-in: 2f90848c8e user: mistachkin tags: legacyClose | |
Changes
Changes to SQLite.Interop/src/win/interop.c.
418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 |
#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_FINALIZE)
sqlite3InteropDebug("sqlite3_finalize_interop(): sqlite3_finalize(%p, %p) returned %d.\n", db, stmt, ret);
#endif
return ret;
#else
Vdbe *p;
int ret = SQLITE_OK;
p = (Vdbe *)stmt;
if (p)
{
sqlite3 *db = p->db;
if (db != NULL)
|
| |
418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 |
#if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_FINALIZE)
sqlite3InteropDebug("sqlite3_finalize_interop(): sqlite3_finalize(%p, %p) returned %d.\n", db, stmt, ret);
#endif
return ret;
#else
Vdbe *p;
ret = SQLITE_OK;
p = (Vdbe *)stmt;
if (p)
{
sqlite3 *db = p->db;
if (db != NULL)
|
Changes to Tests/common.eagle.
1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 |
# test constraints were enabled for the managed assembly. There
# are some compile-time options that must also have been enabled
# for the interop assembly in order to be effective. For those
# options, it will be assumed that it was enabled for the interop
# assembly if it was enabled for the managed assembly.
#
foreach defineConstant [list CHECK_STATE COUNT_HANDLE INTEROP_CODEC \
INTEROP_DEBUG INTEROP_LOG \
INTEROP_EXTENSION_FUNCTIONS \
INTEROP_TEST_EXTENSION SQLITE_STANDARD \
USE_INTEROP_DLL] {
#
# 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
|
| | |
1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 |
# test constraints were enabled for the managed assembly. There
# are some compile-time options that must also have been enabled
# for the interop assembly in order to be effective. For those
# options, it will be assumed that it was enabled for the interop
# assembly if it was enabled for the managed assembly.
#
foreach defineConstant [list CHECK_STATE COUNT_HANDLE INTEROP_CODEC \
INTEROP_DEBUG INTEROP_LEGACY_CLOSE \
INTEROP_LOG INTEROP_EXTENSION_FUNCTIONS \
INTEROP_TEST_EXTENSION SQLITE_STANDARD \
USE_INTEROP_DLL] {
#
# 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 Tests/tkt-ae5267b863.eagle.
143 144 145 146 147 148 149 150 151 152 153 154 155 156 |
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 monoBug28 command.sql compile.DATA\
SQLite System.Data.SQLite !mda}] -match regexp -result {^Ok\
System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
###############################################################################
runSQLiteTestEpilogue
runTestEpilogue
|
| > | |
143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 |
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 monoBug28 command.sql compile.DATA\
SQLite System.Data.SQLite !mda\
!defineConstant.System.Data.SQLite.INTEROP_LEGACY_CLOSE}] -match regexp \
-result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
###############################################################################
runSQLiteTestEpilogue
runTestEpilogue
|