Merge 41fb57f into f328809

lib/core/lib/ops/organizationOps.js

@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const Boom = require('boom')
 const async = require('async')
-const SQL = require('./../db/SQL')
+const SQL = require('@nearform/sql')
 const mapping = require('./../mapping')
 const utils = require('./utils')
 const validationRules = require('./validation').organizations

lib/core/lib/ops/policyOps.js

@@ -3,7 +3,7 @@
 const Boom = require('boom')
 const Joi = require('joi')
 const async = require('async')
-const SQL = require('./../db/SQL')
+const SQL = require('@nearform/sql')
 const mapping = require('./../mapping')
 const utils = require('./utils')
 const uuidV4 = require('uuid/v4')

lib/core/lib/ops/teamOps.js

@@ -6,7 +6,7 @@ const Boom = require('boom')
 const uuid = require('uuid/v4')
 const async = require('async')
 const utils = require('./utils')
-const SQL = require('./../db/SQL')
+const SQL = require('@nearform/sql')
 const mapping = require('./../mapping')
 const validationRules = require('./validation').teams
 

lib/core/lib/ops/userOps.js

@@ -4,7 +4,7 @@ const Joi = require('joi')
 const Boom = require('boom')
 const async = require('async')
 const uuidV4 = require('uuid/v4')
-const SQL = require('./../db/SQL')
+const SQL = require('@nearform/sql')
 const mapping = require('./../mapping')
 const utils = require('./utils')
 const validationRules = require('./validation').users

lib/core/lib/ops/utils.js

@@ -2,7 +2,7 @@
 
 const _ = require('lodash')
 const Boom = require('boom')
-const SQL = require('./../db/SQL')
+const SQL = require('@nearform/sql')
 
 function boomErrorWrapper (next) {
   return function wrapAsBadImplementation (err, result) {

package.json

@@ -61,6 +61,7 @@
     "test:commit-check"
   ],
   "dependencies": {
+    "@nearform/sql": "^1.0.0",
     "async": "^2.6.0",
     "hapi": "^16.6.2",
     "hapi-pino": "^1.7.0",
@@ -73,7 +74,6 @@
     "pbac": "0.3.0",
     "pg": "^7.4.1",
     "pino": "^4.10.3",
-    "postgrator": "^2.10.3",
     "reconfig": "3.2.0",
     "uuid": "^3.2.1",
     "vision": "^4.1.1"
@@ -87,6 +87,7 @@
     "lab": "^14.2.0",
     "napa": "^2.3.0",
     "pg-copy-streams": "^1.2.0",
+    "postgrator": "^2.10.3",
     "pre-commit": "^1.2.2",
     "proxyquire": "^1.7.10",
     "remark-cli": "^4.0.0",

scripts/init.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const SQL = require('./../lib/core/lib/db/SQL')
+const SQL = require('@nearform/sql')
 const buildUdaru = require('./../lib/core')
 const buildDb = require('./../lib/core/lib/db')
 const config = require('../lib/config/build-all')()

test/utils.js

@@ -3,7 +3,7 @@
 const _ = require('lodash')
 const config = require('../lib/config/build-all')()
 const db = require('./../lib/core/lib/db')(null, config)
-const SQL = require('./../lib/core/lib/db/SQL')
+const SQL = require('@nearform/sql')
 
 const udaru = require('./../lib/core')()