Skip to content

Commit def663d

Browse files
committed
Merge pull request #541 from brianc/pg-types
Break type parsing into separate module
2 parents e8e16f8 + 0254fa5 commit def663d

14 files changed

+24
-1093
lines changed

lib/defaults.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ var defaults = module.exports = {
4646

4747
//parse int8 so you can get your count values as actual numbers
4848
module.exports.__defineSetter__("parseInt8", function(val) {
49-
require('./types').setTypeParser(20, 'text', val ? parseInt : function(val) { return val; });
49+
require('pg-types').setTypeParser(20, 'text', val ? parseInt : function(val) { return val; });
5050
});

lib/index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var util = require('util');
33
var Client = require(__dirname+'/client');
44
var defaults = require(__dirname + '/defaults');
55
var pool = require(__dirname + '/pool');
6-
var types = require(__dirname + '/types/');
76
var Connection = require(__dirname + '/connection');
87

98
var PG = function(clientConstructor) {
@@ -12,8 +11,8 @@ var PG = function(clientConstructor) {
1211
this.Client = pool.Client = clientConstructor;
1312
this.Query = this.Client.Query;
1413
this.pools = pool;
15-
this.types = types;
1614
this.Connection = Connection;
15+
this.types = require('pg-types');
1716
};
1817

1918
util.inherits(PG, EventEmitter);

lib/native/query.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
var EventEmitter = require('events').EventEmitter;
22
var util = require('util');
33

4-
var types = require(__dirname + '/../types/');
54
var utils = require(__dirname + '/../utils');
65
var Result = require(__dirname + '/../result');
76

lib/query.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var EventEmitter = require('events').EventEmitter;
22
var util = require('util');
33

44
var Result = require(__dirname + '/result');
5-
var Types = require(__dirname + '/types/');
65
var utils = require(__dirname + '/utils');
76

87
var Query = function(config, values, callback) {

lib/result.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var types = require(__dirname + '/types/');
1+
var types = require('pg-types');
22

33
//result object returned from query
44
//in the 'end' event and also

lib/types/arrayParser.js

-97
This file was deleted.

0 commit comments

Comments
 (0)