diff options
author | Miguel <leu-gim@moy-server.ru> | 2014-02-10 18:41:39 +0400 |
---|---|---|
committer | Miguel <leu-gim@moy-server.ru> | 2014-02-10 18:41:39 +0400 |
commit | 51d2384e1aa890b243f14a80ae2a126308a37d9f (patch) | |
tree | 73a5084b615eaa85765ce30a6e71309d46c8b37a | |
parent | a6186fa4868858b67b50141650e6fcc6c19c8673 (diff) | |
download | Nim-51d2384e1aa890b243f14a80ae2a126308a37d9f.tar.gz |
Fix for db_mysql.Open. 'Connection' argument in 'Open' was not used, so MySQL host and port were always default ones. Now 'Connection' is treated as 'host:port'.
-rw-r--r-- | lib/impure/db_mysql.nim | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/impure/db_mysql.nim b/lib/impure/db_mysql.nim index 1489a0401..32cda3e4d 100644 --- a/lib/impure/db_mysql.nim +++ b/lib/impure/db_mysql.nim @@ -87,7 +87,7 @@ proc newRow(L: int): TRow = proc properFreeResult(sqlres: mysql.PRES, row: cstringArray) = if row != nil: - while mysql.FetchRow(sqlres) != nil: nil + while mysql.FetchRow(sqlres) != nil: discard mysql.FreeResult(sqlres) iterator fastRows*(db: TDbConn, query: TSqlQuery, @@ -194,13 +194,13 @@ proc open*(connection, user, password, database: string): TDbConn {. ## opens a database connection. Raises `EDb` if the connection could not ## be established. result = mysql.Init(nil) - if result == nil: dbError("could not open database connection") - var - cnctn = connection.split(':') - host = cnctn[0] - port: int32 = 3306 - if cnctn.len > 1: - port = int32((cnctn[1]).parseInt()) + if result == nil: dbError("could not open database connection") + let + 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) |