From b2bebda9ed8e85665ba201603716607ce8a3a185 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 27 Apr 2017 09:24:46 -0400 Subject: [PATCH] reimport db after subvault => collection rename --- src/Sql/Sql.sqlproj | 186 +++++++++--------- ...pherDetails_ReadByUserIdHasCollection.sql} | 0 ...s.sql => Cipher_UpdateWithCollections.sql} | 0 ...Create.sql => CollectionCipher_Create.sql} | 0 ...Delete.sql => CollectionCipher_Delete.sql} | 0 ...CollectionCipher_ReadByOrganizationId.sql} | 0 ....sql => CollectionCipher_ReadByUserId.sql} | 0 ...CollectionCipher_ReadByUserIdCipherId.sql} | 0 ...=> CollectionCipher_UpdateCollections.sql} | 0 ...llectionCipher_UpdateCollectionsAdmin.sql} | 0 ...ionUserCollectionDetails_ReadByUserId.sql} | 0 ...ionUserUserDetails_ReadByCollectionId.sql} | 0 ...r_Create.sql => CollectionUser_Create.sql} | 0 ...ById.sql => CollectionUser_DeleteById.sql} | 0 ...adById.sql => CollectionUser_ReadById.sql} | 0 ...llectionUser_ReadByOrganizationUserId.sql} | 0 ...ctionUser_ReadCanEditByCipherIdUserId.sql} | 0 ...r_Update.sql => CollectionUser_Update.sql} | 0 ...vault_Create.sql => Collection_Create.sql} | 0 ...leteById.sql => Collection_DeleteById.sql} | 0 ...t_ReadById.sql => Collection_ReadById.sql} | 0 ...ql => Collection_ReadByOrganizationId.sql} | 0 ...UserId.sql => Collection_ReadByUserId.sql} | 0 ... Collection_ReadCountByOrganizationId.sql} | 0 ...vault_Update.sql => Collection_Update.sql} | 0 .../Device_ClearPushTokenByIdentifier.sql | 2 +- .../Stored Procedures/Grant_DeleteByKey.sql | 2 +- .../Grant_DeleteBySubjectIdClientId.sql | 2 +- .../Grant_DeleteBySubjectIdClientIdType.sql | 2 +- .../dbo/Stored Procedures/Grant_ReadByKey.sql | 2 +- .../Grant_ReadBySubjectId.sql | 2 +- src/Sql/dbo/Stored Procedures/Grant_Save.sql | 2 +- .../User_ReadAccountRevisionDateById.sql | 2 +- .../Tables/{Subvault.sql => Collection.sql} | 0 ...ubvaultCipher.sql => CollectionCipher.sql} | 2 +- ...{SubvaultGroup.sql => CollectionGroup.sql} | 6 +- .../{SubvaultUser.sql => CollectionUser.sql} | 6 +- src/Sql/dbo/Tables/Organization.sql | 2 +- src/Sql/dbo/Tables/OrganizationUser.sql | 18 +- ...> CollectionUserCollectionDetailsView.sql} | 2 +- ....sql => CollectionUserUserDetailsView.sql} | 0 ...ultUserView.sql => CollectionUserView.sql} | 2 +- .../{SubvaultView.sql => CollectionView.sql} | 2 +- src/Sql/dbo/Views/GrantView.sql | 2 +- src/Sql/dbo/Views/UserView.sql | 2 +- 45 files changed, 123 insertions(+), 123 deletions(-) rename src/Sql/dbo/Stored Procedures/{CipherDetails_ReadByUserIdHasSubvault.sql => CipherDetails_ReadByUserIdHasCollection.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Cipher_UpdateWithSubvaults.sql => Cipher_UpdateWithCollections.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_Create.sql => CollectionCipher_Create.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_Delete.sql => CollectionCipher_Delete.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_ReadByOrganizationId.sql => CollectionCipher_ReadByOrganizationId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_ReadByUserId.sql => CollectionCipher_ReadByUserId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_ReadByUserIdCipherId.sql => CollectionCipher_ReadByUserIdCipherId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_UpdateSubvaults.sql => CollectionCipher_UpdateCollections.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultCipher_UpdateSubvaultsAdmin.sql => CollectionCipher_UpdateCollectionsAdmin.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUserSubvaultDetails_ReadByUserId.sql => CollectionUserCollectionDetails_ReadByUserId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUserUserDetails_ReadBySubvaultId.sql => CollectionUserUserDetails_ReadByCollectionId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_Create.sql => CollectionUser_Create.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_DeleteById.sql => CollectionUser_DeleteById.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_ReadById.sql => CollectionUser_ReadById.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_ReadByOrganizationUserId.sql => CollectionUser_ReadByOrganizationUserId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_ReadCanEditByCipherIdUserId.sql => CollectionUser_ReadCanEditByCipherIdUserId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{SubvaultUser_Update.sql => CollectionUser_Update.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_Create.sql => Collection_Create.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_DeleteById.sql => Collection_DeleteById.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_ReadById.sql => Collection_ReadById.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_ReadByOrganizationId.sql => Collection_ReadByOrganizationId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_ReadByUserId.sql => Collection_ReadByUserId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_ReadCountByOrganizationId.sql => Collection_ReadCountByOrganizationId.sql} (100%) rename src/Sql/dbo/Stored Procedures/{Subvault_Update.sql => Collection_Update.sql} (100%) rename src/Sql/dbo/Tables/{Subvault.sql => Collection.sql} (100%) rename src/Sql/dbo/Tables/{SubvaultCipher.sql => CollectionCipher.sql} (92%) rename src/Sql/dbo/Tables/{SubvaultGroup.sql => CollectionGroup.sql} (68%) rename src/Sql/dbo/Tables/{SubvaultUser.sql => CollectionUser.sql} (92%) rename src/Sql/dbo/Views/{SubvaultUserSubvaultDetailsView.sql => CollectionUserCollectionDetailsView.sql} (79%) rename src/Sql/dbo/Views/{SubvaultUserUserDetailsView.sql => CollectionUserUserDetailsView.sql} (100%) rename src/Sql/dbo/Views/{SubvaultUserView.sql => CollectionUserView.sql} (70%) rename src/Sql/dbo/Views/{SubvaultView.sql => CollectionView.sql} (71%) diff --git a/src/Sql/Sql.sqlproj b/src/Sql/Sql.sqlproj index c8788a3d7f..1bcd66b726 100644 --- a/src/Sql/Sql.sqlproj +++ b/src/Sql/Sql.sqlproj @@ -67,117 +67,117 @@ - - - - - - + + + + + - + + - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasSubvault.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasCollection.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasSubvault.sql rename to src/Sql/dbo/Stored Procedures/CipherDetails_ReadByUserIdHasCollection.sql diff --git a/src/Sql/dbo/Stored Procedures/Cipher_UpdateWithSubvaults.sql b/src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Cipher_UpdateWithSubvaults.sql rename to src/Sql/dbo/Stored Procedures/Cipher_UpdateWithCollections.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_Create.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_Create.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_Create.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_Create.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_Delete.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_Delete.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_Delete.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_Delete.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByOrganizationId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByOrganizationId.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByOrganizationId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserId.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserIdCipherId.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserIdCipherId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_ReadByUserIdCipherId.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_ReadByUserIdCipherId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaults.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollections.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaults.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollections.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaultsAdmin.sql b/src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollectionsAdmin.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultCipher_UpdateSubvaultsAdmin.sql rename to src/Sql/dbo/Stored Procedures/CollectionCipher_UpdateCollectionsAdmin.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUserSubvaultDetails_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUserCollectionDetails_ReadByUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUserSubvaultDetails_ReadByUserId.sql rename to src/Sql/dbo/Stored Procedures/CollectionUserCollectionDetails_ReadByUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUserUserDetails_ReadBySubvaultId.sql b/src/Sql/dbo/Stored Procedures/CollectionUserUserDetails_ReadByCollectionId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUserUserDetails_ReadBySubvaultId.sql rename to src/Sql/dbo/Stored Procedures/CollectionUserUserDetails_ReadByCollectionId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_Create.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_Create.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_Create.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_DeleteById.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_DeleteById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_DeleteById.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_DeleteById.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadById.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadById.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadById.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadByOrganizationUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadByOrganizationUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadByOrganizationUserId.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadByOrganizationUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_ReadCanEditByCipherIdUserId.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_ReadCanEditByCipherIdUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_ReadCanEditByCipherIdUserId.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_ReadCanEditByCipherIdUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql b/src/Sql/dbo/Stored Procedures/CollectionUser_Update.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/SubvaultUser_Update.sql rename to src/Sql/dbo/Stored Procedures/CollectionUser_Update.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_Create.sql b/src/Sql/dbo/Stored Procedures/Collection_Create.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_Create.sql rename to src/Sql/dbo/Stored Procedures/Collection_Create.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_DeleteById.sql b/src/Sql/dbo/Stored Procedures/Collection_DeleteById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_DeleteById.sql rename to src/Sql/dbo/Stored Procedures/Collection_DeleteById.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadById.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadById.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_ReadById.sql rename to src/Sql/dbo/Stored Procedures/Collection_ReadById.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadByOrganizationId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_ReadByOrganizationId.sql rename to src/Sql/dbo/Stored Procedures/Collection_ReadByOrganizationId.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadByUserId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadByUserId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_ReadByUserId.sql rename to src/Sql/dbo/Stored Procedures/Collection_ReadByUserId.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_ReadCountByOrganizationId.sql b/src/Sql/dbo/Stored Procedures/Collection_ReadCountByOrganizationId.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_ReadCountByOrganizationId.sql rename to src/Sql/dbo/Stored Procedures/Collection_ReadCountByOrganizationId.sql diff --git a/src/Sql/dbo/Stored Procedures/Subvault_Update.sql b/src/Sql/dbo/Stored Procedures/Collection_Update.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/Subvault_Update.sql rename to src/Sql/dbo/Stored Procedures/Collection_Update.sql diff --git a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql index 333ec87461..b5086eb7e8 100644 --- a/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql +++ b/src/Sql/dbo/Stored Procedures/Device_ClearPushTokenByIdentifier.sql @@ -10,4 +10,4 @@ BEGIN [PushToken] = NULL WHERE [Identifier] = @Identifier -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql index eb9b1474b0..4a6abfc479 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteByKey.sql @@ -9,4 +9,4 @@ BEGIN [dbo].[Grant] WHERE [Key] = @Key -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql index 7b98477e98..48d5036cbb 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientId.sql @@ -11,4 +11,4 @@ BEGIN WHERE [SubjectId] = @SubjectId AND [ClientId] = @ClientId -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql index 0e75baa373..5f7c483735 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_DeleteBySubjectIdClientIdType.sql @@ -13,4 +13,4 @@ BEGIN [SubjectId] = @SubjectId AND [ClientId] = @ClientId AND [Type] = @Type -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql b/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql index 414388b12a..e853a51904 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_ReadByKey.sql @@ -10,4 +10,4 @@ BEGIN [dbo].[GrantView] WHERE [Key] = @Key -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql b/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql index 738ec57f00..f4270b2e65 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_ReadBySubjectId.sql @@ -10,4 +10,4 @@ BEGIN [dbo].[GrantView] WHERE [SubjectId] = @SubjectId -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/Grant_Save.sql b/src/Sql/dbo/Stored Procedures/Grant_Save.sql index af6b2a7e70..097fd6c254 100644 --- a/src/Sql/dbo/Stored Procedures/Grant_Save.sql +++ b/src/Sql/dbo/Stored Procedures/Grant_Save.sql @@ -67,4 +67,4 @@ BEGIN [Source].[Data] ) ; -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql index 24a50b28b2..40eb9773bc 100644 --- a/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql +++ b/src/Sql/dbo/Stored Procedures/User_ReadAccountRevisionDateById.sql @@ -11,4 +11,4 @@ BEGIN [dbo].[User] WHERE [Id] = @Id -END \ No newline at end of file +END diff --git a/src/Sql/dbo/Tables/Subvault.sql b/src/Sql/dbo/Tables/Collection.sql similarity index 100% rename from src/Sql/dbo/Tables/Subvault.sql rename to src/Sql/dbo/Tables/Collection.sql diff --git a/src/Sql/dbo/Tables/SubvaultCipher.sql b/src/Sql/dbo/Tables/CollectionCipher.sql similarity index 92% rename from src/Sql/dbo/Tables/SubvaultCipher.sql rename to src/Sql/dbo/Tables/CollectionCipher.sql index 906ffced63..f661cb6fbd 100644 --- a/src/Sql/dbo/Tables/SubvaultCipher.sql +++ b/src/Sql/dbo/Tables/CollectionCipher.sql @@ -1,6 +1,6 @@ CREATE TABLE [dbo].[CollectionCipher] ( [CollectionId] UNIQUEIDENTIFIER NOT NULL, - [CipherId] UNIQUEIDENTIFIER NOT NULL, + [CipherId] UNIQUEIDENTIFIER NOT NULL, CONSTRAINT [PK_CollectionCipher] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [CipherId] ASC), CONSTRAINT [FK_CollectionCipher_Cipher] FOREIGN KEY ([CipherId]) REFERENCES [dbo].[Cipher] ([Id]) ON DELETE CASCADE, CONSTRAINT [FK_CollectionCipher_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE diff --git a/src/Sql/dbo/Tables/SubvaultGroup.sql b/src/Sql/dbo/Tables/CollectionGroup.sql similarity index 68% rename from src/Sql/dbo/Tables/SubvaultGroup.sql rename to src/Sql/dbo/Tables/CollectionGroup.sql index 87b386f866..9206c83dd5 100644 --- a/src/Sql/dbo/Tables/SubvaultGroup.sql +++ b/src/Sql/dbo/Tables/CollectionGroup.sql @@ -1,8 +1,8 @@ CREATE TABLE [dbo].[CollectionGroup] ( [CollectionId] UNIQUEIDENTIFIER NOT NULL, - [GroupId] UNIQUEIDENTIFIER NOT NULL, + [GroupId] UNIQUEIDENTIFIER NOT NULL, CONSTRAINT [PK_CollectionGroup] PRIMARY KEY CLUSTERED ([CollectionId] ASC, [GroupId] ASC), - CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE, - CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) + CONSTRAINT [FK_CollectionGroup_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]), + CONSTRAINT [FK_CollectionGroup_Group] FOREIGN KEY ([GroupId]) REFERENCES [dbo].[Group] ([Id]) ON DELETE CASCADE ); diff --git a/src/Sql/dbo/Tables/SubvaultUser.sql b/src/Sql/dbo/Tables/CollectionUser.sql similarity index 92% rename from src/Sql/dbo/Tables/SubvaultUser.sql rename to src/Sql/dbo/Tables/CollectionUser.sql index 580c0a30ee..10dbdd8d79 100644 --- a/src/Sql/dbo/Tables/SubvaultUser.sql +++ b/src/Sql/dbo/Tables/CollectionUser.sql @@ -1,13 +1,13 @@ CREATE TABLE [dbo].[CollectionUser] ( [Id] UNIQUEIDENTIFIER NOT NULL, - [CollectionId] UNIQUEIDENTIFIER NOT NULL, + [CollectionId] UNIQUEIDENTIFIER NOT NULL, [OrganizationUserId] UNIQUEIDENTIFIER NOT NULL, [ReadOnly] BIT NOT NULL, [CreationDate] DATETIME2 (7) NOT NULL, [RevisionDate] DATETIME2 (7) NOT NULL, CONSTRAINT [PK_CollectionUser] PRIMARY KEY CLUSTERED ([Id] ASC), - CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id]), - CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE + CONSTRAINT [FK_CollectionUser_Collection] FOREIGN KEY ([CollectionId]) REFERENCES [dbo].[Collection] ([Id]) ON DELETE CASCADE, + CONSTRAINT [FK_CollectionUser_OrganizationUser] FOREIGN KEY ([OrganizationUserId]) REFERENCES [dbo].[OrganizationUser] ([Id]) ); diff --git a/src/Sql/dbo/Tables/Organization.sql b/src/Sql/dbo/Tables/Organization.sql index 9b7c1fa912..ba98350895 100644 --- a/src/Sql/dbo/Tables/Organization.sql +++ b/src/Sql/dbo/Tables/Organization.sql @@ -6,7 +6,7 @@ [Plan] NVARCHAR (20) NOT NULL, [PlanType] TINYINT NOT NULL, [Seats] SMALLINT NULL, - [MaxCollections] SMALLINT NULL, + [MaxCollections] SMALLINT NULL, [StripeCustomerId] VARCHAR (50) NULL, [StripeSubscriptionId] VARCHAR (50) NULL, [Enabled] BIT NOT NULL, diff --git a/src/Sql/dbo/Tables/OrganizationUser.sql b/src/Sql/dbo/Tables/OrganizationUser.sql index ee26e4616b..f8ea015e32 100644 --- a/src/Sql/dbo/Tables/OrganizationUser.sql +++ b/src/Sql/dbo/Tables/OrganizationUser.sql @@ -1,14 +1,14 @@ CREATE TABLE [dbo].[OrganizationUser] ( - [Id] UNIQUEIDENTIFIER NOT NULL, - [OrganizationId] UNIQUEIDENTIFIER NOT NULL, - [UserId] UNIQUEIDENTIFIER NULL, - [Email] NVARCHAR (50) NULL, - [Key] VARCHAR (MAX) NULL, - [Status] TINYINT NOT NULL, - [Type] TINYINT NOT NULL, + [Id] UNIQUEIDENTIFIER NOT NULL, + [OrganizationId] UNIQUEIDENTIFIER NOT NULL, + [UserId] UNIQUEIDENTIFIER NULL, + [Email] NVARCHAR (50) NULL, + [Key] VARCHAR (MAX) NULL, + [Status] TINYINT NOT NULL, + [Type] TINYINT NOT NULL, [AccessAllCollections] BIT NOT NULL, - [CreationDate] DATETIME2 (7) NOT NULL, - [RevisionDate] DATETIME2 (7) NOT NULL, + [CreationDate] DATETIME2 (7) NOT NULL, + [RevisionDate] DATETIME2 (7) NOT NULL, CONSTRAINT [PK_OrganizationUser] PRIMARY KEY CLUSTERED ([Id] ASC), CONSTRAINT [FK_OrganizationUser_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE, CONSTRAINT [FK_OrganizationUser_User] FOREIGN KEY ([UserId]) REFERENCES [dbo].[User] ([Id]) diff --git a/src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql b/src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql similarity index 79% rename from src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql rename to src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql index c9f2f35443..95fcc1b4ea 100644 --- a/src/Sql/dbo/Views/SubvaultUserSubvaultDetailsView.sql +++ b/src/Sql/dbo/Views/CollectionUserCollectionDetailsView.sql @@ -9,4 +9,4 @@ SELECT FROM [dbo].[CollectionUser] SU INNER JOIN - [dbo].[Collection] S ON S.[Id] = SU.[CollectionId] + [dbo].[Collection] S ON S.[Id] = SU.[CollectionId] \ No newline at end of file diff --git a/src/Sql/dbo/Views/SubvaultUserUserDetailsView.sql b/src/Sql/dbo/Views/CollectionUserUserDetailsView.sql similarity index 100% rename from src/Sql/dbo/Views/SubvaultUserUserDetailsView.sql rename to src/Sql/dbo/Views/CollectionUserUserDetailsView.sql diff --git a/src/Sql/dbo/Views/SubvaultUserView.sql b/src/Sql/dbo/Views/CollectionUserView.sql similarity index 70% rename from src/Sql/dbo/Views/SubvaultUserView.sql rename to src/Sql/dbo/Views/CollectionUserView.sql index 860f4236eb..3e81be94e9 100644 --- a/src/Sql/dbo/Views/SubvaultUserView.sql +++ b/src/Sql/dbo/Views/CollectionUserView.sql @@ -3,4 +3,4 @@ AS SELECT * FROM - [dbo].[CollectionUser] + [dbo].[CollectionUser] \ No newline at end of file diff --git a/src/Sql/dbo/Views/SubvaultView.sql b/src/Sql/dbo/Views/CollectionView.sql similarity index 71% rename from src/Sql/dbo/Views/SubvaultView.sql rename to src/Sql/dbo/Views/CollectionView.sql index d1094c8dfd..9fcc5a4a97 100644 --- a/src/Sql/dbo/Views/SubvaultView.sql +++ b/src/Sql/dbo/Views/CollectionView.sql @@ -3,4 +3,4 @@ AS SELECT * FROM - [dbo].[Collection] + [dbo].[Collection] \ No newline at end of file diff --git a/src/Sql/dbo/Views/GrantView.sql b/src/Sql/dbo/Views/GrantView.sql index cb9f964b8b..d7772345b4 100644 --- a/src/Sql/dbo/Views/GrantView.sql +++ b/src/Sql/dbo/Views/GrantView.sql @@ -3,4 +3,4 @@ AS SELECT * FROM - [dbo].[Grant] \ No newline at end of file + [dbo].[Grant] diff --git a/src/Sql/dbo/Views/UserView.sql b/src/Sql/dbo/Views/UserView.sql index c8b77385a9..82fa8a2c63 100644 --- a/src/Sql/dbo/Views/UserView.sql +++ b/src/Sql/dbo/Views/UserView.sql @@ -3,4 +3,4 @@ AS SELECT * FROM - [dbo].[User] \ No newline at end of file + [dbo].[User]