Skip to content

Commit 691771c

Browse files
fixes for Docker
1 parent 1cb6958 commit 691771c

5 files changed

Lines changed: 59 additions & 11 deletions

File tree

docker/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM postgres
2+
3+
ADD dbschema.sql /docker-entrypoint-initdb.d
4+
5+
EXPOSE 5432

docker/dbschema.sql

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
--
2+
-- run with psql -U postgres -f dbschema.sql
3+
--
4+
DROP DATABASE senecatest;
5+
CREATE DATABASE senecatest WITH ENCODING='UTF8' CONNECTION LIMIT=-1;
6+
7+
DROP ROLE senecatest;
8+
CREATE ROLE "senecatest" LOGIN PASSWORD 'senecatest';
9+
10+
--# connect to the database (works for psql)
11+
\c senecatest
12+
13+
CREATE TABLE foo
14+
(
15+
id character varying,
16+
p1 character varying,
17+
p2 character varying,
18+
p3 character varying
19+
);
20+
ALTER TABLE foo OWNER TO senecatest;
21+
22+
CREATE TABLE moon_bar
23+
(
24+
str character varying,
25+
id character varying,
26+
"int" integer,
27+
bol boolean,
28+
wen timestamp with time zone,
29+
mark character varying,
30+
"dec" real,
31+
arr integer[],
32+
obj json,
33+
seneca text
34+
);
35+
ALTER TABLE moon_bar OWNER TO senecatest;
36+
37+
CREATE TABLE product
38+
(
39+
name character varying,
40+
id character varying,
41+
price integer
42+
);
43+
ALTER TABLE product OWNER TO senecatest;

lib/postgresql-store.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ module.exports = function (opts) {
125125
name: name,
126126

127127
close: function (args, done) {
128-
// if (dbinst) {
129-
// dbinst.end(done)
130-
// }
131128
pg.end()
132129
setImmediate(done)
133130
},

test/default_config.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "senecatest",
3+
"host": "pg",
4+
"port": 5432,
5+
"username": "senecatest",
6+
"password": "senecatest",
7+
"options": { }
8+
}

test/postgres.test.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@ var describe = lab.describe
99
var it = lab.it
1010

1111
var shared = require('seneca-store-test')
12+
var default_config = require('./default_config.json')
1213

1314
var si = seneca()
14-
si.use(require('..'), {
15-
name: 'senecatest',
16-
host: '127.0.0.1',
17-
port: 5432,
18-
username: 'senecatest',
19-
password: 'senecatest',
20-
options: { }
21-
})
15+
si.use(require('..'), default_config)
2216

2317
describe('Basic Test', function () {
2418
shared.basictest({
@@ -57,3 +51,4 @@ describe('postgres', function () {
5751
})
5852
})
5953
})
54+

0 commit comments

Comments
 (0)