Skip to content

Commit 444d527

Browse files
rickysun93Haoran Sun
rickysun93
and
Haoran Sun
authored
[Data Factory]Change additionalColumns/compressionType to type of object 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>
1 parent 6db379d commit 444d527

File tree

6 files changed

+162
-396
lines changed

6 files changed

+162
-396
lines changed

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,8 @@
451451
"type": "object",
452452
"properties": {
453453
"type": {
454-
"type": "string",
455-
"description": "Type of dataset compression."
454+
"type": "object",
455+
"description": "Type of dataset compression. Type: string (or Expression with resultType string)."
456456
}
457457
},
458458
"additionalProperties": {

‎specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json‎

Lines changed: 52 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,11 +1329,8 @@
13291329
"description": "Avro store settings."
13301330
},
13311331
"additionalColumns": {
1332-
"type": "array",
1333-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1334-
"items": {
1335-
"$ref": "#/definitions/AdditionalColumns"
1336-
}
1332+
"type": "object",
1333+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
13371334
}
13381335
}
13391336
},
@@ -1351,11 +1348,8 @@
13511348
"description": "Excel store settings."
13521349
},
13531350
"additionalColumns": {
1354-
"type": "array",
1355-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1356-
"items": {
1357-
"$ref": "#/definitions/AdditionalColumns"
1358-
}
1351+
"type": "object",
1352+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
13591353
}
13601354
}
13611355
},
@@ -1373,11 +1367,8 @@
13731367
"description": "Parquet store settings."
13741368
},
13751369
"additionalColumns": {
1376-
"type": "array",
1377-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1378-
"items": {
1379-
"$ref": "#/definitions/AdditionalColumns"
1380-
}
1370+
"type": "object",
1371+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
13811372
}
13821373
}
13831374
},
@@ -1399,11 +1390,8 @@
13991390
"description": "DelimitedText format settings."
14001391
},
14011392
"additionalColumns": {
1402-
"type": "array",
1403-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1404-
"items": {
1405-
"$ref": "#/definitions/AdditionalColumns"
1406-
}
1393+
"type": "object",
1394+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
14071395
}
14081396
}
14091397
},
@@ -1425,11 +1413,8 @@
14251413
"description": "Json format settings."
14261414
},
14271415
"additionalColumns": {
1428-
"type": "array",
1429-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1430-
"items": {
1431-
"$ref": "#/definitions/AdditionalColumns"
1432-
}
1416+
"type": "object",
1417+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
14331418
}
14341419
}
14351420
},
@@ -1451,11 +1436,8 @@
14511436
"description": "Xml format settings."
14521437
},
14531438
"additionalColumns": {
1454-
"type": "array",
1455-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1456-
"items": {
1457-
"$ref": "#/definitions/AdditionalColumns"
1458-
}
1439+
"type": "object",
1440+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
14591441
}
14601442
}
14611443
},
@@ -1473,11 +1455,8 @@
14731455
"description": "ORC store settings."
14741456
},
14751457
"additionalColumns": {
1476-
"type": "array",
1477-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1478-
"items": {
1479-
"$ref": "#/definitions/AdditionalColumns"
1480-
}
1458+
"type": "object",
1459+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
14811460
}
14821461
}
14831462
},
@@ -1714,11 +1693,8 @@
17141693
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
17151694
},
17161695
"additionalColumns": {
1717-
"type": "array",
1718-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1719-
"items": {
1720-
"$ref": "#/definitions/AdditionalColumns"
1721-
}
1696+
"type": "object",
1697+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
17221698
}
17231699
}
17241700
},
@@ -1786,11 +1762,8 @@
17861762
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
17871763
},
17881764
"additionalColumns": {
1789-
"type": "array",
1790-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1791-
"items": {
1792-
"$ref": "#/definitions/AdditionalColumns"
1793-
}
1765+
"type": "object",
1766+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
17941767
}
17951768
}
17961769
},
@@ -1820,11 +1793,8 @@
18201793
"description": "Whether detect primitive values as datetime values. Type: boolean (or Expression with resultType boolean)."
18211794
},
18221795
"additionalColumns": {
1823-
"type": "array",
1824-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1825-
"items": {
1826-
"$ref": "#/definitions/AdditionalColumns"
1827-
}
1796+
"type": "object",
1797+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
18281798
}
18291799
}
18301800
},
@@ -1842,11 +1812,8 @@
18421812
"description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics (online & on-premises). Type: string (or Expression with resultType string)."
18431813
},
18441814
"additionalColumns": {
1845-
"type": "array",
1846-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1847-
"items": {
1848-
"$ref": "#/definitions/AdditionalColumns"
1849-
}
1815+
"type": "object",
1816+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
18501817
}
18511818
}
18521819
},
@@ -1864,11 +1831,8 @@
18641831
"description": "FetchXML is a proprietary query language that is used in Microsoft Dynamics CRM (online & on-premises). Type: string (or Expression with resultType string)."
18651832
},
18661833
"additionalColumns": {
1867-
"type": "array",
1868-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1869-
"items": {
1870-
"$ref": "#/definitions/AdditionalColumns"
1871-
}
1834+
"type": "object",
1835+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
18721836
}
18731837
}
18741838
},
@@ -1886,11 +1850,8 @@
18861850
"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)."
18871851
},
18881852
"additionalColumns": {
1889-
"type": "array",
1890-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1891-
"items": {
1892-
"$ref": "#/definitions/AdditionalColumns"
1893-
}
1853+
"type": "object",
1854+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
18941855
}
18951856
}
18961857
},
@@ -1908,11 +1869,8 @@
19081869
"description": "Database query. Type: string (or Expression with resultType string)."
19091870
},
19101871
"additionalColumns": {
1911-
"type": "array",
1912-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1913-
"items": {
1914-
"$ref": "#/definitions/AdditionalColumns"
1915-
}
1872+
"type": "object",
1873+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
19161874
}
19171875
}
19181876
},
@@ -1945,11 +1903,8 @@
19451903
"description": "Database query. Type: string (or Expression with resultType string)."
19461904
},
19471905
"additionalColumns": {
1948-
"type": "array",
1949-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
1950-
"items": {
1951-
"$ref": "#/definitions/AdditionalColumns"
1952-
}
1906+
"type": "object",
1907+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
19531908
}
19541909
}
19551910
},
@@ -2061,11 +2016,8 @@
20612016
"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]))."
20622017
},
20632018
"additionalColumns": {
2064-
"type": "array",
2065-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2066-
"items": {
2067-
"$ref": "#/definitions/AdditionalColumns"
2068-
}
2019+
"type": "object",
2020+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
20692021
}
20702022
}
20712023
},
@@ -2122,11 +2074,8 @@
21222074
}
21232075
},
21242076
"additionalColumns": {
2125-
"type": "array",
2126-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2127-
"items": {
2128-
"$ref": "#/definitions/AdditionalColumns"
2129-
}
2077+
"type": "object",
2078+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
21302079
}
21312080
}
21322081
},
@@ -2366,11 +2315,8 @@
23662315
"description": "The time to await before sending next page request. "
23672316
},
23682317
"additionalColumns": {
2369-
"type": "array",
2370-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2371-
"items": {
2372-
"$ref": "#/definitions/AdditionalColumns"
2373-
}
2318+
"type": "object",
2319+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
23742320
}
23752321
}
23762322
},
@@ -2589,11 +2535,8 @@
25892535
"description": "If true, files under the folder path will be read recursively. Default is true. Type: boolean (or Expression with resultType boolean)."
25902536
},
25912537
"additionalColumns": {
2592-
"type": "array",
2593-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2594-
"items": {
2595-
"$ref": "#/definitions/AdditionalColumns"
2596-
}
2538+
"type": "object",
2539+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
25972540
}
25982541
}
25992542
},
@@ -2675,11 +2618,8 @@
26752618
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).."
26762619
},
26772620
"additionalColumns": {
2678-
"type": "array",
2679-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2680-
"items": {
2681-
"$ref": "#/definitions/AdditionalColumns"
2682-
}
2621+
"type": "object",
2622+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
26832623
}
26842624
},
26852625
"required": [
@@ -2712,11 +2652,8 @@
27122652
"$ref": "#/definitions/OraclePartitionSettings"
27132653
},
27142654
"additionalColumns": {
2715-
"type": "array",
2716-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2717-
"items": {
2718-
"$ref": "#/definitions/AdditionalColumns"
2719-
}
2655+
"type": "object",
2656+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
27202657
}
27212658
}
27222659
},
@@ -2797,11 +2734,8 @@
27972734
],
27982735
"properties": {
27992736
"additionalColumns": {
2800-
"type": "array",
2801-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2802-
"items": {
2803-
"$ref": "#/definitions/AdditionalColumns"
2804-
}
2737+
"type": "object",
2738+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
28052739
}
28062740
}
28072741
},
@@ -2854,11 +2788,8 @@
28542788
"description": "Database query. Should be a SQL-92 query expression. Type: string (or Expression with resultType string)."
28552789
},
28562790
"additionalColumns": {
2857-
"type": "array",
2858-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2859-
"items": {
2860-
"$ref": "#/definitions/AdditionalColumns"
2861-
}
2791+
"type": "object",
2792+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
28622793
}
28632794
}
28642795
},
@@ -2888,11 +2819,8 @@
28882819
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
28892820
},
28902821
"additionalColumns": {
2891-
"type": "array",
2892-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2893-
"items": {
2894-
"$ref": "#/definitions/AdditionalColumns"
2895-
}
2822+
"type": "object",
2823+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
28962824
}
28972825
}
28982826
},
@@ -2922,11 +2850,8 @@
29222850
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
29232851
},
29242852
"additionalColumns": {
2925-
"type": "array",
2926-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2927-
"items": {
2928-
"$ref": "#/definitions/AdditionalColumns"
2929-
}
2853+
"type": "object",
2854+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
29302855
}
29312856
}
29322857
},
@@ -2956,11 +2881,8 @@
29562881
"description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))."
29572882
},
29582883
"additionalColumns": {
2959-
"type": "array",
2960-
"description": "Specifies the additional columns to be added to source data. Type: array of objects (or Expression with resultType array of objects).",
2961-
"items": {
2962-
"$ref": "#/definitions/AdditionalColumns"
2963-
}
2884+
"type": "object",
2885+
"description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)."
29642886
}
29652887
}
29662888
},

‎specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@
402402
"type": "object",
403403
"properties": {
404404
"type": {
405-
"type": "string",
406-
"description": "Type of dataset compression."
405+
"type": "object",
406+
"description": "Type of dataset compression. Type: string (or Expression with resultType string)."
407407
}
408408
},
409409
"additionalProperties": {

0 commit comments

Comments
 (0)