@cuboapp/api-backend 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",
@@ -11,8 +11,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@cuboapp/config": "^0.0.6",
-    "@cuboapp/types": "^1.0.20",
+    "@cuboapp/config": "^0.0.9",
+    "@cuboapp/types": "^1.0.21",
     "lodash-es": "^4.17.21",
     "pg": "^8.13.3",
     "sequelize": "^6.37.6"

package/pnpm-lock.yaml

@@ -9,11 +9,11 @@ importers:
   .:
     dependencies:
       '@cuboapp/config':
-        specifier: ^0.0.6
-        version: 0.0.6
+        specifier: ^0.0.9
+        version: 0.0.9
       '@cuboapp/types':
-        specifier: ^1.0.20
-        version: 1.0.20
+        specifier: ^1.0.21
+        version: 1.0.21
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
@@ -36,14 +36,11 @@ importers:
 
 packages:
 
-  '@cuboapp/config@0.0.6':
-    resolution: {integrity: sha512-2sQKqPYUK3YH46CPgbJXzvzD8QLxHm5CVrSAj78rxDzqX/xnnAAqOYfn4QS6B/4GZxRexNp2OkKH5c2ea+dXRg==}
+  '@cuboapp/config@0.0.9':
+    resolution: {integrity: sha512-xkCZFOGTO6E8FhowmebthZ50deslWyak6HxhSPGUqktRazMa/6DVyZnTFQBs4Xt271GBXoRekXy8xNGVJnzCrg==}
 
-  '@cuboapp/types@1.0.19':
-    resolution: {integrity: sha512-CZyut9MmCT+5bBBbZF3ETiJnRbgnExvx/+zT/UKj4NxZKlqQAnzX8hWIFMBbed3YoSkbS+cdZcJE26k5mLNPjw==}
-
-  '@cuboapp/types@1.0.20':
-    resolution: {integrity: sha512-PDeJ4GOsVA6OhC1ryd8XwBrnZ7k6mB48GEnMLDdgw3ACRxV2KaWc/5bDrZUdfRjggOAXmwEhX+8rvqfNvp93hg==}
+  '@cuboapp/types@1.0.21':
+    resolution: {integrity: sha512-DIxfZRAEVX+PupP86Lii6lQXZ+CC6MWDxNUOO1FSWfJVqphXtvW52DFguhd9tu+TN50sHYS/BcjMLD1nJXw4KQ==}
 
   '@types/debug@4.1.12':
     resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
@@ -232,17 +229,13 @@ packages:
 
 snapshots:
 
-  '@cuboapp/config@0.0.6':
+  '@cuboapp/config@0.0.9':
     dependencies:
-      '@cuboapp/types': 1.0.19
+      '@cuboapp/types': 1.0.21
       dotenv: 16.4.7
       dotenv-expand: 12.0.1
 
-  '@cuboapp/types@1.0.19':
-    dependencies:
-      '@types/events': 3.0.3
-
-  '@cuboapp/types@1.0.20':
+  '@cuboapp/types@1.0.21':
     dependencies:
       '@types/events': 3.0.3
 

package/src/helpers/convert.ts

@@ -42,7 +42,8 @@ export class ApiHelpersConvert<T extends CuboApiEntitiesMap<T>> {
 
       const rowValue = get(row, initialValueKey, undefined)
 
-      if (!withEl.entity.id && withEl.entity.alias === 'users') {
+      // todo: fix fields from core
+      if (!withEl.entity && withEl.entity.alias === 'users') {
         userFieldsPrepared.push(withEl.full_key)
 
         switch (rowValue) {

package/src/helpers/index.ts

@@ -291,6 +291,7 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
       let password: string = ''
       let schema: string = ''
       let dialect: string = ''
+      let dialectModule: any = undefined
 
       if (!this.api.config.db) {
         throw 'DB connection is not configured'
@@ -307,6 +308,7 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
       }
 
       database = cfg.database as string
+      dialectModule = cfg.dialectModule as string
       host = cfg.host as string
       port = cfg.port as number
       username = cfg.username as string
@@ -330,6 +332,10 @@ export class ApiHelpers<T extends CuboApiEntitiesMap<T>> {
         schema
       }
 
+      if (dialectModule) {
+        config.dialectModule = dialectModule
+      }
+
       // cert for yandex cloud
       if (/yandexcloud/.test(config.host!)) {
         config.dialectOptions = {