refactor charset and rename (#7)

ariga · May 3, 2022 · 4860fc9 · 4860fc9
1 parent 57aa336
commit 4860fc9
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 45 deletions.
diff --git a/atlas/data_source_atlas_schema_test.go b/atlas/data_source_atlas_schema_test.go
@@ -8,12 +8,12 @@ import (
 )
 
 const testAccData = `
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = <<-EOT
 	schema "test" {
-		charset = "latin1"
-		collate = "latin1_swedish_ci"
+		charset = "utf8mb4"
+		collate = "utf8mb4_0900_ai_ci"
 	}
 	table "foo" {
 		schema = schema.test
@@ -42,8 +42,8 @@ const normalHCL = `table "foo" {
   }
 }
 schema "test" {
-  charset = "latin1"
-  collate = "latin1_swedish_ci"
+  charset = "utf8mb4"
+  collate = "utf8mb4_0900_ai_ci"
 }
 `
 
@@ -57,7 +57,7 @@ func TestAccDataNormalHCL(t *testing.T) {
 			{
 				Config: testAccData,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("data.atlas_schema.at_schema", "hcl", normalHCL),
+					resource.TestCheckResourceAttr("data.atlas_schema.market", "hcl", normalHCL),
 				),
 			},
 		},

diff --git a/atlas/resource_atlas_schema_test.go b/atlas/resource_atlas_schema_test.go
@@ -12,12 +12,12 @@ import (
 )
 
 const testAccActionConfigCreate = `
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = <<-EOT
 	schema "test" {
-		charset = "latin1"
-		collate = "latin1_swedish_ci"
+		charset = "utf8mb4"
+		collate = "utf8mb4_0900_ai_ci"
 	}
 	table "foo" {
 		schema = schema.test
@@ -33,18 +33,18 @@ data "atlas_schema" "at_schema" {
 	EOT
 }
 resource "atlas_schema" "testdb" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"
 }
 `
 
 const testAccActionConfigUpdate = `
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = <<-EOT
 	schema "test" {
-		charset = "latin1"
-		collate = "latin1_swedish_ci"
+		charset = "utf8mb4"
+		collate = "utf8mb4_0900_ai_ci"
 	}
 	table "foo" {
 		schema = schema.test
@@ -64,7 +64,7 @@ data "atlas_schema" "at_schema" {
 	EOT
 }
 resource "atlas_schema" "testdb" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"
 }
 `

diff --git a/docs/index.md b/docs/index.md
@@ -19,13 +19,13 @@ Use the navigation to the left to read about the available resources.
 ```terraform
 provider "atlas" {}
 
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"  
 }
 ```

diff --git a/docs/resources/schema.md b/docs/resources/schema.md
@@ -14,13 +14,13 @@ Atlas database resource manages the data schema of the database, using an HCL fi
 ### Basic
 
 ```terraform
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"  
 }
 ```

diff --git a/examples/data-sources/atlas_schema/human_schema.hcl b/examples/data-sources/atlas_schema/human_schema.hcl
@@ -1,6 +1,6 @@
 // This example show how an `atlas_schema` data source normalizes a human hcl file into machine normalized one.
-table "table" {
-  schema = schema.test
+table "orders" {
+  schema = schema.market
   column "id" {
     null           = false
     type           = int
@@ -15,7 +15,7 @@ table "table" {
     columns = [column.id]
   }
 }
-schema "test" {
-  charset = "latin1"
-  collate = "latin1_swedish_ci"
+schema "market" {
+  charset = "utf8mb4"
+  collate = "utf8mb4_0900_ai_ci"
 }
diff --git a/examples/main.tf b/examples/main.tf
@@ -45,14 +45,14 @@ resource "docker_container" "prod" {
   }
 }
 
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   depends_on = [ docker_container.dev ]
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
   depends_on = [ docker_container.prod ]
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"  
 }
diff --git a/examples/provider/basic/main.tf b/examples/provider/basic/main.tf
@@ -1,12 +1,12 @@
 
 provider "atlas" {}
 
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"  
 }
diff --git a/examples/provider/main.tf b/examples/provider/main.tf
@@ -12,8 +12,7 @@ terraform {
 }
 
 provider "atlas" {}
-provider "docker" {
-}
+provider "docker" {}
 
 resource "docker_image" "mysql" {
   name = "mysql:8"
@@ -45,15 +44,15 @@ resource "docker_container" "prod" {
   }
 }
 
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   depends_on = [ docker_container.dev ]
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
   depends_on = [ docker_container.prod ]
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"
   dev_db_url = "mysql://root:pass@localhost:3307/test"
 }
diff --git a/examples/provider/schema.hcl b/examples/provider/schema.hcl
@@ -1,5 +1,5 @@
 table "orders" {
-  schema = schema.test
+  schema = schema.market
   column "id" {
     null           = false
     type           = int
@@ -14,7 +14,7 @@ table "orders" {
   }
 }
 
-schema "test" {
-  charset = "latin1"
-  collate = "latin1_swedish_ci"
+schema "market" {
+  charset = "utf8mb4"
+  collate = "utf8mb4_0900_ai_ci"
 }
diff --git a/examples/resources/atlas_schema/main.tf b/examples/resources/atlas_schema/main.tf
@@ -1,9 +1,9 @@
-data "atlas_schema" "at_schema" {
+data "atlas_schema" "market" {
   dev_db_url = "mysql://root:pass@localhost:3307/test"
   src = file("${path.module}/schema.hcl")
 }
 
 resource "atlas_schema" "market" {
-  hcl = data.atlas_schema.at_schema.hcl
+  hcl = data.atlas_schema.market.hcl
   url = "mysql://root:pass@localhost:3306/test"  
 }
diff --git a/examples/resources/atlas_schema/schema.hcl b/examples/resources/atlas_schema/schema.hcl
@@ -1,5 +1,5 @@
 table "orders" {
-  schema = schema.test
+  schema = schema.market
   column "id" {
     null           = false
     type           = int
@@ -14,7 +14,7 @@ table "orders" {
   }
 }
 
-schema "test" {
-  charset = "latin1"
-  collate = "latin1_swedish_ci"
+schema "market" {
+  charset = "utf8mb4"
+  collate = "utf8mb4_0900_ai_ci"
 }
diff --git a/examples/schema.hcl b/examples/schema.hcl
@@ -1,5 +1,5 @@
 table "orders" {
-  schema = schema.test
+  schema = schema.market
   column "id" {
     null           = false
     type           = int
@@ -14,7 +14,7 @@ table "orders" {
   }
 }
 
-schema "test" {
-  charset = "latin1"
-  collate = "latin1_swedish_ci"
+schema "market" {
+  charset = "utf8mb4"
+  collate = "utf8mb4_0900_ai_ci"
 }