@cheetah.js/orm 0.1.131 → 0.1.135

package/dist/domain/base-entity.js

@@ -12,7 +12,7 @@ class BaseEntity {
         this.$_isPersisted = false;
         return new Proxy(this, {
             set(target, p, newValue) {
-                if (p.startsWith('$')) {
+                if (p.startsWith('$') || p.startsWith('_')) {
                     target[p] = newValue;
                     return true;
                 }

package/dist/driver/bun-mysql.driver.js

@@ -217,13 +217,13 @@ class BunMysqlDriver extends bun_driver_base_1.BunDriverBase {
         });
     }
     async constraints(tableName, options) {
-        const result = await this.sql.unsafe(`SELECT
-        CONSTRAINT_NAME as index_name,
-        CONCAT('REFERENCES \`', REFERENCED_TABLE_NAME, '\` (\`', REFERENCED_COLUMN_NAME, '\`)') as consdef,
-        'FOREIGN KEY' as constraint_type
-       FROM information_schema.KEY_COLUMN_USAGE
-       WHERE TABLE_NAME = '${tableName}'
-         AND TABLE_SCHEMA = DATABASE()
+        const result = await this.sql.unsafe(`SELECT
+        CONSTRAINT_NAME as index_name,
+        CONCAT('REFERENCES \`', REFERENCED_TABLE_NAME, '\` (\`', REFERENCED_COLUMN_NAME, '\`)') as consdef,
+        'FOREIGN KEY' as constraint_type
+       FROM information_schema.KEY_COLUMN_USAGE
+       WHERE TABLE_NAME = '${tableName}'
+         AND TABLE_SCHEMA = DATABASE()
          AND REFERENCED_TABLE_NAME IS NOT NULL`);
         return result.map((row) => {
             return {

package/dist/driver/bun-pg.driver.js

@@ -182,8 +182,8 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
     }
     async index(tableName, options) {
         const schema = (options && options.schema) || 'public';
-        let result = await this.sql.unsafe(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
-       FROM pg_indexes
+        let result = await this.sql.unsafe(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
+       FROM pg_indexes
        WHERE tablename = '${tableName}' AND schemaname = '${schema}'`);
         result = result.filter((row) => row.index_name.includes('_pkey') || !row.column_name.includes('UNIQUE INDEX'));
         return result.map((row) => {
@@ -196,30 +196,30 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
     }
     async constraints(tableName, options) {
         const schema = (options && options.schema) || 'public';
-        const result = await this.sql.unsafe(`SELECT
-        conname AS index_name,
-        pg_get_constraintdef(pg_constraint.oid) as consdef,
-        CASE contype
-            WHEN 'c' THEN 'CHECK'
-            WHEN 'f' THEN 'FOREIGN KEY'
-            WHEN 'p' THEN 'PRIMARY KEY'
-            WHEN 'u' THEN 'UNIQUE'
-            WHEN 't' THEN 'TRIGGER'
-            WHEN 'x' THEN 'EXCLUSION'
-            ELSE 'UNKNOWN'
-            END AS constraint_type
-       FROM pg_constraint
-       where conrelid =  (
-           SELECT oid
-           FROM pg_class
-           WHERE relname = '${tableName}'
-             AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schema}')
-       )
-         AND conkey @> ARRAY(
-           SELECT attnum
-    FROM pg_attribute
-    WHERE attrelid = conrelid
-      AND attname = '${schema}'
+        const result = await this.sql.unsafe(`SELECT
+        conname AS index_name,
+        pg_get_constraintdef(pg_constraint.oid) as consdef,
+        CASE contype
+            WHEN 'c' THEN 'CHECK'
+            WHEN 'f' THEN 'FOREIGN KEY'
+            WHEN 'p' THEN 'PRIMARY KEY'
+            WHEN 'u' THEN 'UNIQUE'
+            WHEN 't' THEN 'TRIGGER'
+            WHEN 'x' THEN 'EXCLUSION'
+            ELSE 'UNKNOWN'
+            END AS constraint_type
+       FROM pg_constraint
+       where conrelid =  (
+           SELECT oid
+           FROM pg_class
+           WHERE relname = '${tableName}'
+             AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = '${schema}')
+       )
+         AND conkey @> ARRAY(
+           SELECT attnum
+    FROM pg_attribute
+    WHERE attrelid = conrelid
+      AND attname = '${schema}'
   )`);
         return result.map((row) => {
             return {
@@ -230,10 +230,10 @@ class BunPgDriver extends bun_driver_base_1.BunDriverBase {
         });
     }
     async getEnums(tableName, schema) {
-        const result = await this.sql.unsafe(`SELECT e.enumlabel as label, t.typname as type
-       FROM pg_type t
-       JOIN pg_enum e ON t.oid = e.enumtypid
-       JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+        const result = await this.sql.unsafe(`SELECT e.enumlabel as label, t.typname as type
+       FROM pg_type t
+       JOIN pg_enum e ON t.oid = e.enumtypid
+       JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
        WHERE n.nspname = '${schema}'`);
         return result.map((row) => {
             return {

package/dist/orm.js

@@ -48,6 +48,9 @@ let Orm = Orm_1 = class Orm {
         if (!this.driverInstance) {
             throw new Error('Driver instance not initialized');
         }
+        if (transaction_context_1.transactionContext.hasContext()) {
+            return operation(transaction_context_1.transactionContext.getContext());
+        }
         return this.driverInstance.transaction(async (tx) => {
             return transaction_context_1.transactionContext.run(tx, () => operation(tx));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.131",
+  "version": "0.1.135",
   "description": "A simple ORM for Cheetah.js.",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "1770fe312c1227aa2928ebfc4f9ac82a8411d4e6"
+  "gitHead": "640794a5fc98073f33a057b099658ee184371112"
 }

package/build.d.ts

@@ -1 +0,0 @@
-export {};

package/cheetah.config.d.ts

@@ -1,3 +0,0 @@
-import { ConnectionSettings } from '@cheetah.js/orm/driver/driver.interface';
-declare const config: ConnectionSettings<any>;
-export default config;