Index: Tests/basic.eagle ================================================================== --- Tests/basic.eagle +++ Tests/basic.eagle @@ -3990,19 +3990,22 @@ while {[$dataReader Read]} { lappend result \ [list [$dataReader GetOrdinal x] [$dataReader GetName 0] \ [$dataReader GetValue 0] [$dataReader GetDatabaseName 0] \ [$dataReader GetTableName 0] [$dataReader GetOriginalName 0] \ - [$dataReader GetDataTypeName 0] [$dataReader GetFieldType 0]] \ + [$dataReader GetDataTypeName 0] \ + [$dataReader -tostring GetFieldType 0]] \ [list [$dataReader GetOrdinal y] [$dataReader GetName 1] \ [$dataReader GetValue 1] [$dataReader GetDatabaseName 1] \ [$dataReader GetTableName 1] [$dataReader GetOriginalName 1] \ - [$dataReader GetDataTypeName 1] [$dataReader GetFieldType 1]] \ + [$dataReader GetDataTypeName 1] \ + [$dataReader -tostring GetFieldType 1]] \ [list [$dataReader GetOrdinal z] [$dataReader GetName 2] \ [$dataReader GetValue 2] [$dataReader GetDatabaseName 2] \ [$dataReader GetTableName 2] [$dataReader GetOriginalName 2] \ - [$dataReader GetDataTypeName 2] [$dataReader GetFieldType 2]] + [$dataReader GetDataTypeName 2] \ + [$dataReader -tostring GetFieldType 2]] } set result } -cleanup { unset -nocomplain dataReader Index: Tests/thread.eagle ================================================================== --- Tests/thread.eagle +++ Tests/thread.eagle @@ -457,11 +457,11 @@ } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName } -time true -constraints {eagle command.object monoBug28 monoCrash211\ -monoCrash42 monoBug44 command.sql compile.DATA SQLite System.Data.SQLite\ +monoCrash42 monoBug46 command.sql compile.DATA SQLite System.Data.SQLite\ compileCSharp} -match regexp -result [appendArgs "^Ok\ System#CodeDom#Compiler#CompilerResults#\\d+ \\{\\} 0 \\{\\d+ \\d+ " $count(1) \ "\\} \\{\\} \\{" $handle_counts "\\} " $memory_used \$]} ############################################################################### Index: Tests/tkt-56b42d99c1.eagle ================================================================== --- Tests/tkt-56b42d99c1.eagle +++ Tests/tkt-56b42d99c1.eagle @@ -97,11 +97,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName -} -constraints {eagle command.object monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}} ############################################################################### @@ -174,11 +174,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName -} -constraints {eagle command.object monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}} ############################################################################### @@ -405,11 +405,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName -} -constraints {eagle command.object monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 1$}} ############################################################################### @@ -494,11 +494,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code dataSource id db fileName -} -constraints {eagle command.object monoBug28 monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug28 monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 True$}} ############################################################################### @@ -571,11 +571,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName -} -constraints {eagle command.object monoBug28 monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug28 monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 0$}} ############################################################################### @@ -802,11 +802,11 @@ } result] : [set result ""]}] $result } -cleanup { cleanupDb $fileName unset -nocomplain result results errors code sql dataSource id db fileName -} -constraints {eagle command.object monoBug28 monoBug211 monoBug44 command.sql\ +} -constraints {eagle command.object monoBug28 monoBug211 monoBug46 command.sql\ compile.DATA SQLite System.Data.SQLite compileCSharp} -match regexp -result \ {^Ok System#CodeDom#Compiler#CompilerResults#\d+ \{\} 0 1$}} ############################################################################### Index: Tests/tkt-94252b9059.eagle ================================================================== --- Tests/tkt-94252b9059.eagle +++ Tests/tkt-94252b9059.eagle @@ -28,13 +28,16 @@ } set dataReader [sql execute -execute reader -format datareader \ -alias $db "SELECT x, y, z FROM t1;"] - list [$dataReader GetDataTypeName 0] [$dataReader GetDataTypeName 1] \ - [$dataReader GetDataTypeName 2] [$dataReader GetFieldType 0] \ - [$dataReader GetFieldType 1] [$dataReader GetFieldType 2] + list [$dataReader GetDataTypeName 0] \ + [$dataReader GetDataTypeName 1] \ + [$dataReader GetDataTypeName 2] \ + [$dataReader -tostring GetFieldType 0] \ + [$dataReader -tostring GetFieldType 1] \ + [$dataReader -tostring GetFieldType 2] } -cleanup { unset -nocomplain dataReader cleanupDb $fileName