@budibase/server 0.9.190-alpha.8 → 1.0.2

package/dist/integrations/oracle.js

@@ -262,28 +262,13 @@ var OracleModule;
                 this.schemaErrors = final.errors;
             });
         }
-        /**
-         * Knex default returning behaviour does not work with oracle
-         * Manually add the behaviour for the return column
-         */
-        addReturning(query, bindings, returnColumn) {
-            if (bindings instanceof Array) {
-                bindings.push({ dir: oracledb_1.default.BIND_OUT });
-                query.sql =
-                    query.sql + ` returning \"${returnColumn}\" into :${bindings.length}`;
-            }
-        }
-        internalQuery(query, returnColum, operation) {
+        internalQuery(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 let connection;
                 try {
                     connection = yield this.getConnection();
                     const options = { autoCommit: true };
                     const bindings = query.bindings || [];
-                    if (returnColum &&
-                        (operation === datasource_1.Operation.CREATE || operation === datasource_1.Operation.UPDATE)) {
-                        this.addReturning(query, bindings, returnColum);
-                    }
                     const result = yield connection.execute(query.sql, bindings, options);
                     return result;
                 }
@@ -330,13 +315,48 @@ var OracleModule;
             });
         }
         query(json) {
+            var _a, _b, _c;
             return __awaiter(this, void 0, void 0, function* () {
-                const primaryKeys = json.meta.table.primary;
-                const primaryKey = primaryKeys ? primaryKeys[0] : undefined;
-                const queryFn = (query, operation) => this.internalQuery(query, primaryKey, operation);
-                const processFn = (response) => (response.rows ? response.rows : []);
-                const output = yield this.queryWithReturning(json, queryFn, processFn);
-                return output;
+                const operation = this._operation(json);
+                const input = this._query(json, { disableReturning: true });
+                if (Array.isArray(input)) {
+                    const responses = [];
+                    for (let query of input) {
+                        responses.push(yield this.internalQuery(query));
+                    }
+                    return responses;
+                }
+                else {
+                    // read the row to be deleted up front for the return
+                    let deletedRows;
+                    if (operation === datasource_1.Operation.DELETE) {
+                        const queryFn = (query) => this.internalQuery(query);
+                        deletedRows = yield this.getReturningRow(queryFn, json);
+                    }
+                    // run the query
+                    const response = yield this.internalQuery(input);
+                    // get the results or return the created / updated / deleted row
+                    if ((_a = deletedRows === null || deletedRows === void 0 ? void 0 : deletedRows.rows) === null || _a === void 0 ? void 0 : _a.length) {
+                        return deletedRows.rows;
+                    }
+                    else if ((_b = response.rows) === null || _b === void 0 ? void 0 : _b.length) {
+                        return response.rows;
+                    }
+                    else {
+                        // get the last row that was updated
+                        if (response.lastRowid &&
+                            ((_c = json.endpoint) === null || _c === void 0 ? void 0 : _c.entityId) &&
+                            operation !== datasource_1.Operation.DELETE) {
+                            const lastRow = yield this.internalQuery({
+                                sql: `SELECT * FROM \"${json.endpoint.entityId}\" WHERE ROWID = '${response.lastRowid}'`,
+                            });
+                            return lastRow.rows;
+                        }
+                        else {
+                            return [{ [operation.toLowerCase()]: true }];
+                        }
+                    }
+                }
             });
         }
     }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "0.9.190-alpha.7",
+    "version": "1.0.1",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,9 +69,9 @@
     "author": "Budibase",
     "license": "GPL-3.0",
     "dependencies": {
-        "@budibase/auth": "^0.9.190-alpha.7",
-        "@budibase/client": "^0.9.190-alpha.7",
-        "@budibase/string-templates": "^0.9.190-alpha.7",
+        "@budibase/auth": "^1.0.1",
+        "@budibase/client": "^1.0.1",
+        "@budibase/string-templates": "^1.0.1",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",