1
0
mirror of https://github.com/bitwarden/server synced 2026-01-06 10:34:01 +00:00

Updating SM to Sm, and adding more view refreshes

This commit is contained in:
cd-bitwarden
2025-11-05 21:50:36 -05:00
parent 7db2a840e6
commit 2bca8b1f07
28 changed files with 90 additions and 56 deletions

View File

@@ -2,15 +2,19 @@
IF NOT EXISTS (SELECT 1
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = 'Organization'
AND COLUMN_NAME = 'UseDisableSMAdsForUsers')
AND COLUMN_NAME = 'UseDisableSmAdsForUsers')
BEGIN
ALTER TABLE [dbo].[Organization]
ADD [UseDisableSMAdsForUsers] BIT NOT NULL CONSTRAINT [DF_Organization_UseDisableSMAdsForUsers] DEFAULT 0;
ADD [UseDisableSmAdsForUsers] BIT NOT NULL CONSTRAINT [DF_Organization_UseDisableSmAdsForUsers] DEFAULT 0;
END
GO
-- Refresh view
-- Refresh views
EXEC sp_refreshview N'[dbo].[OrganizationCipherDetailsCollectionsView]';
EXEC sp_refreshview N'[dbo].[OrganizationUserOrganizationDetailsView]';
EXEC sp_refreshsqlmodule N'[dbo].[OrganizationView]';
EXEC sp_refreshview N'[dbo].[ProviderOrganizationOrganizationDetailsView]';
EXEC sp_refreshview N'[dbo].[ProviderUserProviderOrganizationDetailsView]';
GO
CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
@@ -75,7 +79,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Create]
@UseAdminSponsoredFamilies BIT = 0,
@SyncSeats BIT = 0,
@UseAutomaticUserConfirmation BIT = 0,
@UseDisableSMAdsForUsers BIT = 0
@UseDisableSmAdsForUsers BIT = 0
AS
BEGIN
SET NOCOUNT ON
@@ -143,7 +147,7 @@ BEGIN
[UseAdminSponsoredFamilies],
[SyncSeats],
[UseAutomaticUserConfirmation],
[UseDisableSMAdsForUsers]
[UseDisableSmAdsForUsers]
)
VALUES
(
@@ -208,7 +212,7 @@ BEGIN
@UseAdminSponsoredFamilies,
@SyncSeats,
@UseAutomaticUserConfirmation,
@UseDisableSMAdsForUsers
@UseDisableSmAdsForUsers
)
END
GO
@@ -275,7 +279,7 @@ CREATE OR ALTER PROCEDURE [dbo].[Organization_Update]
@UseAdminSponsoredFamilies BIT = 0,
@SyncSeats BIT = 0,
@UseAutomaticUserConfirmation BIT = 0,
@UseDisableSMAdsForUsers BIT = 0
@UseDisableSmAdsForUsers BIT = 0
AS
BEGIN
SET NOCOUNT ON
@@ -343,7 +347,7 @@ BEGIN
[UseAdminSponsoredFamilies] = @UseAdminSponsoredFamilies,
[SyncSeats] = @SyncSeats,
[UseAutomaticUserConfirmation] = @UseAutomaticUserConfirmation,
[UseDisableSMAdsForUsers] = @UseDisableSMAdsForUsers
[UseDisableSmAdsForUsers] = @UseDisableSmAdsForUsers
WHERE
[Id] = @Id
END
@@ -380,7 +384,7 @@ BEGIN
[UseOrganizationDomains],
[UseAdminSponsoredFamilies],
[UseAutomaticUserConfirmation],
[UseDisableSMAdsForUsers]
[UseDisableSmAdsForUsers]
FROM
[dbo].[Organization]
END

View File

@@ -113,7 +113,7 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("Enabled")

View File

@@ -11,7 +11,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization",
type: "tinyint(1)",
nullable: false,
@@ -22,7 +22,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization");
}
}

View File

@@ -110,7 +110,7 @@ namespace Bit.MySqlMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("datetime(6)");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("tinyint(1)");
b.Property<bool>("Enabled")

View File

@@ -114,7 +114,7 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("Enabled")

View File

@@ -11,7 +11,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization",
type: "boolean",
nullable: false,
@@ -22,7 +22,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization");
}
}

View File

@@ -111,7 +111,7 @@ namespace Bit.PostgresMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("timestamp with time zone");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("boolean");
b.Property<bool>("Enabled")

View File

@@ -108,7 +108,7 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("Enabled")

View File

@@ -11,7 +11,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization",
type: "INTEGER",
nullable: false,
@@ -22,7 +22,7 @@ public partial class AddingNewFlagToLicenseForDisableSMAdsForUser : Migration
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "UseDisableSMAdsForUsers",
name: "UseDisableSmAdsForUsers",
table: "Organization");
}
}

View File

@@ -105,7 +105,7 @@ namespace Bit.SqliteMigrations.Migrations
b.Property<DateTime>("CreationDate")
.HasColumnType("TEXT");
b.Property<bool>("UseDisableSMAdsForUsers")
b.Property<bool>("UseDisableSmAdsForUsers")
.HasColumnType("INTEGER");
b.Property<bool>("Enabled")