Skip to content

Commit 522d622

Browse files
Illirik Smirnovbrianc
Illirik Smirnov
authored andcommitted
Resolve merge conflict in PR brianc#1041 (brianc#1065)
* Add license comment * Delete pool.js
1 parent c35adf6 commit 522d622

12 files changed

+96
-0
lines changed

lib/client.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var crypto = require('crypto');
210
var EventEmitter = require('events').EventEmitter;
311
var util = require('util');

lib/connection-parameters.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var url = require('url');
210
var dns = require('dns');
311

lib/connection.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var net = require('net');
210
var EventEmitter = require('events').EventEmitter;
311
var util = require('util');

lib/defaults.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var defaults = module.exports = {
210
// database host. defaults to localhost
311
host: 'localhost',

lib/index.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var EventEmitter = require('events').EventEmitter;
210
var util = require('util');
311
var Client = require('./client');

lib/native/index.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var Native = require('pg-native');
210
var TypeOverrides = require('../type-overrides');
311
var semver = require('semver');

lib/native/query.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var EventEmitter = require('events').EventEmitter;
210
var util = require('util');
311
var utils = require('../utils');

lib/native/result.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var NativeResult = module.exports = function(pq) {
210
this.command = null;
311
this.rowCount = 0;

lib/query.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var EventEmitter = require('events').EventEmitter;
210
var util = require('util');
311

lib/result.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var types = require('pg-types');
210

311
//result object returned from query

lib/type-overrides.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var types = require('pg-types');
210

311
function TypeOverrides(userTypes) {

lib/utils.js

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/**
2+
* Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com)
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* README.md file in the root directory of this source tree.
7+
*/
8+
19
var defaults = require('./defaults');
210

311
// convert a JS array to a postgres array literal

0 commit comments

Comments
 (0)