@onereach/idw-init-account-resources 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @onereach/idw-init-account-resources
 
+## 0.3.2
+
+### Patch Changes
+
+- ea5a2ad: use sequelize for sql migrations
+
 ## 0.3.1
 
 ### Patch Changes

package/dist/assets/db_migrations/20240527090840-create_feed_table.js

@@ -0,0 +1,65 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+module.exports = {
+    up: function (queryInterface) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, queryInterface.context.sequelize.query("\nCREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";\n\n-- Function to automatically set updated_at\nCREATE OR REPLACE FUNCTION update_updated_at()\nRETURNS TRIGGER AS $$\nBEGIN\n\tNEW.updated_at = now();\n\tRETURN NEW;\nEND;\n$$ language 'plpgsql';\n\n-- Table Definition\nCREATE TABLE feed (\n    \"id\" uuid NOT NULL DEFAULT uuid_generate_v4(),\n    \"image_url\" varchar,\n    \"title\" varchar NOT NULL,\n    \"short_content\" varchar NOT NULL,\n    \"content\" text NOT NULL,\n    \"created_at\" timestamptz NOT NULL DEFAULT now(),\n    \"updated_at\" timestamptz NOT NULL DEFAULT now(),\n    \"created_by\" uuid,\n    PRIMARY KEY (\"id\")\n);\n\n-- Column Comment\nCOMMENT ON COLUMN feed.id IS 'primary key';\nCOMMENT ON COLUMN feed.image_url IS 'the URL of the post in the feed. Visible in the list and the full post views';\nCOMMENT ON COLUMN feed.title IS 'title of the post';\nCOMMENT ON COLUMN feed.short_content IS 'partial content to show in the list of posts';\nCOMMENT ON COLUMN feed.content IS 'full content of the post';\nCOMMENT ON COLUMN feed.created_at IS 'timestamp when the post was created';\nCOMMENT ON COLUMN feed.updated_at IS 'timestamp when the post was last updated';\nCOMMENT ON COLUMN feed.created_by IS 'id of the person who created the post';\n\n-- Trigger to update 'updated_at' for feed table\nCREATE TRIGGER \"update_feed_updated_at\"\n    BEFORE UPDATE\n    ON\n        feed\n    FOR EACH ROW\nEXECUTE PROCEDURE update_updated_at();\n\n    ")];
+                    case 1:
+                        _a.sent();
+                        return [2];
+                }
+            });
+        });
+    },
+    down: function (queryInterface) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, queryInterface.context.sequelize.query("\n-- TODO: Implement undo script\n-- DROP SCHEMA \"idw\" CASCADE;\n    ")];
+                    case 1:
+                        _a.sent();
+                        return [2];
+                }
+            });
+        });
+    },
+};
+//# sourceMappingURL=20240527090840-create_feed_table.js.map

package/dist/assets/db_migrations/20240527090840-create_feed_table.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20240527090840-create_feed_table.js","sourceRoot":"","sources":["../../../src/assets/db_migrations/20240527090840-create_feed_table.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIb,MAAM,CAAC,OAAO,GAAG;IACT,EAAE,YAAC,cAAoE;;;;4BAC3E,WAAM,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,m8CA2C5C,CAAC,EAAA;;wBA3CF,SA2CE,CAAC;;;;;KAOJ;IAEK,IAAI,YAAC,cAAoE;;;;4BAC7E,WAAM,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,yEAG5C,CAAC,EAAA;;wBAHF,SAGE,CAAC;;;;;KAOJ;CACF,CAAC"}

package/dist/assets/db_migrations/20240527090856-add_user_columns.js

@@ -0,0 +1,65 @@
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+module.exports = {
+    up: function (queryInterface) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, queryInterface.context.sequelize.query("\nALTER TABLE \"feed\"\nADD COLUMN \"for_user_roles\" jsonb DEFAULT NULL,\nADD COLUMN \"for_user_emails\" jsonb DEFAULT NULL;\n\nCOMMENT ON COLUMN \"feed\".\"for_user_roles\" IS 'record available only for specific user roles';\nCOMMENT ON COLUMN \"feed\".\"for_user_emails\" IS 'record available only for specific users';\n\nCREATE INDEX \"feed_user_roles_gin_idx\" ON \"feed\" USING gin (for_user_roles);\nCREATE INDEX \"feed_user_emails_gin_idx\" ON \"feed\" USING gin (for_user_emails);\n\n-- example query for role includes admin or not set:\n-- SELECT * from \"idw\".\"feed\" WHERE \"for_user_roles\" IS NULL OR \"for_user_roles\" @> '[\"admin\"]';\n\n    ")];
+                    case 1:
+                        _a.sent();
+                        return [2];
+                }
+            });
+        });
+    },
+    down: function (queryInterface) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4, queryInterface.context.sequelize.query("\nALTER TABLE \"feed\"\nDROP COLUMN \"for_user_roles\",\nDROP COLUMN \"for_user_emails\";\n    ")];
+                    case 1:
+                        _a.sent();
+                        return [2];
+                }
+            });
+        });
+    },
+};
+//# sourceMappingURL=20240527090856-add_user_columns.js.map

package/dist/assets/db_migrations/20240527090856-add_user_columns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"20240527090856-add_user_columns.js","sourceRoot":"","sources":["../../../src/assets/db_migrations/20240527090856-add_user_columns.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIb,MAAM,CAAC,OAAO,GAAG;IACT,EAAE,YAAC,cAAoE;;;;4BAC3E,WAAM,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,upBAc5C,CAAC,EAAA;;wBAdF,SAcE,CAAC;;;;;KAOJ;IAEK,IAAI,YAAC,cAAoE;;;;4BAC7E,WAAM,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,iGAI5C,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KAOJ;CACF,CAAC"}

package/dist/initializers/rdb.js

@@ -50,16 +50,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InitRdbResources = exports.schemaTableName = void 0;
-var postgrator_1 = __importDefault(require("postgrator"));
-var pg_1 = __importDefault(require("pg"));
-var path_1 = require("path");
+exports.InitRdbResources = void 0;
+var sequelize_1 = require("sequelize");
+var umzug_1 = require("umzug");
+var path_1 = __importDefault(require("path"));
 var pgsql_1 = require("@or-sdk/pgsql");
-exports.schemaTableName = '_schema_version';
 var InitRdbResources = (function () {
     function InitRdbResources(_a) {
         var token = _a.token, discoveryUrl = _a.discoveryUrl;
-        this._migrationsTable = exports.schemaTableName;
         this.token = token;
         this.discoveryUrl = discoveryUrl;
         this.pgSql = new pgsql_1.Pgsql({
@@ -69,61 +67,32 @@ var InitRdbResources = (function () {
     }
     InitRdbResources.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var connectionParams, client;
+            var connectionParams, sequelize, umzug;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this._getPgConnectionParams()];
                     case 1:
                         connectionParams = _a.sent();
-                        client = new pg_1.default.Client(connectionParams);
-                        return [4, this._migrate(client, connectionParams.database)];
-                    case 2:
-                        _a.sent();
-                        return [2];
-                }
-            });
-        });
-    };
-    InitRdbResources.prototype._migrate = function (client, dbName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var postgrator, error_1;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 3, 4, 6]);
-                        return [4, client.connect()];
-                    case 1:
-                        _a.sent();
-                        postgrator = new postgrator_1.default({
-                            migrationPattern: (0, path_1.resolve)(__dirname, '../assets/db_migrations/*'),
-                            driver: 'pg',
-                            database: dbName !== null && dbName !== void 0 ? dbName : 'default',
-                            schemaTable: this._migrationsTable,
-                            execQuery: function (query) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4, client.query(query)];
-                                    case 1: return [2, _a.sent()];
-                                }
-                            }); }); },
+                        sequelize = new sequelize_1.Sequelize({
+                            database: connectionParams.database,
+                            username: connectionParams.user,
+                            password: connectionParams.password,
+                            host: connectionParams.host,
+                            dialect: 'postgres',
+                            logging: false,
                         });
-                        postgrator.on('validation-started', function (migration) { return console.debug('validation-started', migration); });
-                        postgrator.on('validation-finished', function (migration) { return console.debug('validation-finished', migration); });
-                        postgrator.on('migration-started', function (migration) { return console.debug('migration-started', migration); });
-                        postgrator.on('migration-finished', function (migration) { return console.debug('migration-finished', migration); });
-                        return [4, postgrator.migrate()];
+                        umzug = new umzug_1.Umzug({
+                            migrations: {
+                                glob: path_1.default.join(__dirname, '../assets/db_migrations/*.{js,ts}'),
+                            },
+                            context: sequelize.getQueryInterface(),
+                            storage: new umzug_1.SequelizeStorage({ sequelize: sequelize }),
+                            logger: undefined,
+                        });
+                        return [4, umzug.up()];
                     case 2:
                         _a.sent();
-                        return [3, 6];
-                    case 3:
-                        error_1 = _a.sent();
-                        console.error(error_1, error_1.appliedMigrations);
-                        throw error_1;
-                    case 4: return [4, client.end()];
-                    case 5:
-                        _a.sent();
-                        return [7];
-                    case 6: return [2];
+                        return [2];
                 }
             });
         });

package/dist/initializers/rdb.js.map

@@ -1 +1 @@
-{"version":3,"file":"rdb.js","sourceRoot":"","sources":["../../src/initializers/rdb.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rdb.js","sourceRoot":"","sources":["../../src/initializers/rdb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AACtC,+BAAgD;AAEhD,8CAAwB;AACxB,uCAAsC;AAGtC;IAKE,0BAAY,EAA+C;YAA7C,KAAK,WAAA,EAAE,YAAY,kBAAA;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;IAEY,+BAAI,GAAjB;;;;;4BAC2B,WAAM,IAAI,CAAC,sBAAsB,EAAE,EAAA;;wBAAtD,gBAAgB,GAAG,SAAmC;wBACtD,SAAS,GAAG,IAAI,qBAAS,CAC7B;4BACE,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;4BACnC,QAAQ,EAAE,gBAAgB,CAAC,IAAI;4BAC/B,QAAQ,EAAE,gBAAgB,CAAC,QAAkB;4BAC7C,IAAI,EAAE,gBAAgB,CAAC,IAAI;4BAC3B,OAAO,EAAE,UAAU;4BACnB,OAAO,EAAE,KAAK;yBACf,CAAC,CAAC;wBAEC,KAAK,GAAG,IAAI,aAAK,CAAC;4BACtB,UAAU,EAAE;gCACV,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,mCAAmC,CAAC;6BAChE;4BACD,OAAO,EAAE,SAAS,CAAC,iBAAiB,EAAE;4BACtC,OAAO,EAAE,IAAI,wBAAgB,CAAC,EAAE,SAAS,WAAA,EAAE,CAAC;4BAC5C,MAAM,EAAE,SAAS;yBAClB,CAAC,CAAC;wBACH,WAAM,KAAK,CAAC,EAAE,EAAE,EAAA;;wBAAhB,SAAgB,CAAC;;;;;KAClB;IAEa,iDAAsB,GAApC;4DAAqC,MAAsB;;YAAtB,uBAAA,EAAA,cAAsB;;;4BAEtC,WAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAqB;4BAClE,KAAK,EAAE,qBAAqB;4BAC5B,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE;yBAC7B,CAAC,EAAA;;wBAHM,MAAM,GAAK,CAAA,SAGjB,CAAA,OAHY;wBAKd,iCACK,MAAM,KACT,IAAI,EAAE,MAAM,CAAC,WAAW,KACxB;;;;KACH;IACH,uBAAC;AAAD,CAAC,AAlDD,IAkDC;AAlDY,4CAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/idw-init-account-resources",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Creation of required resources in OneReach account to enable IDW",
   "license": "UNLICENSED",
   "author": "Antony Peklo <antony.peklo@onereach.com>",
@@ -12,8 +12,9 @@
     "@or-sdk/lookup": "1.14.5",
     "@or-sdk/pgsql": "1.1.8",
     "pg": "8.11.5",
-    "postgrator": "7.2.0",
     "semver": "7.6.2",
+    "sequelize": "^6.37.3",
+    "umzug": "^3.8.0",
     "zod": "3.23.8"
   },
   "devDependencies": {
@@ -31,6 +32,7 @@
     "build": "rimraf dist && tsc -b",
     "build:watch": "rimraf dist && tsc -b --watch",
     "dev": "pnpm build:watch",
-    "local": "source ./scripts/or_login.sh && bun src/local.ts"
+    "local": "source ./scripts/or_login.sh && bun src/local.ts",
+    "migration:create": "npx sequelize-cli --migrations-path src/assets/db_migrations migration:generate --name $1"
   }
 }

package/src/assets/db_migrations/{0001.do.create_feed_table.sql → 20240527090840-create_feed_table.ts}

@@ -1,7 +1,14 @@
+'use strict';
+import { Sequelize, QueryInterface } from 'sequelize';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface: QueryInterface & {context: {sequelize: Sequelize;};}) {
+    await queryInterface.context.sequelize.query(`
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 
 -- Function to automatically set updated_at
-CREATE FUNCTION update_updated_at()
+CREATE OR REPLACE FUNCTION update_updated_at()
 RETURNS TRIGGER AS $$
 BEGIN
 	NEW.updated_at = now();
@@ -39,3 +46,26 @@ CREATE TRIGGER "update_feed_updated_at"
         feed
     FOR EACH ROW
 EXECUTE PROCEDURE update_updated_at();
+
+    `);
+    /**
+     * Add altering commands here.
+     *
+     * Example:
+     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
+     */
+  },
+
+  async down(queryInterface: QueryInterface & {context: {sequelize: Sequelize;};}) {
+    await queryInterface.context.sequelize.query(`
+-- TODO: Implement undo script
+-- DROP SCHEMA "idw" CASCADE;
+    `);
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+  },
+};

package/src/assets/db_migrations/20240527090856-add_user_columns.ts

@@ -0,0 +1,43 @@
+'use strict';
+import { Sequelize, QueryInterface } from 'sequelize';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface: QueryInterface & {context: {sequelize: Sequelize;};}) {
+    await queryInterface.context.sequelize.query(`
+ALTER TABLE "feed"
+ADD COLUMN "for_user_roles" jsonb DEFAULT NULL,
+ADD COLUMN "for_user_emails" jsonb DEFAULT NULL;
+
+COMMENT ON COLUMN "feed"."for_user_roles" IS 'record available only for specific user roles';
+COMMENT ON COLUMN "feed"."for_user_emails" IS 'record available only for specific users';
+
+CREATE INDEX "feed_user_roles_gin_idx" ON "feed" USING gin (for_user_roles);
+CREATE INDEX "feed_user_emails_gin_idx" ON "feed" USING gin (for_user_emails);
+
+-- example query for role includes admin or not set:
+-- SELECT * from "idw"."feed" WHERE "for_user_roles" IS NULL OR "for_user_roles" @> '["admin"]';
+
+    `);
+    /**
+     * Add altering commands here.
+     *
+     * Example:
+     * await queryInterface.createTable('users', { id: Sequelize.INTEGER });
+     */
+  },
+
+  async down(queryInterface: QueryInterface & {context: {sequelize: Sequelize;};}) {
+    await queryInterface.context.sequelize.query(`
+ALTER TABLE "feed"
+DROP COLUMN "for_user_roles",
+DROP COLUMN "for_user_emails";
+    `);
+    /**
+     * Add reverting commands here.
+     *
+     * Example:
+     * await queryInterface.dropTable('users');
+     */
+  },
+};

package/src/initializers/rdb.ts

@@ -1,16 +1,14 @@
-import Postgrator from 'postgrator';
+import { Sequelize } from 'sequelize';
+import { Umzug, SequelizeStorage } from 'umzug';
 import pg from 'pg';
-import { resolve } from 'path';
+import path from 'path';
 import { Pgsql } from '@or-sdk/pgsql';
 import { DbConnectionParams, InitRdbResourcesConfig } from '../types';
 
-export const schemaTableName = '_schema_version';
-
 export class InitRdbResources {
   private token: string;
   private discoveryUrl: string;
   private pgSql: Pgsql;
-  private readonly _migrationsTable = schemaTableName;
 
   constructor({ token, discoveryUrl }: InitRdbResourcesConfig) {
     this.token = token;
@@ -24,40 +22,25 @@ export class InitRdbResources {
 
   public async init(): Promise<void> {
     const connectionParams = await this._getPgConnectionParams();
-    const client = new pg.Client(connectionParams);
-
-    await this._migrate(client, connectionParams.database);
-  }
-
-  private async _migrate(client: pg.Client, dbName?: string): Promise<void> {
-    try {
-      await client.connect();
-
-      // Create postgrator instance
-      const postgrator = new Postgrator({
-        migrationPattern: resolve(__dirname, '../assets/db_migrations/*'),
-        driver: 'pg',
-        database: dbName ?? 'default',
-        schemaTable: this._migrationsTable,
-        execQuery: async (query) => await client.query(query),
+    const sequelize = new Sequelize(
+      {
+        database: connectionParams.database,
+        username: connectionParams.user,
+        password: connectionParams.password as string,
+        host: connectionParams.host,
+        dialect: 'postgres',
+        logging: false,
       });
 
-      // TODO: improve logging
-      postgrator.on('validation-started', (migration) => console.debug('validation-started', migration));
-      postgrator.on('validation-finished', (migration) => console.debug('validation-finished', migration));
-      postgrator.on('migration-started', (migration) => console.debug('migration-started', migration));
-      postgrator.on('migration-finished', (migration) => console.debug('migration-finished', migration));
-
-      // migrate to max version (optionally can provide 'max')
-      await postgrator.migrate();
-    } catch (error) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      console.error(error, (error as any).appliedMigrations); // array of migration objects
-
-      throw error;
-    } finally {
-      await client.end();
-    }
+    const umzug = new Umzug({
+      migrations: {
+        glob: path.join(__dirname, '../assets/db_migrations/*.{js,ts}'),
+      },
+      context: sequelize.getQueryInterface(),
+      storage: new SequelizeStorage({ sequelize }),
+      logger: undefined,
+    });
+    await umzug.up();
   }
 
   private async _getPgConnectionParams(dbName: string = 'idw'): Promise<pg.ClientConfig> {

package/src/assets/db_migrations/0001.undo.create_feed_table.sql

@@ -1,2 +0,0 @@
--- TODO: Implement undo script
--- DROP SCHEMA "idw" CASCADE;

package/src/assets/db_migrations/0002.do.add_user_columns.sql

@@ -1,12 +0,0 @@
-ALTER TABLE "feed"
-ADD COLUMN "for_user_roles" jsonb DEFAULT NULL,
-ADD COLUMN "for_user_emails" jsonb DEFAULT NULL;
-
-COMMENT ON COLUMN "feed"."for_user_roles" IS 'record available only for specific user roles';
-COMMENT ON COLUMN "feed"."for_user_emails" IS 'record available only for specific users';
-
-CREATE INDEX "feed_user_roles_gin_idx" ON "feed" USING gin (for_user_roles);
-CREATE INDEX "feed_user_emails_gin_idx" ON "feed" USING gin (for_user_emails);
-
--- example query for role includes admin or not set:
--- SELECT * from "idw"."feed" WHERE "for_user_roles" IS NULL OR "for_user_roles" @> '["admin"]';

package/src/assets/db_migrations/0002.undo.add_user_columns.sql

@@ -1,3 +0,0 @@
-ALTER TABLE "feed"
-DROP COLUMN "for_user_roles",
-DROP COLUMN "for_user_emails";