@snowtop/ent 0.1.0-alpha135 → 0.1.0-alpha136

package/action/executor.js

@@ -277,9 +277,7 @@ async function executeOperations(executor, context, trackOps) {
         if (executor.postFetch) {
             await executor.postFetch(client, context);
         }
-        if (executor.executeObservers) {
-            await executor.executeObservers();
-        }
+        client.release();
     }
     catch (e) {
         if (!isSyncClient(client)) {
@@ -287,11 +285,15 @@ async function executeOperations(executor, context, trackOps) {
             (0, ent_1.logQuery)("ROLLBACK", []);
             await client.query("ROLLBACK");
         }
+        client.release(e);
         (0, logger_1.log)("error", e);
         throw e;
     }
-    finally {
-        client.release();
+    if (executor.executeObservers) {
+        try {
+            await executor.executeObservers();
+        }
+        catch (e) { }
     }
     return operations;
 }

package/core/db.d.ts

@@ -22,6 +22,7 @@ interface clientConfigArgs {
     connectionString?: string;
     dbFile?: string;
     db?: Database | DBDict;
+    cfg?: PoolConfig;
 }
 export default class DB {
     db: DatabaseInfo;

package/core/db.js

@@ -46,9 +46,7 @@ function parseConnectionString(str, args) {
             dialect: Dialect.SQLite,
             config: {
                 connectionString: str,
-                // TODO would like to do this for other args e.g. max being set but would have to update tests
-                // e.g. src/core/config.test.ts which tests this
-                // ...args?.db,
+                ...args?.cfg,
             },
             filePath,
         };
@@ -56,10 +54,8 @@ function parseConnectionString(str, args) {
     return {
         dialect: Dialect.Postgres,
         config: {
+            ...args?.cfg,
             connectionString: str,
-            // TODO would like to do this for other args e.g. max being set but would have to update tests
-            // e.g. src/core/config.test.ts which tests this
-            // ...args?.db,
         },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha135",
+  "version": "0.1.0-alpha136",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/testutils/action/complex_schemas.js

@@ -173,11 +173,14 @@ exports.ChangelogSchema = (0, builder_1.getBuilderSchemaFromFields)({
 }, Changelog);
 exports.MessageSchema = (0, builder_1.getBuilderSchemaFromFields)({
     // TODO both id fields
-    sender: (0, field_1.StringType)(),
+    sender: (0, field_1.StringType)({
+        index: true,
+    }),
     recipient: (0, field_1.StringType)(),
     message: (0, field_1.StringType)(),
     transient: (0, field_1.BooleanType)({ nullable: true }),
     expiresAt: (0, field_1.TimestampType)({ nullable: true }),
+    delivered: (0, field_1.BooleanType)({ defaultValueOnCreate: () => false }),
 }, builder_1.Message);
 jest.spyOn(action, "saveBuilder").mockImplementation(saveBuilder);
 jest.spyOn(action, "saveBuilderX").mockImplementation(saveBuilderX);
@@ -233,8 +236,12 @@ class MessageAction extends builder_1.SimpleAction {
                 changeset: (builder, _input) => {
                     let sender = builder.fields.get("sender");
                     let recipient = builder.fields.get("recipient");
-                    builder.orchestrator.addInboundEdge(sender, "senderToMessage", "user");
-                    builder.orchestrator.addInboundEdge(recipient, "recipientToMessage", "user");
+                    if (sender) {
+                        builder.orchestrator.addInboundEdge(sender, "senderToMessage", "user");
+                    }
+                    if (recipient) {
+                        builder.orchestrator.addInboundEdge(recipient, "recipientToMessage", "user");
+                    }
                 },
             },
         ];

package/testutils/db/temp_db.js

@@ -401,6 +401,10 @@ class TempDB {
                 }
                 db_1.default.initDB({
                     connectionString: connStr,
+                    cfg: {
+                        max: 100,
+                        idleTimeoutMillis: 100,
+                    },
                 });
             }
             else {