diff --git a/google/resource_sql_database.go b/google/resource_sql_database.go index a1fca2322eb..c9c5e80edd2 100644 --- a/google/resource_sql_database.go +++ b/google/resource_sql_database.go @@ -46,13 +46,13 @@ func resourceSqlDatabase() *schema.Resource { "charset": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "utf8", + Computed: true, }, "collation": &schema.Schema{ Type: schema.TypeString, Optional: true, - Default: "utf8_general_ci", + Computed: true, }, }, } diff --git a/website/docs/r/sql_database.html.markdown b/website/docs/r/sql_database.html.markdown index 5cb6acd33ef..796f1d47ceb 100644 --- a/website/docs/r/sql_database.html.markdown +++ b/website/docs/r/sql_database.html.markdown @@ -44,10 +44,23 @@ The following arguments are supported: * `project` - (Optional) The project in which the resource belongs. If it is not provided, the provider project is used. -* `charset` - (Optional) The MySQL charset value (default "utf8"). - -* `collation` - (Optional) The MySQL collation value (default - "utf8_general_ci"). +* `charset` - (Optional) The charset value. See MySQL's [Supported Character + Sets and + Collations](https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html) + and PostgreSQL's [Character Set + Support](https://www.postgresql.org/docs/9.6/static/multibyte.html) + for more details and supported values. Note that Cloud SQL's beta + offering for PostgreSQL databases currently only supports the charset value + `UTF8`. + +* `collation` - (Optional) The collation value. See MySQL's [Supported Character + Sets and + Collations](https://dev.mysql.com/doc/refman/5.7/en/charset-charsets.html) + and PostgreSQL's [Collation + Support](https://www.postgresql.org/docs/9.6/static/collation.html) for + more details and supported values. Note that Cloud SQL's beta + offering for PostgreSQL databases currently only supports the collation + value `en_US.UTF8`. ## Attributes Reference