Skip to content

Commit 2fc9985

Browse files
author
radicsge
committedMar 13, 2017
add missing import
1 parent d385c81 commit 2fc9985

13 files changed

+280
-297
lines changed
 

‎lib/index.js

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgConverters.js

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgDb.js

+74-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgDbOperators.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgSchema.js

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgTable.js

+45-80
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgUtils.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { QueryOptions, ResultFieldType, QueryAble } from "./queryAble";
22
import { FieldType } from "./pgDb";
3-
export declare var pgUtils: {
3+
export declare let pgUtils: {
44
quoteField(f: any): any;
55
processQueryFields(options: QueryOptions): string;
66
processNamedParams(sql: string, params: Object): {

‎lib/pgUtils.js

+47-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/pgUtils.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/queryAble.js

+49-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/queryWhere.js

+50-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pogi",
3-
"version": "2.1.0",
3+
"version": "2.1.1",
44
"description": "An easy db handler over pg.js (node-postgres)",
55
"main": "lib/index.js",
66
"types": "lib/index.d.ts",

‎src/pgUtils.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import {QueryOptions, ResultFieldType, QueryAble} from "./queryAble";
2-
var util = require('util');
2+
const util = require('util');
33
const NAMED_PARAMS_REGEXP = /(?:^|[^:]):(!?[a-zA-Z0-9_]+)/g; // do not convert "::type cast"
44
import {FieldType} from "./pgDb";
55
const ASC_DESC_REGEXP = /^([^" (]+)( asc| desc)?$/;
6+
const _ = require('lodash');
67

7-
export var pgUtils = {
8+
export let pgUtils = {
89
quoteField(f) {
910
return f.indexOf('"') == -1 && f.indexOf('(') == -1 ? '"' + f + '"' : f;
1011
},
@@ -134,16 +135,16 @@ export var pgUtils = {
134135

135136
createFunctionCaller(q: QueryAble, fn: {schema: string,name: string, return_single_row: boolean,return_single_value: boolean }) {
136137
return async(...args) => {
137-
var placeHolders = [];
138-
var params = [];
138+
let placeHolders = [];
139+
let params = [];
139140
args.forEach((arg)=> {
140141
placeHolders.push('$' + (placeHolders.length + 1));
141142
params.push(arg);
142143
});
143144
let res = await q.query(`SELECT "${fn.schema}"."${fn.name}"(${placeHolders.join(',')})`, params);
144145

145146
if (fn.return_single_value) {
146-
var keys = res[0] ? Object.keys(res[0]) : [];
147+
let keys = res[0] ? Object.keys(res[0]) : [];
147148
if (keys.length != 1){
148149
throw Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:`+JSON.stringify(res))
149150
}

0 commit comments

Comments
 (0)
Please sign in to comment.