Mercurial > hg > egg-tcls
changeset 310:d56509a6f435
utillib: Simplify SQL connection creation.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 28 Jan 2015 13:57:45 +0200 |
parents | db46078c7028 |
children | adc519c72f53 |
files | utillib.tcl |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/utillib.tcl Tue Jan 27 13:15:30 2015 +0200 +++ b/utillib.tcl Wed Jan 28 13:57:45 2015 +0200 @@ -66,7 +66,7 @@ return 0 } package require tdbc::sqlite3 1.0 - if {[catch {tdbc::sqlite3::connection create db_handle $db_name} db_errmsg]} { + if {[catch {set udb_handle [tdbc::sqlite3::connection new $db_name]} db_errmsg]} { putlog " Could not open SQLite3 database '$db_name': $db_errmsg" return 0 } @@ -93,14 +93,14 @@ if {$db_type == "postgres"} { package require tdbc::postgres 1.0 - if {[catch {tdbc::postgres::connection create db_handle {*}$db_args} db_errmsg]} { + if {[catch {set udb_handle [tdbc::postgres::connection new {*}$db_args]} db_errmsg]} { putlog " Could not connect to PostgreSQL database '$db_name @ $db_host': $db_errmsg" return 0 } putlog " (Using PostgreSQL database $db_name @ $db_host)" } elseif {$db_type == "mysql"} { package require tdbc::mysql 1.0 - if {[catch {tdbc::mysql::connection create db_handle {*}$db_args} db_errmsg]} { + if {[catch {set udb_handle [tdbc::mysql::connection new {*}$db_args]} db_errmsg]} { putlog " Could not connect to MySQL database '$db_name @ $db_host': $db_errmsg" return 0 } @@ -110,7 +110,6 @@ putlog " Invalid or unsupported database type: '$db_type'." return 0 } - set udb_handle db_handle return 1 }