Index: tests/tdbcodbc.test ================================================================== --- tests/tdbcodbc.test +++ tests/tdbcodbc.test @@ -2235,19 +2235,19 @@ test tdbc::odbc-14.4 {commit - not in transaction} {*}{ -body { list [catch {::db commit} result] $result $::errorCode } -match glob - -result {1 {no transaction is in progress} {TDBC GENERAL_ERROR HY010 ODBC *}} + -result {1 {no transaction is in progress} {TDBC GENERAL_ERROR HY* ODBC *}} } test tdbc::odbc-14.5 {rollback - not in transaction} {*}{ -body { list [catch {::db rollback} result] $result $::errorCode } -match glob - -result {1 {no transaction is in progress} {TDBC GENERAL_ERROR HY010 ODBC *}} + -result {1 {no transaction is in progress} {TDBC GENERAL_ERROR HY* ODBC *}} } test tdbc::odbc-14.6 {empty transaction} {*}{ -body { ::db begintransaction @@ -2699,11 +2699,12 @@ test tdbc::odbc-19.3 {$connection configure - inappropriate arg} {*}{ -body { list [catch {::db configure -parent} result] $::errorCode } - -result {1 {TDBC GENERAL_ERROR HY010 ODBC -1}} + -match glob + -result {1 {TDBC GENERAL_ERROR HY* ODBC -1}} } test tdbc::odbc-19.4 {$connection configure - set unknown arg} {*}{ -body { ::db configure -junk morejunk @@ -2715,11 +2716,12 @@ test tdbc::odbc-19.5 {$connection configure - set inappropriate arg} {*}{ -body { list [catch {::db configure -parent .} result] $::errorCode } - -result {1 {TDBC GENERAL_ERROR HY010 ODBC -1}} + -match glob + -result {1 {TDBC GENERAL_ERROR HY* ODBC -1}} } test tdbc::odbc-19.6 {$connection configure - wrong # args} {*}{ -body { ::db configure -parent . -junk @@ -3060,11 +3062,11 @@ list [catch { db allrows {INSERT INTO people(idnum, name) VALUES(1, 'fred')} } result] $result $::errorCode } -match glob - -result {1 * {TDBC GENERAL_ERROR HY000 ODBC *}} + -result {1 * {TDBC GENERAL_ERROR HY* ODBC *}} } test tbdc::odbc-25.1b {error code} {*}{ -constraints jet||sqlserver -setup { @@ -3673,11 +3675,11 @@ } results rename $stmt {} set results } -match glob - -result {{{idnum 2 name wilma}} 0 0 1 {TDBC GENERAL_ERROR HY010 *}} + -result {{{idnum 2 name wilma}} 0 0 1 {TDBC GENERAL_ERROR HY* *}} } test tdbc::odbc-30.4 {Multiple result sets - foreach} {*}{ -constraints !jet&&!sqlite -setup {