From 64f8259802c142b41191fd4947c5d8cfbdb3cdca Mon Sep 17 00:00:00 2001
From: Dongjing Gao <gadongji@microsoft.com>
Date: Tue, 20 Mar 2018 10:40:34 +0800
Subject: [PATCH] Enhance linked services for MySQL, PostgreSQL, Teradata and
 DB2

---
 .../entityTypes/LinkedService.json            | 54 +++----------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
index b5fde7e4c344..0b31e0b5a40f 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/preview/2017-09-01-preview/entityTypes/LinkedService.json
@@ -611,24 +611,8 @@
     "MySqlLinkedServiceTypeProperties": {
       "description": "MySQL linked service properties.",
       "properties": {
-        "server": {
-          "type": "object",
-          "description": "Server name for connection. Type: string (or Expression with resultType string)."
-        },
-        "database": {
-          "type": "object",
-          "description": "Database name for connection. Type: string (or Expression with resultType string)."
-        },
-        "schema": {
-          "type": "object",
-          "description": "Schema name for connection. Type: string (or Expression with resultType string)."
-        },
-        "username": {
-          "type": "object",
-          "description": "Username for authentication. Type: string (or Expression with resultType string)."
-        },
-        "password": {
-          "description": "Password for authentication.",
+        "connectionString": {
+          "description": "The connection string.",
           "$ref": "../datafactory.json#/definitions/SecretBase"
         },
         "encryptedCredential": {
@@ -637,8 +621,7 @@
         }
       },
       "required": [
-        "server",
-        "database"
+        "connectionString"
       ]
     },
     "PostgreSqlLinkedService": {
@@ -664,24 +647,8 @@
     "PostgreSqlLinkedServiceTypeProperties": {
       "description": "PostgreSQL linked service properties.",
       "properties": {
-        "server": {
-          "type": "object",
-          "description": "Server name for connection. Type: string (or Expression with resultType string)."
-        },
-        "database": {
-          "type": "object",
-          "description": "Database name for connection. Type: string (or Expression with resultType string)."
-        },
-        "schema": {
-          "type": "object",
-          "description": "Schema name for connection. Type: string (or Expression with resultType string)."
-        },
-        "username": {
-          "type": "object",
-          "description": "Username for authentication. Type: string (or Expression with resultType string)."
-        },
-        "password": {
-          "description": "Password for authentication.",
+        "connectionString": {
+          "description": "The connection string.",
           "$ref": "../datafactory.json#/definitions/SecretBase"
         },
         "encryptedCredential": {
@@ -690,8 +657,7 @@
         }
       },
       "required": [
-        "server",
-        "database"
+        "connectionString"
       ]
     },
     "SybaseLinkedService": {
@@ -790,10 +756,6 @@
           "type": "object",
           "description": "Database name for connection. Type: string (or Expression with resultType string)."
         },
-        "schema": {
-          "type": "object",
-          "description": "Schema name for connection. Type: string (or Expression with resultType string)."
-        },
         "authenticationType": {
           "description": "AuthenticationType to be used for connection.",
           "type": "string",
@@ -850,10 +812,6 @@
           "type": "object",
           "description": "Server name for connection. Type: string (or Expression with resultType string)."
         },
-        "schema": {
-          "type": "object",
-          "description": "Schema name for connection. Type: string (or Expression with resultType string)."
-        },
         "authenticationType": {
           "description": "AuthenticationType to be used for connection.",
           "type": "string",