@cheetah.js/orm 0.1.63 → 0.1.65

package/dist/SqlBuilder.js

@@ -285,9 +285,10 @@ class SqlBuilder {
         }
     }
     setDefaultValue(values, key, property) {
-        if (typeof values[key] !== 'undefined')
+        const columnName = property.options.columnName;
+        if (typeof values[columnName] !== 'undefined')
             return;
-        values[key] = typeof property.options.default === 'function'
+        values[columnName] = typeof property.options.default === 'function'
             ? property.options.default()
             : property.options.default;
     }
@@ -296,8 +297,9 @@ class SqlBuilder {
         properties.forEach(([key, property]) => this.applyOnInsert(values, key, property));
     }
     applyOnInsert(values, key, property) {
-        values[key] = property.options.onInsert();
-        this.updatedColumns.push(`${this.statements.alias}."${key}" as "${this.statements.alias}_${key}"`);
+        const columnName = property.options.columnName;
+        values[columnName] = property.options.onInsert();
+        this.updatedColumns.push(`${this.statements.alias}."${columnName}" as "${this.statements.alias}_${columnName}"`);
     }
     withUpdatedValues(values, entityOptions) {
         const properties = Object.entries(entityOptions.properties).filter(([_, value]) => value.options.onUpdate);

package/dist/query/model-transformer.d.ts

@@ -18,4 +18,5 @@ export declare class ModelTransformer {
     private findRelationProperty;
     private attachJoinedEntity;
     private appendToArray;
+    private resetChangedValues;
 }

package/dist/query/model-transformer.js

@@ -12,6 +12,7 @@ class ModelTransformer {
         const optionsMap = this.buildOptionsMap(instanceMap);
         this.populateProperties(data, instanceMap, optionsMap);
         this.linkJoinedEntities(statement, instanceMap, optionsMap);
+        this.resetChangedValues(instanceMap);
         return instanceMap[statement.alias];
     }
     createInstances(model, statement) {
@@ -118,5 +119,17 @@ class ModelTransformer {
     appendToArray(existingArray, newItem) {
         return existingArray ? [...existingArray, newItem] : [newItem];
     }
+    resetChangedValues(instanceMap) {
+        Object.values(instanceMap).forEach(instance => {
+            const currentValues = {};
+            for (const key in instance) {
+                if (!key.startsWith('_') && !key.startsWith('$')) {
+                    currentValues[key] = instance[key];
+                }
+            }
+            instance._oldValues = currentValues;
+            instance._changedValues = {};
+        });
+    }
 }
 exports.ModelTransformer = ModelTransformer;

package/dist/testing/with-database.js

@@ -54,12 +54,37 @@ const DEFAULT_CONNECTION = {
     password: 'postgres',
     driver: bun_pg_driver_1.BunPgDriver,
 };
+const sessionCache = new Map();
+function getCacheKey(options) {
+    const connection = resolveConnection(options.connection);
+    return JSON.stringify({
+        host: connection.host,
+        port: connection.port,
+        database: connection.database,
+        schema: options.schema ?? DEFAULT_SCHEMA,
+        entityFile: options.entityFile,
+        migrationPath: connection.migrationPath,
+    });
+}
 async function withDatabase(arg1, arg2, arg3) {
     const { routine: targetRoutine, options: targetOptions, statements } = await normalizeArgs(arg1, arg2, arg3);
-    const session = await createSession(targetOptions);
-    const context = buildContext(session.orm);
+    const cacheKey = getCacheKey(targetOptions);
+    let cachedSession = sessionCache.get(cacheKey);
     const schemaStatements = await resolveSchemaStatements(statements, targetOptions);
-    await executeWithinSession(session, context, schemaStatements, targetRoutine);
+    if (!cachedSession) {
+        const session = await createSession(targetOptions);
+        cachedSession = {
+            orm: session.orm,
+            tables: [],
+            schema: session.schema,
+        };
+        sessionCache.set(cacheKey, cachedSession);
+    }
+    const context = buildContext(cachedSession.orm);
+    await dropAndRecreateSchema(context, cachedSession.schema);
+    await prepareSchema(context, cachedSession.schema);
+    await createTables(context, schemaStatements);
+    await targetRoutine(context);
 }
 async function createSession(options) {
     const logger = selectLogger(options);
@@ -109,16 +134,6 @@ async function executeSql(orm, sql) {
     const result = await orm.driverInstance.executeSql(sql);
     return { rows: Array.isArray(result) ? result : [] };
 }
-async function executeWithinSession(session, context, statements, routine) {
-    try {
-        await prepareSchema(context, session.schema);
-        await createTables(context, statements);
-        await routine(context);
-    }
-    finally {
-        await resetSession(session, context);
-    }
-}
 async function createTables(context, statements) {
     const payload = statements.filter(Boolean);
     if (payload.length < 1) {
@@ -131,17 +146,8 @@ async function executeStatements(context, statements) {
         await context.executeSql(statement);
     }
 }
-async function resetSession(session, context) {
-    await dropSchema(session, context);
-    await ensureSearchPath(context, session.schema);
-    await session.orm.disconnect();
-}
-async function dropSchema(session, context) {
-    const statement = buildDropStatement(session.schema);
-    await context.executeSql(statement);
-}
-function buildDropStatement(schema) {
-    return `DROP SCHEMA IF EXISTS ${schema} CASCADE; CREATE SCHEMA ${schema};`;
+async function dropAndRecreateSchema(context, schema) {
+    await context.executeSql(`DROP SCHEMA IF EXISTS ${schema} CASCADE; CREATE SCHEMA ${schema};`);
 }
 async function normalizeArgs(tablesOrRoutine, routineOrOptions, optionsOrStatements) {
     if (Array.isArray(tablesOrRoutine)) {

package/dist/utils/value-processor.js

@@ -65,8 +65,9 @@ class ValueProcessor {
             if (property.options.onUpdate && moment === 'update') {
                 instance[key] = property.options.onUpdate();
             }
-            if (key in values) {
-                instance[key] = values[property.options.columnName];
+            const columnName = property.options.columnName;
+            if (columnName in values) {
+                instance[key] = values[columnName];
             }
         });
         if (relations) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "b81c351dba661381729aa4aa04985276596f4ac9"
+  "gitHead": "8792dea14d85bab1370809ad79060103e35bf0e3"
 }