steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

db.postgresql.lib: if PQsetdbLogin fails, PQfinish must be called

db4
Björn Lindqvist 2014-09-22 20:32:26 +02:00 committed by John Benediktsson
parent b90e52b527
commit 101780d2cd
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
basis/db/postgresql/lib/lib.factor
View File

@ -42,8 +42,9 @@ M: postgresql-result-null summary ( obj -- str )
PGRES_COMMAND_OK PGRES_TUPLES_OK 2array member? ; PGRES_COMMAND_OK PGRES_TUPLES_OK 2array member? ;
: connect-postgres ( host port pgopts pgtty db user pass -- conn ) : connect-postgres ( host port pgopts pgtty db user pass -- conn )
PQsetdbLogin PQsetdbLogin dup PQstatus zero? [
dup PQstatus zero? [ (postgresql-error-message) throw ] unless ; [ (postgresql-error-message) ] [ PQfinish ] bi throw
] unless ;
: do-postgresql-statement ( statement -- res ) : do-postgresql-statement ( statement -- res )
db-connection get handle>> swap sql>> PQexec dup postgresql-result-ok? [ db-connection get handle>> swap sql>> PQexec dup postgresql-result-ok? [

13
basis/db/postgresql/postgresql-tests.factor
View File

@ -1,8 +1,19 @@
USING: kernel db.postgresql alien continuations io classes USING: kernel db.postgresql alien continuations io classes
prettyprint sequences namespaces tools.test db db.private prettyprint sequences math namespaces tools.test db db.private
db.tuples db.types unicode.case accessors system db.tester ; db.tuples db.types unicode.case accessors system db.tester ;
IN: db.postgresql.tests IN: db.postgresql.tests
: nonexistant-db ( -- db )
<postgresql-db>
"localhost" >>host
"fake-user" >>username
"no-pass" >>password
"dont-exist" >>database ;
! Don't leak connections
[ ] [
2000 [ [ nonexistant-db [ ] with-db ] ignore-errors ] times
] unit-test
! Ensure the table exists ! Ensure the table exists
[ ] [ postgresql-test-db [ ] with-db ] unit-test [ ] [ postgresql-test-db [ ] with-db ] unit-test