Commit Graph

32743 Commits

Author SHA1 Message Date
mike12345567 295961edb1 Attempting without promise.all in external. 2024-06-20 16:18:32 +01:00
mike12345567 66ef0cb79a Adding back SQS - wasn't causing a problem. 2024-06-20 16:05:03 +01:00
mike12345567 b6b05e08b1 Removing SQS from view test to check. 2024-06-20 15:52:56 +01:00
Michael Drury 398a4da2ae
Merge branch 'master' into feature/count-rows-to-return 2024-06-20 15:27:21 +01:00
Martin McKeaveney 180dc1c355
Merge pull request #13988 from Budibase/accpdeployment
updating account portal SHA
2024-06-20 15:19:11 +01:00
Martin McKeaveney 84ff4e97ed
Merge branch 'master' into accpdeployment 2024-06-20 14:59:13 +01:00
Martin McKeaveney 093b06ed7d updating account portal SHA 2024-06-20 14:51:25 +01:00
mike12345567 3345364675 Updating test case - not exactly sure what it was testing before, but now it definitely confirms paginated results are stable. 2024-06-20 14:36:08 +01:00
Andrew Kingston e9beefbb28
Merge branch 'master' into table-changes 2024-06-20 14:35:00 +02:00
Michael Drury 763c04048c
Merge branch 'master' into feature/count-rows-to-return 2024-06-20 11:26:00 +01:00
mike12345567 580e36f301 Updating test case. 2024-06-20 10:46:52 +01:00
Michael Drury 8e8bf753d9
Merge pull request #13980 from Budibase/dependabot/npm_and_yarn/packages/server/socket.io-4.6.2
Bump socket.io from 4.6.1 to 4.6.2 in /packages/server
2024-06-20 10:22:26 +01:00
Michael Drury 8dcc3e977b
Merge branch 'master' into dependabot/npm_and_yarn/packages/server/socket.io-4.6.2 2024-06-20 10:13:22 +01:00
Budibase Staging Release Bot 0f4d43a32b Bump version to 2.29.0 2024-06-20 09:06:56 +00:00
mike12345567 86d9de5a2d Fixing view test cases, adding SQS to it and correcting the default sort order. 2024-06-19 18:57:37 +01:00
dependabot[bot] 7ef46092d0
Bump socket.io from 4.6.1 to 4.6.2 in /packages/server
Bumps [socket.io](https://github.com/socketio/socket.io) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.6.1...4.6.2)

---
updated-dependencies:
- dependency-name: socket.io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-19 17:52:38 +00:00
mike12345567 67c00c9e4c Addressing PR comments. 2024-06-19 18:46:48 +01:00
Sam Rose 4c8abee122
Merge branch 'master' of github.com:budibase/budibase into budi-8220-support-updating-existing-rows-for-external-databases-using-2 2024-06-19 17:53:00 +01:00
Sam Rose 602faf1c67
Add test for composite primary keys for external datasource imports. 2024-06-19 17:52:48 +01:00
mike12345567 58ec7a50b0 Implementing row counting for in-memory, also updating the in memory search function. 2024-06-19 17:51:11 +01:00
mike12345567 d121633d8e Updating queries to be a bit more flexible to updates in the SQL layers. 2024-06-19 17:29:33 +01:00
mike12345567 2aa911b217 re-jigging things to get counting working properly again. 2024-06-19 17:10:15 +01:00
mike12345567 a97b24658f Fixing test case, it didn't provide a primary field. 2024-06-19 15:08:22 +01:00
mike12345567 2d74927177 updating how counting disables sorting. 2024-06-19 15:08:12 +01:00
mike12345567 1056efdbf6 Changing how counting occurs in SQL layer. 2024-06-19 14:56:06 +01:00
mike12345567 aab100b130 Changing how counting is processed. 2024-06-19 14:28:22 +01:00
Michael Drury 223df424fc
Merge branch 'master' into feature/count-rows-to-return 2024-06-19 14:20:31 +01:00
mike12345567 bdbb4c0a66 Commenting on a bug in knex 2024-06-19 13:59:03 +01:00
mike12345567 bc80841554 Promise.all for both counts (SQS and SQL). 2024-06-19 13:39:00 +01:00
mike12345567 0e5de7f16d Test updates. 2024-06-19 13:36:34 +01:00
mike12345567 abfab054d7 Addressing comment about datasource being optional. 2024-06-19 12:03:20 +01:00
mike12345567 c973562398 Merge branch 'feature/count-rows-to-return' of github.com:Budibase/budibase into feature/count-rows-to-return 2024-06-19 11:53:11 +01:00
mike12345567 0de94d3535 Addressing some PR comments. 2024-06-19 11:52:50 +01:00
Sam Rose f9d46de7e1
Merge pull request #13968 from Budibase/budi-8220-support-updating-existing-rows-for-external-databases-using
Support external datasources in the bulkImport endpoint.
2024-06-19 10:59:32 +01:00
Sam Rose e7ff0f683b
Merge branch 'budi-8220-support-updating-existing-rows-for-external-databases-using' of github.com:budibase/budibase into budi-8220-support-updating-existing-rows-for-external-databases-using 2024-06-19 10:49:48 +01:00
Sam Rose 9866aabd39
Add bulk upsert to row operations list. 2024-06-19 10:49:39 +01:00
Sam Rose c26617d165
Merge branch 'master' into budi-8220-support-updating-existing-rows-for-external-databases-using 2024-06-19 10:42:52 +01:00
Sam Rose 80642100fa
Merge branch 'master' into feature/count-rows-to-return 2024-06-19 09:05:56 +01:00
Andrew Kingston 564edcf574
Merge branch 'master' into table-changes 2024-06-19 09:23:53 +02:00
Michael Drury cbf949b0e3
Merge pull request #13970 from Budibase/dependabot/npm_and_yarn/packages/cli/tar-6.2.1
Bump tar from 6.1.15 to 6.2.1 in /packages/cli
2024-06-18 18:56:23 +01:00
dependabot[bot] 9140bd04c6
Bump tar from 6.1.15 to 6.2.1 in /packages/cli
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.15 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.15...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-18 17:51:23 +00:00
Michael Drury 8185f3e65f
Merge pull request #13962 from Budibase/dependabot/npm_and_yarn/ws-7.5.10
Bump ws from 7.5.9 to 7.5.10
2024-06-18 18:50:44 +01:00
mike12345567 cf75a8a1f3 Updating function name. 2024-06-18 18:49:59 +01:00
mike12345567 e8b39d2650 Updating yarn.lock 2024-06-18 18:46:02 +01:00
mike12345567 8172b6391e Merge branch 'master' of github.com:Budibase/budibase into dependabot/npm_and_yarn/ws-7.5.10 2024-06-18 18:45:53 +01:00
mike12345567 e0d8a66fd8 Adding test cases for counting as well as some small fixes. 2024-06-18 18:44:17 +01:00
Sam Rose e288fc8795
Disable upserting for MSSQL in bulkImport for now. 2024-06-18 18:02:20 +01:00
Sam Rose 5ac8a7d514
bulkImport upsert working everywhere excpet mssql 2024-06-18 17:43:25 +01:00
Sam Rose 335c174643
Create a failing test. 2024-06-18 16:39:35 +01:00
mike12345567 0caff1a404 Fixing an issue with sorting in SQS. 2024-06-18 13:53:51 +01:00