Skip to content

Require statements break Browserify compatibility #875

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 1 commit into from
Oct 15, 2015
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
8 changes: 4 additions & 4 deletions lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ var util = require('util');
var pgPass = require('pgpass');
var TypeOverrides = require('./type-overrides');

var ConnectionParameters = require(__dirname + '/connection-parameters');
var Query = require(__dirname + '/query');
var defaults = require(__dirname + '/defaults');
var Connection = require(__dirname + '/connection');
var ConnectionParameters = require('./connection-parameters');
var Query = require('./query');
var defaults = require('./defaults');
var Connection = require('./connection');

var Client = function(config) {
EventEmitter.call(this);
Expand Down
2 changes: 1 addition & 1 deletion lib/connection-parameters.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var url = require('url');
var dns = require('dns');

var defaults = require(__dirname + '/defaults');
var defaults = require('./defaults');

var val = function(key, config, envVar) {
if (envVar === undefined) {
Expand Down
8 changes: 4 additions & 4 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var EventEmitter = require('events').EventEmitter;
var util = require('util');
var Client = require(__dirname+'/client');
var defaults = require(__dirname + '/defaults');
var pool = require(__dirname + '/pool');
var Connection = require(__dirname + '/connection');
var Client = require('./client');
var defaults = require('./defaults');
var pool = require('./pool');
var Connection = require('./connection');

var PG = function(clientConstructor) {
EventEmitter.call(this);
Expand Down
2 changes: 1 addition & 1 deletion lib/native/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var pkg = require('../../package.json');
var assert = require('assert');
var EventEmitter = require('events').EventEmitter;
var util = require('util');
var ConnectionParameters = require(__dirname + '/../connection-parameters');
var ConnectionParameters = require('../connection-parameters');

var msg = 'Version >= ' + pkg.minNativeVersion + ' of pg-native required.';
assert(semver.gte(Native.version, pkg.minNativeVersion), msg);
Expand Down
4 changes: 2 additions & 2 deletions lib/pool.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
var EventEmitter = require('events').EventEmitter;

var defaults = require(__dirname + '/defaults');
var defaults = require('./defaults');
var genericPool = require('generic-pool');

var pools = {
//dictionary of all key:pool pairs
all: {},
//reference to the client constructor - can override in tests or for require('pg').native
Client: require(__dirname + '/client'),
Client: require('./client'),
getOrCreate: function(clientConfig) {
clientConfig = clientConfig || {};
var name = JSON.stringify(clientConfig);
Expand Down
4 changes: 2 additions & 2 deletions lib/query.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var EventEmitter = require('events').EventEmitter;
var util = require('util');

var Result = require(__dirname + '/result');
var utils = require(__dirname + '/utils');
var Result = require('./result');
var utils = require('./utils');

var Query = function(config, values, callback) {
// use of "new" optional
Expand Down