Skip to content

Add client connectionString tests #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/pool-factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ var util = require('util');
var Pool = require('pg-pool');

module.exports = function(Client) {

var BoundPool = function(options) {
var config = { Client: Client };
for (var key in options) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var helper = require(__dirname + "/test-helper")
var helper = require("./test-helper")
helper.testPoolSize(2);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var helper = require(__dirname + '/test-helper')
var helper = require('./test-helper')

var called = false;
test('disconnects', function() {
Expand Down
3 changes: 2 additions & 1 deletion test/integration/connection-pool/ending-pool-tests.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var helper = require(__dirname + '/test-helper')
var helper = require('./test-helper')

var called = false;

test('disconnects', function() {
var sink = new helper.Sink(4, function() {
called = true;
Expand Down
4 changes: 2 additions & 2 deletions test/integration/connection-pool/error-tests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var helper = require(__dirname + "/../test-helper");
var pg = require(__dirname + "/../../../lib");
var helper = require("../test-helper");
var pg = require("../../../lib");

//first make pool hold 2 clients
pg.defaults.poolSize = 2;
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connection-pool/idle-timeout-tests.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var helper = require(__dirname + '/test-helper');
var helper = require('./test-helper');
var _ = require('lodash')

const config = _.extend({ }, helper.config, { idleTimeoutMillis: 50 })
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connection-pool/max-connection-tests.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var helper = require(__dirname + "/test-helper")
var helper = require("./test-helper")
helper.testPoolSize(40);
2 changes: 1 addition & 1 deletion test/integration/connection-pool/native-instance-tests.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var helper = require(__dirname + "/../test-helper")
var helper = require("./../test-helper")
var pg = helper.pg
var native = helper.args.native

Expand Down
2 changes: 1 addition & 1 deletion test/integration/connection-pool/optional-config-tests.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var helper = require(__dirname + '/test-helper');
var helper = require('./test-helper');

//setup defaults
helper.pg.defaults.user = helper.args.user;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var helper = require(__dirname + "/test-helper")
var helper = require("./test-helper")
helper.testPoolSize(1);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var helper = require(__dirname + "/../test-helper");
var pg = require(__dirname + "/../../../lib");
var helper = require("../test-helper");
var pg = require("../../../lib");

pg.connect(helper.config, assert.success(function(client, done) {
assert.equal(Object.keys(pg._pools).length, 1);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
var helper = require(__dirname + "/test-helper")
var helper = require("./test-helper")
helper.testPoolSize(200);
11 changes: 11 additions & 0 deletions test/unit/client/configuration-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@ test('client settings', function() {

test('initializing from a config string', function() {

test('uses connectionString property', function () {
var client = new Client({
connectionString: 'postgres://brian:pass@host1:333/databasename'
})
assert.equal(client.user, 'brian');
assert.equal(client.password, "pass");
assert.equal(client.host, "host1");
assert.equal(client.port, 333);
assert.equal(client.database, "databasename");
})

test('uses the correct values from the config string', function() {
var client = new Client("postgres://brian:pass@host1:333/databasename")
assert.equal(client.user, 'brian');
Expand Down
27 changes: 0 additions & 27 deletions test/unit/client/connection-string-tests.js

This file was deleted.