Added - Support for NoSQL - Add functionality in OCI console

Author: Terraform Team Automation

examples/nosql/child_table/main.tf

@@ -43,9 +43,9 @@ resource "oci_nosql_table" "test_table" {
 
   table_limits {
     #Required
-    max_read_units     = "10"
-    max_write_units    = "10"
-    max_storage_in_gbs = "1"
+    max_read_units     = "50"
+    max_write_units    = "50"
+    max_storage_in_gbs = "25"
   }
 }
 

examples/nosql/ondemand_table/main.tf

@@ -41,7 +41,7 @@ resource "oci_nosql_table" "test_ondemand" {
     #Required
     max_read_units     = "0"
     max_write_units    = "0"
-    max_storage_in_gbs = "1"
+    max_storage_in_gbs = "25"
     capacity_mode      = "ON_DEMAND"
   }
 }

examples/nosql/table/main.tf

@@ -43,9 +43,9 @@ resource "oci_nosql_table" "test_table" {
 
   table_limits {
     #Required
-    max_read_units     = "10"
-    max_storage_in_gbs = "10"
-    max_write_units    = "10"
+    max_read_units     = "50"
+    max_write_units    = "50"
+    max_storage_in_gbs = "25"
   }
 }
 

internal/integrationtest/nosql_table_test.go

@@ -35,7 +35,7 @@ var (
 		"table_name_or_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_nosql_table.test_table.id}`},
 		"compartment_id":   acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
 	}
-	ddlStatement = "CREATE TABLE IF NOT EXISTS test_table(id INTEGER, name STRING, age STRING, info JSON, PRIMARY KEY(SHARD(id)))"
+	ddlStatement = "CREATE TABLE IF NOT EXISTS test_table(id INTEGER GENERATED ALWAYS AS IDENTITY, name STRING, age STRING, info JSON, guid STRING AS UUID, PRIMARY KEY(SHARD(id)))"
 
 	NosqlNosqlTableDataSourceRepresentation = map[string]interface{}{
 		"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
@@ -229,6 +229,17 @@ func TestNosqlTableResource_basic(t *testing.T) {
 				resource.TestCheckResourceAttr(singularDatasourceName, "is_auto_reclaimable", "false"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "name", "test_table"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "schema.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.#", "1"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.0.column_name", "id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.0.is_always", "true"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.identity.0.is_null", "false"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.#", "5"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.0.name", "id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.0.is_as_uuid", "false"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.0.is_generated", "false"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.4.name", "guid"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.4.is_as_uuid", "true"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "schema.0.columns.4.is_generated", "false"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "table_limits.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "table_limits.0.capacity_mode", "PROVISIONED"),

internal/service/nosql/nosql_table_resource.go

@@ -130,6 +130,14 @@ func NosqlTableResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Computed: true,
 									},
+									"is_as_uuid": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"is_generated": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
 									"is_nullable": {
 										Type:     schema.TypeBool,
 										Computed: true,
@@ -145,6 +153,31 @@ func NosqlTableResource() *schema.Resource {
 								},
 							},
 						},
+						"identity": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"column_name": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"is_always": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+									"is_null": {
+										Type:     schema.TypeBool,
+										Computed: true,
+									},
+								},
+							},
+						},
 						"primary_key": {
 							Type:     schema.TypeList,
 							Computed: true,
@@ -686,6 +719,14 @@ func ColumnToMap(obj oci_nosql.Column) map[string]interface{} {
 		result["default_value"] = string(*obj.DefaultValue)
 	}
 
+	if obj.IsAsUuid != nil {
+		result["is_as_uuid"] = bool(*obj.IsAsUuid)
+	}
+
+	if obj.IsGenerated != nil {
+		result["is_generated"] = bool(*obj.IsGenerated)
+	}
+
 	if obj.IsNullable != nil {
 		result["is_nullable"] = bool(*obj.IsNullable)
 	}
@@ -701,6 +742,24 @@ func ColumnToMap(obj oci_nosql.Column) map[string]interface{} {
 	return result
 }
 
+func IdentityToMap(obj *oci_nosql.Identity) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.ColumnName != nil {
+		result["column_name"] = string(*obj.ColumnName)
+	}
+
+	if obj.IsAlways != nil {
+		result["is_always"] = bool(*obj.IsAlways)
+	}
+
+	if obj.IsNull != nil {
+		result["is_null"] = bool(*obj.IsNull)
+	}
+
+	return result
+}
+
 func SchemaToMap(obj *oci_nosql.Schema) map[string]interface{} {
 	result := map[string]interface{}{}
 
@@ -710,6 +769,10 @@ func SchemaToMap(obj *oci_nosql.Schema) map[string]interface{} {
 	}
 	result["columns"] = columns
 
+	if obj.Identity != nil {
+		result["identity"] = []interface{}{IdentityToMap(obj.Identity)}
+	}
+
 	result["primary_key"] = obj.PrimaryKey
 
 	result["shard_key"] = obj.ShardKey

website/docs/d/nosql_table.html.markdown

@@ -47,9 +47,15 @@ The following attributes are exported:
 * `schema` - The table schema information as a JSON object.
 	* `columns` - The columns of a table.
 		* `default_value` - The column default value.
+		* `is_as_uuid` - True if the STRING column was declared AS UUID.
+		* `is_generated` - True if the STRING AS UUID column is also GENERATED BY DEFAULT. 
 		* `is_nullable` - The column nullable flag.
 		* `name` - The column name.
 		* `type` - The column type.
+	* `identity` - The identity properties of a table, if any.
+		* `column_name` - The name of the identity column.
+		* `is_always` - True if the identity value is GENERATED ALWAYS.
+		* `is_null` - True if the identity value is GENERATED BY DEFAULT ON NULL.
 	* `primary_key` - A list of column names that make up a key.
 	* `shard_key` - A list of column names that make up a key.
 	* `ttl` - The default Time-to-Live for the table, in days.

website/docs/d/nosql_tables.html.markdown

@@ -45,22 +45,12 @@ The following attributes are exported:
 The following attributes are exported:
 
 * `compartment_id` - Compartment Identifier.
-* `ddl_statement` - A DDL statement representing the schema.
 * `defined_tags` - Defined tags for this resource. Each key is predefined and scoped to a namespace.  Example: `{"foo-namespace": {"bar-key": "value"}}` 
 * `freeform_tags` - Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}` 
 * `id` - Unique identifier that is immutable.
 * `is_auto_reclaimable` - True if this table can be reclaimed after an idle period.
 * `lifecycle_details` - A message describing the current state in more detail. 
 * `name` - Human-friendly table name, immutable.
-* `schema` - The table schema information as a JSON object.
-	* `columns` - The columns of a table.
-		* `default_value` - The column default value.
-		* `is_nullable` - The column nullable flag.
-		* `name` - The column name.
-		* `type` - The column type.
-	* `primary_key` - A list of column names that make up a key.
-	* `shard_key` - A list of column names that make up a key.
-	* `ttl` - The default Time-to-Live for the table, in days.
 * `state` - The state of a table.
 * `system_tags` - Read-only system tag. These predefined keys are scoped to namespaces.  At present the only supported namespace is `"orcl-cloud"`; and the only key in that namespace is `"free-tier-retained"`. Example: `{"orcl-cloud"": {"free-tier-retained": "true"}}` 
 * `table_limits` - Throughput and storage limits configuration of a table.

website/docs/r/nosql_table.html.markdown

@@ -72,9 +72,15 @@ The following attributes are exported:
 * `schema` - The table schema information as a JSON object.
 	* `columns` - The columns of a table.
 		* `default_value` - The column default value.
+		* `is_as_uuid` - True if the STRING column was declared AS UUID.
+		* `is_generated` - True if the STRING AS UUID column is also GENERATED BY DEFAULT. 
 		* `is_nullable` - The column nullable flag.
 		* `name` - The column name.
 		* `type` - The column type.
+	* `identity` - The identity properties of a table, if any.
+		* `column_name` - The name of the identity column.
+		* `is_always` - True if the identity value is GENERATED ALWAYS.
+		* `is_null` - True if the identity value is GENERATED BY DEFAULT ON NULL.
 	* `primary_key` - A list of column names that make up a key.
 	* `shard_key` - A list of column names that make up a key.
 	* `ttl` - The default Time-to-Live for the table, in days.