@quatrain/backend-sqlite 1.1.7 → 1.1.8

package/dist/SQLiteAdapter.d.ts

@@ -10,7 +10,6 @@ export declare class SQLiteAdapter extends AbstractBackendAdapter {
     protected _connection: undefined | Database<sqlite3.Database>;
     protected _dbPath: string;
     constructor(params?: BackendParameters);
-    protected _buildPath(dataObject: DataObjectClass<any>, uid?: string): string;
     /**
      * Executes an arbitrary raw SQL query against the SQLite database.
      *
@@ -26,7 +25,7 @@ export declare class SQLiteAdapter extends AbstractBackendAdapter {
      * @param filterNulls
      * @returns
      */
-    protected _prepareData(data: any, filterNulls?: boolean): any;
+    protected _prepareData(data: any, filterNulls?: boolean): any[];
     /**
      * Ensure the collection table exists in SQLite
      * @param dataObject DataObject to create table for

package/dist/SQLiteAdapter.js

@@ -44,24 +44,6 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
         super(params);
         this._dbPath = ((_a = params.config) === null || _a === void 0 ? void 0 : _a.database) || ':memory:';
     }
-    _buildPath(dataObject, uid) {
-        const collection = this.getCollection(dataObject);
-        if (!collection) {
-            throw new backend_1.BackendError(`[SQLA] Can't define record path without a collection name`);
-        }
-        // define document path
-        let path = `${collection}/${uid}`;
-        if (this._params.hierarchy &&
-            this._params.hierarchy[collection] ===
-                backend_1.CollectionHierarchy.SUBCOLLECTION &&
-            dataObject.parentProp &&
-            dataObject.has(dataObject.parentProp) &&
-            dataObject.val(dataObject.parentProp)) {
-            path = `${dataObject.val(dataObject.parentProp).path}/${path}`;
-        }
-        backend_1.Backend.info(`[SQLA] Record path is '${path}'`);
-        return path;
-    }
     /**
      * Executes an arbitrary raw SQL query against the SQLite database.
      *
@@ -119,21 +101,7 @@ class SQLiteAdapter extends backend_1.AbstractBackendAdapter {
                 data[key] = JSON.stringify(el);
             }
         });
-        if (this._params['useNativeForeignKeys'] &&
-            this._params['useNativeForeignKeys'] === true) {
-            data.forEach((el, key) => {
-                if (typeof el === 'object' &&
-                    el !== null &&
-                    Reflect.has(el, 'ref')) {
-                    const resourcePart = el.ref.split('/').pop();
-                    if (resourcePart.indexOf('.') === -1) {
-                        // convert reference for database objects only
-                        data[key] = el.ref.split('/').pop();
-                    }
-                }
-            });
-        }
-        return data;
+        return this._resolveNativeForeignKeys(data);
     }
     /**
      * Ensure the collection table exists in SQLite

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/backend-sqlite",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "license": "AGPL-3.0-only",
   "description": "Backend adapter for SQLite",
   "main": "dist/index.js",
@@ -20,15 +20,15 @@
   },
   "author": "Quatrain Développement SAS <developers@quatrain.com>",
   "dependencies": {
-    "@quatrain/backend": "^1.2.7",
-    "@quatrain/core": "^1.2.5",
+    "@quatrain/backend": "^1.2.12",
+    "@quatrain/core": "^1.2.14",
     "sqlite": "^5.1.1",
     "sqlite3": "^5.1.7"
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
     "@jest/expect": "^30.0.0",
-    "@quatrain/testing": "^1.1.3",
+    "@quatrain/testing": "^1.1.4",
     "@tsconfig/recommended": "^1.0.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.10.1",

package/src/SQLiteAdapter.ts

@@ -17,7 +17,6 @@ import {
    Filter,
    SortAndLimit,
    Sorting,
-   CollectionHierarchy,
 } from '@quatrain/backend'
 import { randomUUID } from 'node:crypto'
 import sqlite3, { Statement } from 'sqlite3'
@@ -53,31 +52,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
       this._dbPath = (params.config?.database as string) || ':memory:'
    }
 
-   protected _buildPath(dataObject: DataObjectClass<any>, uid?: string) {
-      const collection = this.getCollection(dataObject)
-      if (!collection) {
-         throw new BackendError(
-            `[SQLA] Can't define record path without a collection name`
-         )
-      }
-
-      // define document path
-      let path = `${collection}/${uid}`
-      if (
-         this._params.hierarchy &&
-         this._params.hierarchy[collection] ===
-            CollectionHierarchy.SUBCOLLECTION &&
-         dataObject.parentProp &&
-         dataObject.has(dataObject.parentProp) &&
-         dataObject.val(dataObject.parentProp)
-      ) {
-         path = `${dataObject.val(dataObject.parentProp).path}/${path}`
-      }
-
-      Backend.info(`[SQLA] Record path is '${path}'`)
 
-      return path
-   }
 
    /**
     * Executes an arbitrary raw SQL query against the SQLite database.
@@ -137,26 +112,7 @@ export class SQLiteAdapter extends AbstractBackendAdapter {
          }
       })
 
-      if (
-         this._params['useNativeForeignKeys'] &&
-         this._params['useNativeForeignKeys'] === true
-      ) {
-         data.forEach((el: any, key: number) => {
-            if (
-               typeof el === 'object' &&
-               el !== null &&
-               Reflect.has(el, 'ref')
-            ) {
-               const resourcePart = el.ref.split('/').pop()
-               if (resourcePart.indexOf('.') === -1) {
-                  // convert reference for database objects only
-                  data[key] = el.ref.split('/').pop()
-               }
-            }
-         })
-      }
-
-      return data
+      return this._resolveNativeForeignKeys(data)
    }
 
    /**