jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #899 from Leu-Gim/master

Browse source 
Fixes passing non-default host and port to db_mysql.Open.
This commit is contained in:
Andreas Rumpf 2014-03-08 10:46:39 +01:00
commit edfcbab86f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/impure/db_mysql.nim
View file

@ -195,8 +195,14 @@ proc open*(connection, user, password, database: string): TDbConn {.
## be established. ## be established.
result = mysql.Init(nil) result = mysql.Init(nil)
if result == nil: dbError("could not open database connection") if result == nil: dbError("could not open database connection")
if mysql.RealConnect(result, "", user, password, database, let
0'i32, nil, 0) == nil: colonPos = connection.find(':')
host = if colonPos < 0: connection
else: substr(connection, 0, colonPos-1)
port: int32 = if colonPos < 0: 0'i32
else: substr(connection, colonPos+1).parseInt.int32
if mysql.RealConnect(result, host, user, password, database,
port, nil, 0) == nil:
var errmsg = $mysql.error(result) var errmsg = $mysql.error(result)
db_mysql.Close(result) db_mysql.Close(result)
dbError(errmsg) dbError(errmsg)