From ae74f4cd2cd282b4ab4abe2e2bb704aa17880ee1 Mon Sep 17 00:00:00 2001 From: Araq Date: Sat, 4 Oct 2014 19:40:23 +0200 Subject: [PATCH] Merge branch 'devel' of https://github.com/Araq/Nimrod into bigbreak Conflicts: lib/impure/db_postgres.nim lib/pure/os.nim src/wrappers/postgres.nim --- src/wrappers/postgres.nim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wrappers/postgres.nim b/src/wrappers/postgres.nim index 6c857de402..cb39c41bb5 100644 --- a/src/wrappers/postgres.nim +++ b/src/wrappers/postgres.nim @@ -213,8 +213,10 @@ proc pqexecParams*(conn: PPGconn, command: cstring, nParams: int32, paramTypes: POid, paramValues: cstringArray, paramLengths, paramFormats: ptr int32, resultFormat: int32): PPGresult{. cdecl, dynlib: dllName, importc: "PQexecParams".} -proc pqexecPrepared*(conn: PPGconn, stmtName: cstring, nParams: int32, - paramValues: cstringArray, +proc pqprepare*(conn: PPGconn, stmtName, query: cstring, nParams: int32, + paramTypes: POid): PPGresult{.cdecl, dynlib: dllName, importc: "PQprepare".} +proc pqexecPrepared*(conn: PPGconn, stmtName: cstring, nParams: int32, + paramValues: cstringArray, paramLengths, paramFormats: ptr int32, resultFormat: int32): PPGresult{. cdecl, dynlib: dllName, importc: "PQexecPrepared".} proc pqsendQuery*(conn: PPGconn, query: cstring): int32{.cdecl, dynlib: dllName,