@graffy/pg 0.15.6-alpha.1 → 0.15.8-alpha.2

package/cjs/Db.js

@@ -0,0 +1,392 @@
+"use strict";
+
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+
+var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
+
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+
+var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
+
+var _bindInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/bind");
+
+var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
+
+var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/values"));
+
+var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
+
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+
+var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
+
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
+
+var _pg = require("pg");
+
+var _common = require("@graffy/common");
+
+var _index = require("./link/index.js");
+
+var _select = require("./sql/select");
+
+var _index2 = require("./sql/index.js");
+
+var _debug = _interopRequireDefault(require("debug"));
+
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context10; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context10 = (it = it.call(o)).next).call(_context10, it); if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { var _context9; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context9 = Object.prototype.toString.call(o)).call(_context9, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+var log = (0, _debug.default)('graffy:pg:db');
+
+var Db = /*#__PURE__*/function () {
+  function Db(connection) {
+    if (typeof connection === 'object' && connection && (connection instanceof _pg.Pool || connection instanceof _pg.Client)) {
+      this.client = connection;
+    } else {
+      this.client = new _pg.Pool(connection);
+    }
+  }
+
+  var _proto = Db.prototype;
+
+  _proto.query = /*#__PURE__*/function () {
+    var _query = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(sql) {
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              sql.rowMode = 'array';
+              log('Making SQL query: ' + sql.text, (0, _values.default)(sql));
+              _context.prev = 2;
+              _context.next = 5;
+              return this.client.query(sql);
+
+            case 5:
+              return _context.abrupt("return", _context.sent);
+
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](2);
+              throw Error('pg.sql_error ' + _context.t0.message + ' in ' + sql.text + ' with ' + (0, _values.default)(sql));
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this, [[2, 8]]);
+    }));
+
+    function query(_x) {
+      return _query.apply(this, arguments);
+    }
+
+    return query;
+  }();
+
+  _proto.readSql = /*#__PURE__*/function () {
+    var _readSql = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sql) {
+      var _context2;
+
+      var result;
+      return _regenerator.default.wrap(function _callee2$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return this.query(sql);
+
+            case 2:
+              result = _context3.sent;
+              // Each row is an array, as there is only one column returned.
+              result = (0, _flat.default)(_context2 = result.rows).call(_context2);
+              log('Read result', result);
+              return _context3.abrupt("return", result);
+
+            case 6:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee2, this);
+    }));
+
+    function readSql(_x2) {
+      return _readSql.apply(this, arguments);
+    }
+
+    return readSql;
+  }();
+
+  _proto.writeSql = /*#__PURE__*/function () {
+    var _writeSql = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(sql) {
+      var res;
+      return _regenerator.default.wrap(function _callee3$(_context4) {
+        while (1) {
+          switch (_context4.prev = _context4.next) {
+            case 0:
+              _context4.next = 2;
+              return this.query(sql);
+
+            case 2:
+              res = _context4.sent;
+              log('Rows written', res.rowCount);
+
+              if (res.rowCount) {
+                _context4.next = 6;
+                break;
+              }
+
+              throw Error('pg.nothing_written ' + sql.text + ' with ' + (0, _values.default)(sql));
+
+            case 6:
+              return _context4.abrupt("return", res.rows[0][0]);
+
+            case 7:
+            case "end":
+              return _context4.stop();
+          }
+        }
+      }, _callee3, this);
+    }));
+
+    function writeSql(_x3) {
+      return _writeSql.apply(this, arguments);
+    }
+
+    return writeSql;
+  }();
+
+  _proto.read = /*#__PURE__*/function () {
+    var _read = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(rootQuery, tableOptions) {
+      var _this = this;
+
+      var idQueries, promises, results, refQuery, idCol, prefix, getByArgs, getByIds, query, _iterator, _step, node, args, _iterator2, _step2, childNode, childArgs;
+
+      return _regenerator.default.wrap(function _callee6$(_context7) {
+        while (1) {
+          switch (_context7.prev = _context7.next) {
+            case 0:
+              idQueries = {};
+              promises = [];
+              results = [];
+              refQuery = [];
+              idCol = tableOptions.idCol, prefix = tableOptions.prefix;
+
+              getByArgs = /*#__PURE__*/function () {
+                var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(args, subQuery) {
+                  var result, wrappedGraph;
+                  return _regenerator.default.wrap(function _callee4$(_context5) {
+                    while (1) {
+                      switch (_context5.prev = _context5.next) {
+                        case 0:
+                          _context5.next = 2;
+                          return _this.readSql((0, _select.selectByArgs)(args, tableOptions));
+
+                        case 2:
+                          result = _context5.sent;
+                          (0, _common.add)(refQuery, (0, _index.linkResult)(result, subQuery, tableOptions));
+                          wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(result, prefix));
+                          log('getByArgs', wrappedGraph);
+                          (0, _common.merge)(results, wrappedGraph);
+
+                        case 7:
+                        case "end":
+                          return _context5.stop();
+                      }
+                    }
+                  }, _callee4);
+                }));
+
+                return function getByArgs(_x6, _x7) {
+                  return _ref.apply(this, arguments);
+                };
+              }();
+
+              getByIds = /*#__PURE__*/function () {
+                var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+                  var result;
+                  return _regenerator.default.wrap(function _callee5$(_context6) {
+                    while (1) {
+                      switch (_context6.prev = _context6.next) {
+                        case 0:
+                          _context6.next = 2;
+                          return _this.readSql((0, _select.selectByIds)((0, _keys.default)(idQueries), tableOptions));
+
+                        case 2:
+                          result = _context6.sent;
+                          (0, _forEach.default)(result).call(result, function (object) {
+                            var id = object[idCol];
+                            var subQuery = idQueries[id];
+                            (0, _common.add)(refQuery, (0, _index.linkResult)([object], subQuery, tableOptions));
+                            var wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(object, prefix));
+                            log('getByIds', wrappedGraph);
+                            (0, _common.merge)(results, wrappedGraph);
+                          });
+
+                        case 4:
+                        case "end":
+                          return _context6.stop();
+                      }
+                    }
+                  }, _callee5);
+                }));
+
+                return function getByIds() {
+                  return _ref2.apply(this, arguments);
+                };
+              }();
+
+              query = (0, _common.unwrap)(rootQuery, prefix);
+
+              for (_iterator = _createForOfIteratorHelperLoose(query); !(_step = _iterator()).done;) {
+                node = _step.value;
+                args = (0, _common.decodeArgs)(node);
+
+                if ((0, _common.isPlainObject)(args)) {
+                  if (node.prefix) {
+                    for (_iterator2 = _createForOfIteratorHelperLoose(node.children); !(_step2 = _iterator2()).done;) {
+                      childNode = _step2.value;
+                      childArgs = (0, _common.decodeArgs)(childNode);
+                      promises.push(getByArgs((0, _extends2.default)({}, args, childArgs), childNode.children));
+                    }
+                  } else {
+                    promises.push(getByArgs(args, node.children));
+                  }
+                } else {
+                  idQueries[node.key] = node.children;
+                }
+              }
+
+              if (!(0, _common.isEmpty)(idQueries)) promises.push(getByIds());
+              _context7.next = 12;
+              return _promise.default.all(promises);
+
+            case 12:
+              log('dbRead', rootQuery, results);
+              return _context7.abrupt("return", (0, _sliceInstanceProperty(_common))((0, _common.finalize)(results, rootQuery), rootQuery).known || []);
+
+            case 14:
+            case "end":
+              return _context7.stop();
+          }
+        }
+      }, _callee6);
+    }));
+
+    function read(_x4, _x5) {
+      return _read.apply(this, arguments);
+    }
+
+    return read;
+  }();
+
+  _proto.write = /*#__PURE__*/function () {
+    var _write = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(rootChange, tableOptions) {
+      var _this2 = this;
+
+      var sqls, addToQuery, prefix, change, _iterator3, _step3, node, arg, object, result;
+
+      return _regenerator.default.wrap(function _callee7$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              sqls = [];
+
+              addToQuery = function addToQuery(sql) {
+                return sqls.push(sql);
+              };
+
+              prefix = tableOptions.prefix;
+              change = (0, _common.unwrap)(rootChange, prefix);
+              _iterator3 = _createForOfIteratorHelperLoose(change);
+
+            case 5:
+              if ((_step3 = _iterator3()).done) {
+                _context8.next = 17;
+                break;
+              }
+
+              node = _step3.value;
+
+              if (!(0, _common.isRange)(node)) {
+                _context8.next = 9;
+                break;
+              }
+
+              throw Error(node.key === node.end ? 'pg_write.delete_unsupported' : 'pg_write.write_range_unsupported');
+
+            case 9:
+              arg = (0, _common.decodeArgs)(node);
+              object = (0, _common.decodeGraph)(node.children);
+
+              if ((0, _common.isPlainObject)(arg)) {
+                (0, _common.mergeObject)(object, arg);
+              } else {
+                object.id = arg;
+              }
+
+              if (!(object.$put && object.$put !== true)) {
+                _context8.next = 14;
+                break;
+              }
+
+              throw Error('pg_write.partial_put_unsupported');
+
+            case 14:
+              object.$put ? addToQuery((0, _index2.put)(object, arg, tableOptions)) : addToQuery((0, _index2.patch)(object, arg, tableOptions));
+
+            case 15:
+              _context8.next = 5;
+              break;
+
+            case 17:
+              result = [];
+              _context8.next = 20;
+              return _promise.default.all((0, _map.default)(sqls).call(sqls, function (sql) {
+                return _this2.writeSql(sql).then(function (object) {
+                  (0, _common.merge)(result, (0, _common.encodeGraph)((0, _common.wrapObject)(object, prefix)));
+                });
+              }));
+
+            case 20:
+              log('dbWrite', rootChange, result);
+              return _context8.abrupt("return", result);
+
+            case 22:
+            case "end":
+              return _context8.stop();
+          }
+        }
+      }, _callee7);
+    }));
+
+    function write(_x8, _x9) {
+      return _write.apply(this, arguments);
+    }
+
+    return write;
+  }();
+
+  return Db;
+}();
+
+exports.default = Db;
+module.exports = exports.default;

package/cjs/filter/filterObject.js

@@ -11,7 +11,7 @@ var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-s
 
 var _common = require("@graffy/common");
 
-var _getAst = require("./getAst.js");
+var _getAst = _interopRequireDefault(require("./getAst.js"));
 
 function filterObject(filter, object) {
   function lookup(path) {
@@ -47,34 +47,19 @@ function filterObject(filter, object) {
         return !(0, _isArray.default)(ast[2]) || !(0, _includes.default)(_context2 = ast[2]).call(_context2, lookup(ast[1]));
 
       case '$cts':
-        throw Error('pgfilter.unimplemented');
-
       case '$ctd':
-        throw Error('pgfilter.unimplemented');
-
       case '$ovp':
-        throw Error('pgfilter.unimplemented');
-
       case '$and':
-        throw Error('pgfilter.unimplemented');
-
       case '$or':
-        throw Error('pgfilter.unimplemented');
-
       case '$not':
-        throw Error('pgfilter.unimplemented');
-
       case '$any':
-        throw Error('pgfilter.unimplemented');
-
       case '$all':
-        throw Error('pgfilter.unimplemented');
-
       case '$has':
+        throw Error('pgfilter.unimplemented');
     }
   }
 
-  var rootAst = (0, _getAst.getAst)(filter);
+  var rootAst = (0, _getAst.default)(filter);
   return checkNode(rootAst);
 }
 

package/cjs/filter/getAst.js

@@ -5,6 +5,8 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = getAst;
 
+var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
+
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
@@ -64,7 +66,7 @@ function construct(node, prop, op) {
   if (!node || typeof node !== 'object') {
     if (op && prop) return [op, prop, node];
     if (prop) return ['$eq', prop, node];
-    throw Error('pgast.expected_prop_before', node);
+    throw Error('pgast.expected_prop_before:' + (0, _stringify.default)(node));
   }
 
   if ((0, _isArray.default)(node)) {

package/cjs/filter/getSql.js

@@ -19,7 +19,7 @@ var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
 
 var _getAst = _interopRequireDefault(require("./getAst.js"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -36,61 +36,72 @@ function getSql(filter, getLookupSql) {
 
     switch (ast[0]) {
       case '$eq':
-        return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["", " = ", ""])), lhs(ast[1]), ast[2]);
+        if (ast[2] === null) return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["", " IS NULL"])), lhs(ast[1]));
+        return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", " = ", ""])), lhs(ast[1]), ast[2]);
 
-      case '$ne':
-        return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", " <> ", ""])), lhs(ast[1]), ast[2]);
+      case '$neq':
+        if (ast[2] === null) return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", " IS NOT NULL"])), lhs(ast[1]));
+        return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["", " <> ", ""])), lhs(ast[1]), ast[2]);
 
       case '$lt':
-        return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs(ast[1]), ast[2]);
 
       case '$lte':
-        return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs(ast[1]), ast[2]);
 
       case '$gt':
-        return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs(ast[1]), ast[2]);
 
       case '$gte':
-        return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs(ast[1]), ast[2]);
+
+      case '$re':
+        return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["", " ~ ", ""])), lhs(ast[1]), ast[2]);
+
+      case '$ire':
+        return (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", " ~* ", ""])), lhs(ast[1]), ast[2]);
 
       case '$in':
-        return (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["", " IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["", " IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
 
       case '$nin':
-        return (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["", " NOT IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["", " NOT IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
 
       case '$cts':
-        return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["", " @> ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["", " @> ", ""])), lhs(ast[1]), ast[2]);
 
       case '$ctd':
-        return (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", " <@ ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["", " <@ ", ""])), lhs(ast[1]), ast[2]);
 
       case '$ovp':
-        return (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["", " && ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteralLoose2.default)(["", " && ", ""])), lhs(ast[1]), ast[2]);
 
       case '$and':
-        return (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context = ast[1]).call(_context, function (node) {
-          return getNodeSql(node, getLookupSql);
+        return (0, _sqlTemplateTag.default)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context = ast[1]).call(_context, function (node) {
+          return getNodeSql(node);
         }), ") AND ("));
 
       case '$or':
-        return (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context2 = ast[1]).call(_context2, function (node) {
-          return getNodeSql(node, getLookupSql);
+        return (0, _sqlTemplateTag.default)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context2 = ast[1]).call(_context2, function (node) {
+          return getNodeSql(node);
         }), ") OR ("));
 
       case '$not':
-        return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["NOT (", ")"])), getNodeSql(ast[1], getLookupSql));
+        return (0, _sqlTemplateTag.default)(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteralLoose2.default)(["NOT (", ")"])), getNodeSql(ast[1]));
 
       case '$any':
-        return (0, _sqlTemplateTag.default)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3], getLookupSql), lhs(ast[1]), lhs(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
 
       case '$all':
-        return (0, _sqlTemplateTag.default)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_and(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3], getLookupSql), lhs(ast[1]), lhs(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject21 || (_templateObject21 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_and(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
 
       case '$has':
-        return (0, _sqlTemplateTag.default)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context3 = ast[3]).call(_context3, function (node) {
-          return getNodeSql(node, getLookupSql);
+        return (0, _sqlTemplateTag.default)(_templateObject22 || (_templateObject22 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context3 = ast[3]).call(_context3, function (node) {
+          return getNodeSql(node);
         }), ") AND bool_or("), lhs(ast[1]), lhs(ast[2]));
+
+      default:
+        throw Error('pg.getSql_unknown_operator: ' + ast[0]);
     }
   }