search_path pg closes #118

src/pg/pool/newPgPool.js

@@ -1,14 +1,18 @@
 /* eslint-disable no-prototype-builtins */
 //slightly modified code from github.com/brianc/node-postgres
+var log = require('../../table/log');
 var EventEmitter = require('events').EventEmitter;
 
 var defaults = require('./defaults');
 var genericPool = require('../../generic-pool');
 var _pg = require('pg');
+var parseSearchPathParam = require('./parseSearchPathParam');
 
 function newPgPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	let pg = poolOptions.native ? _pg.native : _pg;
+
+	// @ts-ignore
 	var pool = genericPool.Pool({
 		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
 		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
@@ -41,7 +45,8 @@ function newPgPool(connectionString, poolOptions) {
 					}
 				});
 				client.poolCount = 0;
-				return cb(null, client);
+				negotiateSearchPath(client, connectionString, (err) => cb(err, client));
+
 			});
 		},
 		destroy: function(client) {
@@ -65,7 +70,8 @@ function newPgPool(connectionString, poolOptions) {
 				cb = domain.bind(cb);
 			}
 			if (err) return cb(err, null, function() {
-				/*NOOP*/ });
+				/*NOOP*/
+			});
 			client.poolCount++;
 			cb(null, client, function(err) {
 				if (err) {
@@ -79,4 +85,17 @@ function newPgPool(connectionString, poolOptions) {
 	return pool;
 }
 
+function negotiateSearchPath(client, connectionString, cb) {
+	const searchPath = parseSearchPathParam(connectionString);
+	if (searchPath) {
+		const sql = `set search_path to ${searchPath}`;
+		log.emitQuery({sql, parameters: []});
+		return client.query(sql, cb);
+	}
+	else
+		cb();
+
+
+}
+
 module.exports = newPgPool;

src/pg/pool/parseSearchPathParam.js

@@ -0,0 +1,10 @@
+function parseSearchPathParam(connectionString = '') {
+	const [, queryString] = connectionString.split('?');
+	if (!queryString)
+		return;
+	const params = new URLSearchParams(queryString);
+	const searchPath = params.get('search_path');
+	return searchPath;
+}
+
+module.exports = parseSearchPathParam;

tests/db.js

@@ -22,6 +22,10 @@ const map = rdb.map(x => ({
 		balance: column('balance').numeric(),
 		isActive: column('isActive').boolean(),
 	})),
+	withSchema: x.table('withSchema').map(({ column }) => ({
+		id: column('id').numeric().primary().notNullExceptInsert(),
+		name: column('name').string(),
+	})),
 
 	vendor: x.table('vendor').map(({ column }) => ({
 		id: column('id').numeric().primary().notNull(),

tests/initPg.js

@@ -1,6 +1,9 @@
 const sql = `
+drop schema if exists custom cascade;
 drop schema if exists public cascade;
 create schema public;
+create schema custom;
+
 
 CREATE TABLE datetest (
     id SERIAL	 PRIMARY KEY,
@@ -68,8 +71,12 @@ CREATE TABLE "deliveryAddress" (
     "postalCode" TEXT,
     "postalPlace" TEXT,
     "countryCode" TEXT
-)
+);
 
+CREATE TABLE custom."withSchema" (
+    id SERIAL	 PRIMARY KEY,
+    name TEXT
+)
 `;
 
 module.exports = async function(db) {

tests/schema.test.js

@@ -0,0 +1,51 @@
+import { describe, test, beforeAll, expect } from 'vitest';
+const map = require('./db');
+
+const initPg = require('./initPg');
+
+beforeAll(async () => {
+	await insertData('pg');
+
+	async function insertData(dbName) {
+		const { db, init } = getDb(dbName);
+		await init(db);
+	}
+});
+
+describe('search path custom', () => {
+	test('pgWithSchema', async () => await verify('pgWithSchema'));
+
+	async function verify(dbName) {
+		const { db } = getDb(dbName);
+
+		const customer = await db.withSchema.insert({
+			name: 'Voldemort',
+		});
+
+		const expected = {
+			id: 1,
+			name: 'Voldemort',
+		};
+
+		expect(customer).toEqual(expected);
+	}
+});
+
+const connections = {
+	pg: {
+		db: map({ db: con => con.postgres('postgres://postgres:postgres@postgres/postgres', { size: 1 }) }),
+		init: initPg
+	},
+	pgWithSchema: {
+		db: map({ db: con => con.postgres('postgres://postgres:postgres@postgres/postgres?search_path=custom', { size: 1 }) }),
+	}
+};
+
+function getDb(name) {
+	if (name === 'pg')
+		return connections.pg;
+	if (name === 'pgWithSchema')
+		return connections.pgWithSchema;
+	else
+		throw new Error('unknown');
+}