495 Commits

Author SHA1 Message Date
Pierre Noël
c9df9b7497 fix ambiguous column name 2023-01-25 14:28:28 +01:00
Pierre Noël
c505a62f7e change WHERE clause to avoid deadlock 2023-01-25 14:28:27 +01:00
Pierre Noël
aad60aab38 change SQL request logic 2023-01-25 14:28:27 +01:00
Jean-Sébastien Herbaux
3346f92fd0
Merge branch 'main' into features/deits 2023-01-25 14:27:57 +01:00
Ben Irvin
33429cef5b clean up 2023-01-25 10:21:24 +01:00
Convly
31a4925824 Merge branch 'main' into features/deits 2023-01-25 09:57:35 +01:00
Bassel Kanso
87bec86243
Merge pull request #15485 from strapi/deits/rollbacks
[DEITS] Rollback import after failure
2023-01-25 10:48:04 +02:00
Ben Irvin
8bcafb42ed add some simple tests 2023-01-25 09:35:32 +01:00
Bassel Kanso
1e867f152d
Merge branch 'main' into chore/transactions 2023-01-24 19:08:13 +02:00
Bassel
65660d18e1 add some adittional tests 2023-01-24 19:07:43 +02:00
Bassel
ec9150b1d8 add some unit tests 2023-01-24 18:56:41 +02:00
Convly
516963a080 Merge branch 'main' of github.com:strapi/strapi into features/deits 2023-01-24 15:07:37 +01:00
Bassel
f0dbb4be31 apply fixes:
- fix callback return type
- fix callback params
2023-01-24 15:55:43 +02:00
Bassel
d11bd7af0a apply fixes:
- fix callback return type
- fix callback params
2023-01-24 14:39:24 +02:00
Jorge Martin
cc68150db2
Merge branch 'main' into main 2023-01-23 19:04:37 +01:00
Pierre Noël
811e7313f2
Merge pull request #15507 from Cpaczek/remove-pg-magic-numbers
Remove PG Magic Numbers
2023-01-23 19:03:59 +01:00
Bassel
4af04c483e refactor transactions:
- fix the typings
- add rollback and commit to the callback params
2023-01-23 18:49:56 +02:00
Bassel
c8d2f6cd16 refactor transactions:
- fix the typings
- add rollback and commit to the callback params
2023-01-23 18:45:00 +02:00
Jorge Martin
bbc59f321b
Merge branch 'main' into main 2023-01-23 17:29:04 +01:00
Bassel
2c4e21ea17 Merge branch 'features/deits' into deits/rollbacks 2023-01-23 15:12:29 +02:00
Ben Irvin
5bc783dc3e
Merge branch 'main' into features/deits 2023-01-23 12:16:19 +01:00
Cameron
f9a367fae7
Merge branch 'main' into remove-pg-magic-numbers 2023-01-19 14:49:49 -08:00
Cameron Paczek
dc784812ac Remove PG Magic Numbers 2023-01-19 14:41:32 -08:00
Marc-Roig
d2636e58d6 fix typo 2023-01-18 17:19:01 +01:00
Marc-Roig
bc53362e16 fix typo 2023-01-18 17:13:33 +01:00
Marc-Roig
52b780b036 add quotes in inversedBy and mappedBy 2023-01-18 17:11:27 +01:00
Marc-Roig
003b009455 specify content type schema name 2023-01-18 16:54:03 +01:00
Bassel
9fecc309e7 Merge branch 'chore/transactions' into deits/rollbacks 2023-01-18 14:27:17 +02:00
Marc
167aba4d97
Merge branch 'main' into fix/duplicate-join-tables 2023-01-18 10:27:05 +01:00
Bassel Kanso
c08e0afda6
Merge branch 'main' into chore/transactions 2023-01-18 11:04:32 +02:00
Ben Irvin
532a5c044e Merge branch 'main' into features/deits 2023-01-18 09:19:49 +01:00
Ben Irvin
4f1eabf286 Merge branch 'main' into features/deits 2023-01-16 18:53:43 +01:00
Josh
fb358ef030
Merge branch 'main' into feature/relations-reordering 2023-01-16 17:51:52 +00:00
Josh
0f3b1c090d Merge branch 'main' into feature/relations-reordering 2023-01-16 13:00:50 +00:00
Marc
62255e7512
Merge branch 'main' into fix/components-ordering-mysql 2023-01-16 13:05:58 +01:00
Bassel
f7e0cc73b1 remove options from transactions api 2023-01-16 10:44:06 +02:00
Bassel
faf4d728cd Merge branch 'main' into chore/transactions 2023-01-13 12:26:20 +02:00
Bassel
12dd68f4a7 Improve transaction API:
- make it possible to have nested transactions
- wrap the knex transaction api and apply changes everywhere it was used
2023-01-13 12:23:30 +02:00
Marc-Roig
dd98293a55 better filtering in inverse order column 2023-01-13 10:53:30 +01:00
Ben Irvin
a79f92e068 merge branch "main" 2023-01-13 09:13:00 +01:00
Marc
cf231a21a1
Merge branch 'main' into fix/duplicate-join-tables 2023-01-12 11:46:31 +01:00
Marc-Roig
cf01fb8db6 make strict connect explicit when inserting relation 2023-01-11 16:40:06 +01:00
Marc-Roig
51cd3ddc85 rename arr to computedRelations 2023-01-11 16:36:36 +01:00
Marc-Roig
1ef6230f20 change attribute name displayed in warning 2023-01-11 13:55:45 +01:00
Marc-Roig
37ff580b1d change error to warning 2023-01-11 11:51:54 +01:00
Marc-Roig
610ce2aadf simplify marking relation as computed 2023-01-10 11:20:16 +01:00
Marc-Roig
5a185f1e00 delete duplicate relation in connect array 2023-01-10 10:58:56 +01:00
Marc-Roig
b81cfb0055 do not allow to connect same relation more than once 2023-01-10 10:45:31 +01:00
denisukvadim
e137627f07
fix runMigrations (15308) 2023-01-07 01:36:38 +02:00
Marc-Roig
a05bdd83ae change firstSeen to mappedRelationsIndex 2023-01-05 16:44:18 +01:00