From 9fcff76f1c8a9acd331259bd4d484c7a3ca1dc5e Mon Sep 17 00:00:00 2001 From: Dawid Parafinski Date: Wed, 4 Jun 2025 13:32:10 +0200 Subject: [PATCH 1/3] IBX-9941: Use single form in table names --- src/bundle/Resources/config/storage/schema.yaml | 16 ++++++++-------- .../Invitation/Persistence/DoctrineGateway.php | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bundle/Resources/config/storage/schema.yaml b/src/bundle/Resources/config/storage/schema.yaml index 9249c683..130c8cd6 100644 --- a/src/bundle/Resources/config/storage/schema.yaml +++ b/src/bundle/Resources/config/storage/schema.yaml @@ -1,10 +1,10 @@ tables: - ibexa_user_invitations: + ibexa_user_invitation: indexes: - ibexa_user_invitations_email_idx: + ibexa_user_invitation_email_idx: fields: - email - ibexa_user_invitations_hash_idx: + ibexa_user_invitation_hash_idx: fields: - hash id: @@ -34,20 +34,20 @@ tables: options: default: false uniqueConstraints: - ibexa_user_invitations_email_uindex: + ibexa_user_invitation_email_uindex: fields: - email options: lengths: - 191 - ibexa_user_invitations_hash_uindex: + ibexa_user_invitation_hash_uindex: fields: - hash options: lengths: - 191 - ibexa_user_invitations_assignments: + ibexa_user_invitation_assignment: id: id: type: integer @@ -73,8 +73,8 @@ tables: nullable: true length: 255 foreignKeys: - ibexa_user_invitations_assignments_ibexa_user_invitations_id_fk: - foreignTable: ibexa_user_invitations + ibexa_user_invitation_assignment_ibexa_user_invitation_id_fk: + foreignTable: ibexa_user_invitation fields: - invitation_id foreignFields: diff --git a/src/lib/Invitation/Persistence/DoctrineGateway.php b/src/lib/Invitation/Persistence/DoctrineGateway.php index c3bcdf5a..307bb24e 100644 --- a/src/lib/Invitation/Persistence/DoctrineGateway.php +++ b/src/lib/Invitation/Persistence/DoctrineGateway.php @@ -22,10 +22,10 @@ */ final class DoctrineGateway implements Gateway { - private const TABLE_USER_INVITATIONS = 'ibexa_user_invitations'; - private const TABLE_USER_INVITATIONS_ASSIGNMENTS = 'ibexa_user_invitations_assignments'; + private const TABLE_USER_INVITATIONS = 'ibexa_user_invitation'; + private const TABLE_USER_INVITATIONS_ASSIGNMENTS = 'ibexa_user_invitation_assignment'; - private const TABLE_USER_INVITATIONS_SEQ = 'ibexa_user_invitations_id_seq'; + private const TABLE_USER_INVITATIONS_SEQ = 'ibexa_user_invitation_id_seq'; private Connection $connection; From d8aa3f0208939d0200ee977ae93415202f20728c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Fri, 6 Jun 2025 12:58:47 +0200 Subject: [PATCH 2/3] Update src/lib/Invitation/Persistence/DoctrineGateway.php Co-authored-by: Tomasz Kryszan --- src/lib/Invitation/Persistence/DoctrineGateway.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Invitation/Persistence/DoctrineGateway.php b/src/lib/Invitation/Persistence/DoctrineGateway.php index 307bb24e..d4b6c106 100644 --- a/src/lib/Invitation/Persistence/DoctrineGateway.php +++ b/src/lib/Invitation/Persistence/DoctrineGateway.php @@ -22,8 +22,8 @@ */ final class DoctrineGateway implements Gateway { - private const TABLE_USER_INVITATIONS = 'ibexa_user_invitation'; - private const TABLE_USER_INVITATIONS_ASSIGNMENTS = 'ibexa_user_invitation_assignment'; + private const string TABLE_USER_INVITATIONS = 'ibexa_user_invitation'; + private const string TABLE_USER_INVITATIONS_ASSIGNMENTS = 'ibexa_user_invitation_assignment'; private const TABLE_USER_INVITATIONS_SEQ = 'ibexa_user_invitation_id_seq'; From 877ada206c5106fce72da5124fe6381c7490d9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= Date: Fri, 6 Jun 2025 12:58:55 +0200 Subject: [PATCH 3/3] Update src/lib/Invitation/Persistence/DoctrineGateway.php Co-authored-by: Tomasz Kryszan --- src/lib/Invitation/Persistence/DoctrineGateway.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Invitation/Persistence/DoctrineGateway.php b/src/lib/Invitation/Persistence/DoctrineGateway.php index d4b6c106..704ca33e 100644 --- a/src/lib/Invitation/Persistence/DoctrineGateway.php +++ b/src/lib/Invitation/Persistence/DoctrineGateway.php @@ -25,7 +25,7 @@ final class DoctrineGateway implements Gateway private const string TABLE_USER_INVITATIONS = 'ibexa_user_invitation'; private const string TABLE_USER_INVITATIONS_ASSIGNMENTS = 'ibexa_user_invitation_assignment'; - private const TABLE_USER_INVITATIONS_SEQ = 'ibexa_user_invitation_id_seq'; + private const string TABLE_USER_INVITATIONS_SEQ = 'ibexa_user_invitation_id_seq'; private Connection $connection;