orange-orm 4.4.1 → 4.4.2

package/README.md

@@ -359,6 +359,11 @@ npm install pg
 import map from './map';
 const db = map.postgres('postgres://postgres:postgres@postgres/postgres');
 ```
+With schema
+```javascript
+import map from './map';
+const db = map.postgres('postgres://postgres:postgres@postgres/postgres?search_path=custom');
+```
 __Oracle__
 ```bash
 npm install oracledb

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.4.2__  
+Support for schema in connection string. Postgrs only. [#116](https://github.com/alfateam/orange-orm/issues/118)  
 __4.4.1__  
 Support for date-only ISO strings. [#116](https://github.com/alfateam/orange-orm/issues/116)  
 __4.4.0__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/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;

package/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;