From 818ab140cfbebfa3940da2944686b9844d1f5682 Mon Sep 17 00:00:00 2001 From: Liren Sun Date: Fri, 30 Jul 2021 17:29:37 +0800 Subject: [PATCH 1/3] [Synapse] Add missing 'folder' property for Synapse artifacts --- .../2021-06-01-preview/entityTypes/Notebook.json | 10 ++++++++++ .../entityTypes/SparkJobDefinition.json | 10 ++++++++++ .../2021-06-01-preview/entityTypes/SqlScript.json | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Notebook.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Notebook.json index fe38b3840978..955392b60359 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Notebook.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Notebook.json @@ -42,6 +42,16 @@ "items": { "$ref": "#/definitions/NotebookCell" } + }, + "folder": { + "description": "The folder that this notebook is in. If not specified, this notebook will appear at the root level.", + "type": "object", + "properties": { + "name": { + "description": "The name of the folder that this notebook is in.", + "type": "string" + } + } } }, "additionalProperties": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkJobDefinition.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkJobDefinition.json index b6d5cf7cb67a..a3d67ba9b4e8 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkJobDefinition.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SparkJobDefinition.json @@ -29,6 +29,16 @@ "jobProperties": { "description": "The properties of the Spark job.", "$ref": "#/definitions/SparkJobProperties" + }, + "folder": { + "description": "The folder that this Spark job definition is in. If not specified, this Spark job definition will appear at the root level.", + "type": "object", + "properties": { + "name": { + "description": "The name of the folder that this Spark job definition is in.", + "type": "string" + } + } } }, "additionalProperties": { diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json index caf3d817de18..0c05e7e3316d 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json @@ -28,6 +28,16 @@ "content": { "description": "The content of the SQL script.", "$ref": "#/definitions/SqlScriptContent" + }, + "folder": { + "description": "The folder that this SQL script is in. If not specified, this SQL script will appear at the root level.", + "type": "object", + "properties": { + "name": { + "description": "The name of the folder that this SQL script is in.", + "type": "string" + } + } } }, "additionalProperties": { From 19d6c9b7a1ae2dca66c3d0ebbbad8957b4588a3a Mon Sep 17 00:00:00 2001 From: Liren Sun Date: Fri, 30 Jul 2021 17:36:19 +0800 Subject: [PATCH 2/3] Fix SQL script schema --- .../preview/2021-06-01-preview/entityTypes/SqlScript.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json index 0c05e7e3316d..642d8c70a6db 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json @@ -59,6 +59,10 @@ "description": "The connection used to execute the SQL script.", "$ref": "#/definitions/SqlConnection" }, + "resultLimit": { + "description": "Limit of results, '-1' for no limit.", + "type": "number" + }, "metadata": { "description": "The metadata of the SQL script.", "$ref": "#/definitions/SqlScriptMetadata" @@ -68,8 +72,7 @@ "type": "object" }, "required": [ - "query", - "currentConnection" + "query" ] }, "SqlScriptMetadata": { @@ -110,7 +113,6 @@ "type": "object" }, "required": [ - "type", "name" ] } From 2a607ba8b0333d1ca13564e7159bb7c1726a7f1b Mon Sep 17 00:00:00 2001 From: Liren Sun Date: Fri, 6 Aug 2021 13:46:55 +0800 Subject: [PATCH 3/3] update sql script connection --- .../2021-06-01-preview/entityTypes/SqlScript.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json index 642d8c70a6db..9b1d1fdfad2e 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/SqlScript.json @@ -107,14 +107,19 @@ "name": { "description": "The identifier of the connection.", "type": "string" + }, + "poolName": { + "description": "The associated SQL pool name (supported by SQL pool v3)", + "type": "string" + }, + "databaseName": { + "description": "The associated database name (supported by SQL pool v3)", + "type": "string" } }, "additionalProperties": { "type": "object" - }, - "required": [ - "name" - ] + } } } }