From 522d62229bc1b1b300179b307865a993dee73c03 Mon Sep 17 00:00:00 2001 From: Illirik Smirnov Date: Fri, 24 Jun 2016 11:56:43 -0400 Subject: [PATCH] Resolve merge conflict in PR #1041 (#1065) * Add license comment * Delete pool.js --- lib/client.js | 8 ++++++++ lib/connection-parameters.js | 8 ++++++++ lib/connection.js | 8 ++++++++ lib/defaults.js | 8 ++++++++ lib/index.js | 8 ++++++++ lib/native/index.js | 8 ++++++++ lib/native/query.js | 8 ++++++++ lib/native/result.js | 8 ++++++++ lib/query.js | 8 ++++++++ lib/result.js | 8 ++++++++ lib/type-overrides.js | 8 ++++++++ lib/utils.js | 8 ++++++++ 12 files changed, 96 insertions(+) diff --git a/lib/client.js b/lib/client.js index f58fec5..c4cea82 100644 --- a/lib/client.js +++ b/lib/client.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var crypto = require('crypto'); var EventEmitter = require('events').EventEmitter; var util = require('util'); diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js index 2904f0c..4206ff3 100644 --- a/lib/connection-parameters.js +++ b/lib/connection-parameters.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var url = require('url'); var dns = require('dns'); diff --git a/lib/connection.js b/lib/connection.js index 927aab7..ca56c06 100644 --- a/lib/connection.js +++ b/lib/connection.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var net = require('net'); var EventEmitter = require('events').EventEmitter; var util = require('util'); diff --git a/lib/defaults.js b/lib/defaults.js index 49539de..a05c21f 100644 --- a/lib/defaults.js +++ b/lib/defaults.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var defaults = module.exports = { // database host. defaults to localhost host: 'localhost', diff --git a/lib/index.js b/lib/index.js index 81a51dd..c632316 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var EventEmitter = require('events').EventEmitter; var util = require('util'); var Client = require('./client'); diff --git a/lib/native/index.js b/lib/native/index.js index 381f0a8..db5dfbf 100644 --- a/lib/native/index.js +++ b/lib/native/index.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var Native = require('pg-native'); var TypeOverrides = require('../type-overrides'); var semver = require('semver'); diff --git a/lib/native/query.js b/lib/native/query.js index 73fdf39..9f211c0 100644 --- a/lib/native/query.js +++ b/lib/native/query.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var EventEmitter = require('events').EventEmitter; var util = require('util'); var utils = require('../utils'); diff --git a/lib/native/result.js b/lib/native/result.js index 9fd23f5..dc68f76 100644 --- a/lib/native/result.js +++ b/lib/native/result.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var NativeResult = module.exports = function(pq) { this.command = null; this.rowCount = 0; diff --git a/lib/query.js b/lib/query.js index ab47b65..5b5e4bb 100644 --- a/lib/query.js +++ b/lib/query.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var EventEmitter = require('events').EventEmitter; var util = require('util'); diff --git a/lib/result.js b/lib/result.js index dc2ce0e..463fbdb 100644 --- a/lib/result.js +++ b/lib/result.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var types = require('pg-types'); //result object returned from query diff --git a/lib/type-overrides.js b/lib/type-overrides.js index f6ebdb9..e0cf00e 100644 --- a/lib/type-overrides.js +++ b/lib/type-overrides.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var types = require('pg-types'); function TypeOverrides(userTypes) { diff --git a/lib/utils.js b/lib/utils.js index 177ae97..b70be5b 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2010-2016 Brian Carlson (brian.m.carlson@gmail.com) + * All rights reserved. + * + * This source code is licensed under the MIT license found in the + * README.md file in the root directory of this source tree. + */ + var defaults = require('./defaults'); // convert a JS array to a postgres array literal