add ForceDrop option

PGSSoft · May 27, 2024 · 06802a6 · 06802a6
1 parent 5f4f6a8
commit 06802a6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 3 deletions.
diff --git a/internal/services/database/base.go b/internal/services/database/base.go
@@ -14,12 +14,14 @@ var attrDescriptions = map[string]string{
 	"id":        "Database ID. Can be retrieved using `SELECT DB_ID('<db_name>')`.",
 	"name":      fmt.Sprintf("Database name. %s.", common.RegularIdentifiersDoc),
 	"collation": "Default collation name. Can be either a Windows collation name or a SQL collation name.",
+	"force_drop": "Whether to drop all connections to the database before dropping it.",
 }
 
 type resourceData struct {
 	Id        types.String `tfsdk:"id"`
 	Name      types.String `tfsdk:"name"`
 	Collation types.String `tfsdk:"collation"`
+	ForceDrop types.Bool `tfsdk:"force_drop"`
 }
 
 func (d resourceData) getDbId(ctx context.Context) sql.DatabaseId {
@@ -40,6 +42,7 @@ func (d resourceData) toSettings() sql.DatabaseSettings {
 	return sql.DatabaseSettings{
 		Name:      d.Name.ValueString(),
 		Collation: d.Collation.ValueString(),
+		ForceDrop: d.ForceDrop.ValueBool(),
 	}
 }
 
@@ -48,6 +51,7 @@ func (d resourceData) withSettings(settings sql.DatabaseSettings) resourceData {
 		Id:        d.Id,
 		Name:      types.StringValue(settings.Name),
 		Collation: types.StringValue(settings.Collation),
+		ForceDrop: types.BoolValue(settings.ForceDrop),
 	}
 
 	if settings.Collation == "" {

diff --git a/internal/services/database/data.go b/internal/services/database/data.go
@@ -33,6 +33,10 @@ func (d *dataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp
 			MarkdownDescription: attrDescriptions["collation"],
 			Computed:            true,
 		},
+		"force_drop": schema.BoolAttribute{
+			MarkdownDescription: attrDescriptions["force_drop"],
+			Computed:            true,
+		},		
 	}
 }
 

diff --git a/internal/services/database/data_acctest.go b/internal/services/database/data_acctest.go
@@ -11,7 +11,7 @@ import (
 func testDataSource(testCtx *acctest.TestContext) {
 	const resourceName = "data.mssql_database.test"
 	var dbId string
-	dbSettings := sql.DatabaseSettings{Name: "data_test_db", Collation: "SQL_Latin1_General_CP1_CS_AS"}
+	dbSettings := sql.DatabaseSettings{Name: "data_test_db", Collation: "SQL_Latin1_General_CP1_CS_AS", ForceDrop: false}
 
 	newDataResource := func(name string) string {
 		return fmt.Sprintf(`

diff --git a/internal/services/database/list.go b/internal/services/database/list.go
@@ -44,6 +44,10 @@ func (l *listDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, r
 						MarkdownDescription: attrDescriptions["collation"],
 						Computed:            true,
 					},
+					"force_drop": schema.BoolAttribute{
+						MarkdownDescription: attrDescriptions["force_drop"],
+						Computed:            true,
+					},						
 				},
 			},
 		},

diff --git a/internal/services/database/resource.go b/internal/services/database/resource.go
@@ -41,6 +41,11 @@ func (r *res) Schema(ctx context.Context, req resource.SchemaRequest, resp *reso
 			Optional:            true,
 			Computed:            true,
 		},
+		"force_drop": schema.BoolAttribute{
+			MarkdownDescription: attrDescriptions["force_drop"],
+			Computed:            true,
+			Optional:            true,
+		},	
 	}
 }
 

diff --git a/internal/sql/database.go b/internal/sql/database.go
@@ -13,6 +13,7 @@ const NullDatabaseId = DatabaseId(-1)
 type DatabaseSettings struct {
 	Name      string
 	Collation string
+	ForceDrop bool
 }
 
 type DatabasePermission struct {
@@ -141,6 +142,9 @@ func (db *database) SetCollation(ctx context.Context, collation string) {
 
 func (db *database) Drop(ctx context.Context) {
 	settings := db.GetSettings(ctx)
+	if settings.ForceDrop {
+		db.conn.exec(ctx, fmt.Sprintf("ALTER DATABASE [%s] SET SINGLE_USER WITH ROLLBACK IMMEDIATE;", settings.Name))	
+	}
 	db.conn.exec(ctx, fmt.Sprintf("DROP DATABASE [%s]", settings.Name))
 }
 

diff --git a/internal/sql/database_test.go b/internal/sql/database_test.go
@@ -99,7 +99,7 @@ func (s *DatabaseTestSuite) TestCreteDatabaseNoCollation() {
 }
 
 func (s *DatabaseTestSuite) TestCreteDatabaseWithCollation() {
-	settings := DatabaseSettings{Name: "new_test_db", Collation: "new_test_db_collation"}
+	settings := DatabaseSettings{Name: "new_test_db", Collation: "new_test_db_collation", ForceDrop: false}
 	dbId := DatabaseId(1223464)
 	expectExactExec(s.mock, "CREATE DATABASE [%s] COLLATE %s", settings.Name, settings.Collation).
 		WillReturnResult(sqlmock.NewResult(0, 1))
@@ -111,7 +111,7 @@ func (s *DatabaseTestSuite) TestCreteDatabaseWithCollation() {
 }
 
 func (s *DatabaseTestSuite) TestGetSettings() {
-	expSettings := DatabaseSettings{Name: "test_db_name", Collation: "test_collation"}
+	expSettings := DatabaseSettings{Name: "test_db_name", Collation: "test_collation", ForceDrop: false}
 	s.expectDatabaseSettingQuery().
 		WithArgs(s.db.id).
 		WillReturnRows(newRows("name", "collation_name").AddRow(expSettings.Name, expSettings.Collation))