System.Data.SQLite
Check-in [a75bb0a659]
Not logged in

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: a75bb0a659a3e2544f26c68b7df04aafeba401e2
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
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to SQLite.Interop/src/win/interop.c.

   418    418   #if defined(INTEROP_DEBUG) && (INTEROP_DEBUG & INTEROP_DEBUG_FINALIZE)
   419    419     sqlite3InteropDebug("sqlite3_finalize_interop(): sqlite3_finalize(%p, %p) returned %d.\n", db, stmt, ret);
   420    420   #endif
   421    421   
   422    422     return ret;
   423    423   #else
   424    424     Vdbe *p;
   425         -  int ret = SQLITE_OK;
          425  +  ret = SQLITE_OK;
   426    426   
   427    427     p = (Vdbe *)stmt;
   428    428     if (p)
   429    429     {
   430    430       sqlite3 *db = p->db;
   431    431   
   432    432       if (db != NULL)

Changes to Tests/common.eagle.

  1752   1752           #       test constraints were enabled for the managed assembly.  There
  1753   1753           #       are some compile-time options that must also have been enabled
  1754   1754           #       for the interop assembly in order to be effective.  For those
  1755   1755           #       options, it will be assumed that it was enabled for the interop
  1756   1756           #       assembly if it was enabled for the managed assembly.
  1757   1757           #
  1758   1758           foreach defineConstant [list CHECK_STATE COUNT_HANDLE INTEROP_CODEC \
  1759         -                                     INTEROP_DEBUG INTEROP_LOG \
  1760         -                                     INTEROP_EXTENSION_FUNCTIONS \
         1759  +                                     INTEROP_DEBUG INTEROP_LEGACY_CLOSE \
         1760  +                                     INTEROP_LOG INTEROP_EXTENSION_FUNCTIONS \
  1761   1761                                        INTEROP_TEST_EXTENSION SQLITE_STANDARD \
  1762   1762                                        USE_INTEROP_DLL] {
  1763   1763             #
  1764   1764             # NOTE: Check if the compile-time option is listed in the list of
  1765   1765             #       "define constants" kept track of by the managed assembly.
  1766   1766             #
  1767   1767             checkForSQLiteDefineConstant $::test_channel $defineConstant

Changes to Tests/tkt-ae5267b863.eagle.

   143    143           object invoke _Dynamic${id}.Test${id} Main
   144    144         } result] : [set result ""]}] $result
   145    145   } -cleanup {
   146    146     cleanupDb $fileName
   147    147   
   148    148     unset -nocomplain result code results errors sql dataSource id db fileName
   149    149   } -constraints [fixConstraints {eagle monoBug28 command.sql compile.DATA\
   150         -SQLite System.Data.SQLite !mda}] -match regexp -result {^Ok\
   151         -System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
          150  +SQLite System.Data.SQLite !mda\
          151  +!defineConstant.System.Data.SQLite.INTEROP_LEGACY_CLOSE}] -match regexp \
          152  +-result {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 \{\}$}}
   152    153   
   153    154   ###############################################################################
   154    155   
   155    156   runSQLiteTestEpilogue
   156    157   runTestEpilogue