[Data Factory]Change additionalColumns/compressionType to type of obj…

…ect in ADF/Synapse public swagger (#15264) * Change additionalColumns/compressionType to type of object in ADF public swagger * upgrade synapse public swagger * upgrade synapse preview swagger Co-authored-by: Haoran Sun <haorsun@microsoft.com>
Azure · Jul 29, 2021 · 444d527 · 444d527
1 parent 6db379d
commit 444d527
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 396 deletions.
diff --git a/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -451,8 +451,8 @@
       "type": "object",
       "properties": {
         "type": {
-          "type": "string",
-          "description": "Type of dataset compression."
+          "type": "object",
+          "description": "Type of dataset compression. Type: string (or Expression with resultType string)."
         }
       },
       "additionalProperties": {

diff --git a/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
@@ -1329,11 +1329,8 @@
           "description": "Avro store settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1351,11 +1348,8 @@
           "description": "Excel store settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1373,11 +1367,8 @@
           "description": "Parquet store settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1399,11 +1390,8 @@
           "description": "DelimitedText format settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1425,11 +1413,8 @@
           "description": "Json format settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1451,11 +1436,8 @@
           "description": "Xml format settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1473,11 +1455,8 @@
           "description": "ORC store settings."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1714,11 +1693,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1786,11 +1762,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1820,11 +1793,8 @@
           "description": "Whether detect primitive values as datetime values. Type: boolean (or Expression with resultType boolean)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1842,11 +1812,8 @@
           "description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics (online & on-premises). Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1864,11 +1831,8 @@
           "description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics CRM (online & on-premises). Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1886,11 +1850,8 @@
           "description": "FetchXML is a proprietary query language that is used in Microsoft Common Data Service for Apps (online & on-premises). Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1908,11 +1869,8 @@
           "description": "Database query. Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -1945,11 +1903,8 @@
           "description": "Database query. Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2061,11 +2016,8 @@
           "description": "The timeout (TimeSpan) to get an HTTP response. It is the timeout to get a response, not the timeout to read response data. Default value: 00:05:00. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2122,11 +2074,8 @@
           }
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2366,11 +2315,8 @@
           "description": "The time to await before sending next page request. "
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2589,11 +2535,8 @@
           "description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2675,11 +2618,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       },
       "required": [
@@ -2712,11 +2652,8 @@
           "$ref": "#/definitions/OraclePartitionSettings"
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2797,11 +2734,8 @@
       ],
       "properties": {
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2854,11 +2788,8 @@
           "description": "Database query. Should be a SQL-92 query expression. Type: string (or Expression with resultType string)."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2888,11 +2819,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2922,11 +2850,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },
@@ -2956,11 +2881,8 @@
           "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
         },
         "additionalColumns": {
-          "type": "array",
-          "description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
-          "items": {
-            "$ref": "#/definitions/AdditionalColumns"
-          }
+          "type": "object",
+          "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
         }
       }
     },

diff --git a/.../synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json b/.../synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json
@@ -402,8 +402,8 @@
       "type": "object",
       "properties": {
         "type": {
-          "type": "string",
-          "description": "Type of dataset compression."
+          "type": "object",
+          "description": "Type of dataset compression. Type: string (or Expression with resultType string)."
         }
       },
       "additionalProperties": {