@cuboapp/database 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/database",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Database methods",
   "main": "src/index.ts",
   "repository": "git@cuboapp.gitlab.yandexcloud.net:cubo/database.git",

package/src/db/index.ts

@@ -59,7 +59,11 @@ export class Database {
 
       switch (this.connectOptions.dialect) {
         case 'postgres':
-          sql = `insert into ${table} (${keys}) values (${values}) returning ${pkKey}`
+          if (!!pkKey) {
+            sql = `insert into ${table} (${keys}) values (${values}) returning ${pkKey}`
+          } else {
+            sql = `insert into ${table} (${keys}) values (${values})`
+          }
           break
         case 'mysql':
           sql = `insert into ${table} (${keys}) values (${values})`
@@ -79,6 +83,10 @@ export class Database {
           transaction: opts?.transaction
         })
         .then((res: any) => {
+          if (!pkKey) {
+            return []
+          }
+
           let pk = []
 
           switch (this.connectOptions.dialect) {
@@ -114,7 +122,11 @@ export class Database {
 
       switch (this.connectOptions.dialect) {
         case 'postgres':
-          sql = `update ${table} set ${prepared.query} where ${where} returning ${pkKey}`
+          if (pkKey) {
+            sql = `update ${table} set ${prepared.query} where ${where} returning ${pkKey}`
+          } else {
+            sql = `update ${table} set ${prepared.query} where ${where}`
+          }
           break
         case 'mysql':
           sql = `update ${table} set ${prepared.query} where ${where}`
@@ -140,7 +152,7 @@ export class Database {
         case 'postgres':
           const res = result as unknown as [{ [pkKey]: T }[], T]
 
-          return res[0].map((r) => (pkType === 'number' ? +r[pkKey] : r[pkKey])) as T[]
+          return res[0].map((r) => (!!pkKey ? (pkType === 'number' ? +r[pkKey] : r[pkKey]) : r)) as T[]
         case 'mysql':
           return res as T[]
       }

package/src/db/utils.ts

@@ -1,4 +1,4 @@
-import { Options, QueryTypes, Sequelize, Transaction } from 'sequelize'
+import { literal, Options, QueryTypes, Sequelize, Transaction } from 'sequelize'
 
 import { Database } from '.'
 import { DatabaseOptions } from './types'
@@ -22,9 +22,13 @@ export function dbPrepareUpdateQueryString(obj: Record<string, any>, prefix = ''
       val = value
     } else if (Array.isArray(value) || typeof value === 'object') {
       if (Buffer.isBuffer(value)) {
-        val = value
+        val = literal(value.toString('utf-8'))
       } else {
-        val = value ? JSON.stringify(value) : null
+        if (value?.constructor?.name === 'Literal') {
+          val = value
+        } else {
+          val = value ? JSON.stringify(value) : null
+        }
       }
     }
 
@@ -45,6 +49,8 @@ export function dbPrepareInsertQueryString(obj: Record<string, any>, prefix = ''
 
     let val = null
 
+    // console.log(key, typeof value, value, value?.constructor?.name, value?.name)
+
     if (typeof value === 'string') {
       val = !!value ? value : null
     } else if (typeof value === 'number') {
@@ -53,9 +59,13 @@ export function dbPrepareInsertQueryString(obj: Record<string, any>, prefix = ''
       val = value
     } else if (Array.isArray(value) || typeof value === 'object') {
       if (Buffer.isBuffer(value)) {
-        val = value
+        val = literal(value.toString('utf-8'))
       } else {
-        val = value ? JSON.stringify(value) : null
+        if (value?.constructor?.name === 'Literal') {
+          val = value
+        } else {
+          val = value ? JSON.stringify(value) : null
+        }
       }
     }