Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More test portability enhancements. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
ae12ca01d977158a2075e0b40349f727 |
| User & Date: | mistachkin 2016-03-22 17:01:30.781 |
Context
|
2016-03-22
| ||
| 17:34 | Tests for Windows-specific features should run only on Windows. check-in: 92f27e48a2 user: mistachkin tags: trunk | |
| 17:01 | More test portability enhancements. check-in: ae12ca01d9 user: mistachkin tags: trunk | |
| 15:07 | Add test suite infrastructure helper procedure to return the default page size. check-in: 8a5f7d7254 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
| ︙ | ︙ | |||
1908 1909 1910 1911 1912 1913 1914 |
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);
| | | 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 |
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) return UTF8ToString(p, len);
else
{
string[] ar = stmt.TypeDefinitions;
if (ar != null)
{
if (index < ar.Length && ar[index] != null)
return ar[index];
|
| ︙ | ︙ |
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.
| ︙ | ︙ | |||
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 \
| | | 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 |
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 \
| | | 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 |
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 \
| | | 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 |
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} {
| | > | > | 1822 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 |
$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)}]
#
|
| ︙ | ︙ | |||
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 \
| | | 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 |
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]
|
| ︙ | ︙ | |||
4049 4050 4051 4052 4053 4054 4055 |
}
lappend result [sql execute -execute scalar $db {
PRAGMA page_size;
}]
lappend result [sql execute $db {
| | | | 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 |
}
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 lib/System.Data.SQLite/common.eagle.
| ︙ | ︙ | |||
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.
#
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 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 |
} 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.
#
|
| ︙ | ︙ |