System.Data.SQLite

Check-in [2fe91fda63]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Make the per-test connection flag output a little less noisy. Fix a leaked test variable.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2fe91fda63d868e0c55b604ca72bd705eb34853f
User & Date: mistachkin 2015-02-20 19:09:22.098
Context
2015-02-20
19:14
Update the master release archive manifest. check-in: 6fb0f14b81 user: mistachkin tags: trunk
19:09
Make the per-test connection flag output a little less noisy. Fix a leaked test variable. check-in: 2fe91fda63 user: mistachkin tags: trunk
17:22
Permit empty string values for the Password and HexPassword connection string properties. check-in: 7c2c7ba6cf user: mistachkin tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to Externals/Eagle/lib/Eagle1.0/vendor.eagle.
︙︙
240
241
242
243
244
245
246








247
248
249
250
251
252

    #
    # HACK: Prevent the Eagle core test suite infrastructure from checking
    #       test constraints that are time-consuming and/or most likely to
    #       be superfluous to third-party test suites (i.e. those that are
    #       not testing the Eagle core library itself).
    #
    set no(core) 1








  }
}

###############################################################################
############################### END VENDOR CODE ###############################
###############################################################################








>
>
>
>
>
>
>
>







240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260

    #
    # HACK: Prevent the Eagle core test suite infrastructure from checking
    #       test constraints that are time-consuming and/or most likely to
    #       be superfluous to third-party test suites (i.e. those that are
    #       not testing the Eagle core library itself).
    #
    set no(core) 1

    #
    # NOTE: Make the per-test connection flag output a little less noisy.
    #
    set no(emitLocalFlagsIfNone) 1
    set no(emitSharedFlagsIfNone) 1
    set no(emitGlobalFlagsIfNone) 1
    set no(emitCombinedFlagsIfNone) 1
  }
}

###############################################################################
############################### END VENDOR CODE ###############################
###############################################################################
Changes to Tests/common.eagle.
︙︙
1571
1572
1573
1574
1575
1576
1577


















1578
1579
1580
1581
1582
1583
1584

      try {
        return [uplevel 1 [list \
            sql execute -execute $execute -format $format $db $sql]]
      } finally {
        cleanupDb $fileName db false false false
      }
    }



















    proc getConnectionFlags { fileName flags {quiet false} } {
      #
      # NOTE: Figure out which database file name or connection string these
      #       connection flags will actually apply to.  This is not necessary
      #       in quiet mode because this information is only used for logging
      #       and reporting purposes.








>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602

      try {
        return [uplevel 1 [list \
            sql execute -execute $execute -format $format $db $sql]]
      } finally {
        cleanupDb $fileName db false false false
      }
    }

    proc hasNoFlags { varName none } {
      upvar 1 $varName flags

      if {![info exists flags]} then {
        return true
      }

      if {[string length $flags] == 0} then {
        return true
      }

      if {$none && $flags eq "None"} then {
        return true
      }

      return false
    }

    proc getConnectionFlags { fileName flags {quiet false} } {
      #
      # NOTE: Figure out which database file name or connection string these
      #       connection flags will actually apply to.  This is not necessary
      #       in quiet mode because this information is only used for logging
      #       and reporting purposes.
︙︙
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
1640
1641
1642

1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654



1655
1656
1657
1658

1659
1660
1661
1662
1663
1664
1665

      }

      #
      # NOTE: Show (and log) the local connection flags and the associated
      #       data source or file name.
      #
      if {!$quiet} then {



        tputs $::test_channel [appendArgs \
            "---- local connection flags for " $database \
            " are: " [expr {[string length $flags] > 0 ? \
            [appendArgs \" $flags \"] : "<none>"}] \n]

      }

      #
      # NOTE: Show (and log) the shared connection flags.
      #
      if {!$quiet} then {
        if {[catch {
          object invoke System.Data.SQLite.SQLiteConnection SharedFlags
        } sharedFlags] == 0} then {



          tputs $::test_channel [appendArgs \
              "---- shared connection flags for " $database \
              " are: " [expr {[string length $sharedFlags] > 0 && \
              $sharedFlags ne "None" ? \
              [appendArgs \" $sharedFlags \"] : "<none>"}] \n]

        } else {


          tputs $::test_channel [appendArgs \
              "---- shared connection flags for " $database \
              " are: <unavailable>\n"]

        }
      }

      #
      # NOTE: If there are any global (per test run) connection flags currently
      #       set, use them now (i.e. by combining them with the ones for this
      #       connection).
      #
      if {[info exists ::connection_flags] && \
          [string length $::connection_flags] > 0} then {
        #
        # NOTE: Show (and log) the detected global connection flags.
        #
        if {!$quiet} then {



          tputs $::test_channel [appendArgs \
              "---- global connection flags detected: " \
              [expr {[info exists ::connection_flags] && \
              [string length $::connection_flags] > 0 ? \
              [appendArgs \" $::connection_flags \"] : "<none>"}] \n]

        }

        #
        # NOTE: Combine and/or replace the connection flags and then show the
        #       new value.
        #
        set flags [combineFlags $flags $::connection_flags]

        #
        # NOTE: Show (and log) the new effective connection flags.
        #
        if {!$quiet} then {



          tputs $::test_channel [appendArgs \
              "---- combined connection flags for " $database \
              " are: " [expr {[string length $flags] > 0 ? \
              [appendArgs \" $flags \"] : "<none>"}] \n]

        }
      }

      return $flags
    }

    proc getFlagsProperty { {flags ""} {quiet false} } {








>
>
>
|
|
|
|
>









>
>
>
|
|
|
<
|
>

>
>
|
|
|
>








|
<




>
>
>
|
|
|
<
|
>












>
>
>
|
|
|
|
>








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
1640
1641
1642

1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660

1661
1662
1663
1664
1665
1666
1667
1668
1669
1670

1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699

      }

      #
      # NOTE: Show (and log) the local connection flags and the associated
      #       data source or file name.
      #
      if {!$quiet} then {
        if {![info exists ::no(emitLocalFlags)] && \
            (![info exists ::no(emitLocalFlagsIfNone)] || \
             ![hasNoFlags flags false])} then {
          tputs $::test_channel [appendArgs \
              "---- local connection flags for " $database \
              " are: " [expr {![hasNoFlags flags false] ? \
              [appendArgs \" $flags \"] : "<none>"}] \n]
        }
      }

      #
      # NOTE: Show (and log) the shared connection flags.
      #
      if {!$quiet} then {
        if {[catch {
          object invoke System.Data.SQLite.SQLiteConnection SharedFlags
        } sharedFlags] == 0} then {
          if {![info exists ::no(emitSharedFlags)] && \
              (![info exists ::no(emitSharedFlagsIfNone)] || \
               ![hasNoFlags sharedFlags true])} then {
            tputs $::test_channel [appendArgs \
                "---- shared connection flags for " $database \
                " are: " [expr {![hasNoFlags sharedFlags true] ? \

                [appendArgs \" $sharedFlags \"] : "<none>"}] \n]
          }
        } else {
          if {![info exists ::no(emitSharedFlags)] && \
              ![info exists ::no(emitSharedFlagsIfUnavailable)]} then {
            tputs $::test_channel [appendArgs \
                "---- shared connection flags for " $database \
                " are: <unavailable>\n"]
          }
        }
      }

      #
      # NOTE: If there are any global (per test run) connection flags currently
      #       set, use them now (i.e. by combining them with the ones for this
      #       connection).
      #
      if {[info exists ::connection_flags]} then {

        #
        # NOTE: Show (and log) the detected global connection flags.
        #
        if {!$quiet} then {
          if {![info exists ::no(emitGlobalFlags)] && \
              (![info exists ::no(emitGlobalFlagsIfNone)] || \
               ![hasNoFlags ::connection_flags false])} then {
            tputs $::test_channel [appendArgs \
                "---- global connection flags detected: " \
                [expr {![hasNoFlags ::connection_flags false] ? \

                [appendArgs \" $::connection_flags \"] : "<none>"}] \n]
          }
        }

        #
        # NOTE: Combine and/or replace the connection flags and then show the
        #       new value.
        #
        set flags [combineFlags $flags $::connection_flags]

        #
        # NOTE: Show (and log) the new effective connection flags.
        #
        if {!$quiet} then {
          if {![info exists ::no(emitCombinedFlags)] && \
              (![info exists ::no(emitCombinedFlagsIfNone)] || \
               ![hasNoFlags flags false])} then {
            tputs $::test_channel [appendArgs \
                "---- combined connection flags for " $database \
                " are: " [expr {![hasNoFlags flags false] ? \
                [appendArgs \" $flags \"] : "<none>"}] \n]
          }
        }
      }

      return $flags
    }

    proc getFlagsProperty { {flags ""} {quiet false} } {
︙︙
Changes to Tests/tkt-647d282d11.eagle.
︙︙
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

      [object invoke $connection PrepareRetries 20] \
      [object invoke $connection PrepareRetries]
} -cleanup {
  cleanupDb $fileName

  freeDbConnection

  unset -nocomplain db fileName
} -constraints \
{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
{10 {} 20}}

###############################################################################

runSQLiteTestEpilogue








|








29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

      [object invoke $connection PrepareRetries 20] \
      [object invoke $connection PrepareRetries]
} -cleanup {
  cleanupDb $fileName

  freeDbConnection

  unset -nocomplain connection db fileName
} -constraints \
{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite} -result \
{10 {} 20}}

###############################################################################

runSQLiteTestEpilogue
︙︙