From 0f88549c755188525c4ea7ff25915e8fa02e2be5 Mon Sep 17 00:00:00 2001
From: Matteo Taveggia <matteot@microsoft.com>
Date: Mon, 30 Nov 2020 12:30:47 -0800
Subject: [PATCH] Reconciling SQL Templatates that ship with SSMS with the ones
 on GitHub.

---
 .../Create External Data Source.sql           |  2 +-
 .../Drop External Data Source.sql             |  4 ++--
 .../Database/Create Database.sql              | 21 +++++++++++--------
 .../Database/Drop Database.sql                |  6 +++---
 .../Alter External Data Source DW.sql         |  6 +++---
 .../Create External Data Source DW.sql        | 18 ++++++++--------
 .../Create External Data Source.sql           |  2 +-
 .../Drop External Data Source.sql             | 10 ++++-----
 .../Create External File Format.sql           |  6 +++---
 .../Drop External File Format.sql             |  6 +++---
 .../Create Scalar Function DW (New Menu).sql  |  6 +++---
 .../Function/Drop Function.sql                |  6 +++---
 .../SQL Azure Database/Index/Create Index.sql |  6 +++---
 .../SQL Azure Database/Index/Drop Index.sql   |  6 +++---
 .../SQL Azure Database/Login/Create Login.sql |  6 +++---
 .../SQL Azure Database/Login/Drop Login.sql   |  6 +++---
 .../SQL Azure Database/Role/Create Role.sql   |  6 +++---
 .../Sql/SQL Azure Database/Role/Drop Role.sql |  6 +++---
 .../Schema/Create Schema.sql                  |  6 +++---
 .../SQL Azure Database/Schema/Drop Schema.sql |  6 +++---
 .../Statistics/Create Statistics.sql          |  6 +++---
 .../Statistics/Drop Statistics.sql            |  6 +++---
 .../Create Stored Procedure DW (New Menu).sql |  6 +++---
 .../Drop Stored Procedure.sql                 |  6 +++---
 .../Table/Create External Table DW.sql        |  6 +++---
 .../Table/Create Graph Edge Table.sql         | 18 +++++++++++-----
 .../Table/Create SQL DW Partitioned Table.sql |  6 +++---
 .../Table/Create SQL DW Table.sql             |  6 +++---
 .../Table/Create System-Versioned Table.sql   |  2 +-
 .../Table/Drop External Table.sql             |  6 +++---
 .../SQL Azure Database/Table/Drop Table.sql   |  6 +++---
 .../SQL Azure Database/User/Create User.sql   |  6 +++---
 .../Sql/SQL Azure Database/User/Drop User.sql |  6 +++---
 .../SQL Azure Database/View/Create View.sql   |  6 +++---
 .../Sql/SQL Azure Database/View/Drop View.sql |  6 +++---
 .../Sql/Table/Create Graph Edge Table.sql     | 14 +++++++++----
 ...emory Optimized System-Versioned Table.sql |  2 +-
 .../Table/Create System-Versioned Table.sql   |  2 +-
 .../Sql/Table/drop constraint.sql             |  5 +++++
 39 files changed, 142 insertions(+), 120 deletions(-)

diff --git a/samples/features/ssms-templates/Sql/External Data Source/Create External Data Source.sql b/samples/features/ssms-templates/Sql/External Data Source/Create External Data Source.sql
index 55c58e8f..040244a7 100644
--- a/samples/features/ssms-templates/Sql/External Data Source/Create External Data Source.sql	
+++ b/samples/features/ssms-templates/Sql/External Data Source/Create External Data Source.sql	
@@ -7,7 +7,7 @@ GO
 IF EXISTS (
   SELECT *
     FROM sys.external_data_sources	
-   WHERE name = N'<data_source_name, sysname, your_data_source_name>'
+    WHERE name = N'<data_source_name, sysname, sample_data_source>'
 )
 DROP EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source>
 GO
diff --git a/samples/features/ssms-templates/Sql/External Data Source/Drop External Data Source.sql b/samples/features/ssms-templates/Sql/External Data Source/Drop External Data Source.sql
index 0b767cae..2e83e39c 100644
--- a/samples/features/ssms-templates/Sql/External Data Source/Drop External Data Source.sql	
+++ b/samples/features/ssms-templates/Sql/External Data Source/Drop External Data Source.sql	
@@ -6,8 +6,8 @@ GO
 
 IF EXISTS (
   SELECT *
-	FROM sys.external_data_sources	
-   WHERE name = N'<data_source_name, sysname, your_data_source_name>'	 
+    FROM sys.external_data_sources	
+    WHERE name = N'<data_source_name, sysname, sample_data_source>'	 
 )
 DROP EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source>
 GO
\ No newline at end of file
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Create Database.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Create Database.sql
index 08c11275..eeb19c1e 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Create Database.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Create Database.sql	
@@ -1,5 +1,5 @@
 -- ===================================================================================================================================
--- Create database template for Azure SQL Database and Azure SQL Data Warehouse Database
+-- Create database template for Azure SQL Database and Azure Synapse Analytics Database
 --
 -- This script will only run in the context of the master database. To manage this database in 
 -- SQL Server Management Studio, either connect to the created database, or connect to master.
@@ -9,27 +9,30 @@
 -- continuity, data protection and security, and near-zero administration — all backed by the power 
 -- and reach of Microsoft Azure.
 --
--- SQL Database is available in the following service tiers: Basic, Standard, Premium , DataWarehouse, Web (Retired) 
+-- SQL Database is available in the following service tiers: GeneralPurpose, Basic, Standard, Premium , DataWarehouse, Web (Retired) 
 -- and Business (Retired).
+-- General Purpose service tier is a default service tier in Azure SQL Database that is designed for most of the generic workloads. 
+-- If you need a fully managed database engine with 99.99% SLA with storage latency between 5 and 10 ms that match Azure SQL 
+-- IaaS in most of the cases, General Purpose tier is the option for you.
 -- Standard is the go-to option for getting started with cloud-designed business applications and 
 -- offers mid-level performance and business continuity features. Performance objectives for Standard 
 -- deliver predictable per minute transaction rates.
 --
--- See http://go.microsoft.com/fwlink/p/?LinkId=306622 for more information about Azure SQL Database.
+-- See https://go.microsoft.com/fwlink/p/?LinkId=306622 for more information about Azure SQL Database.
 -- 
--- See http://go.microsoft.com/fwlink/?LinkId=787140 for more information about Azure SQL Data Warehouse.
+-- See https://go.microsoft.com/fwlink/?LinkId=787140 for more information about Azure Synapse Analytics.
 --
--- See http://go.microsoft.com/fwlink/p/?LinkId=402063 for more information about CREATE DATABASE for Azure SQL Database.
+-- See https://go.microsoft.com/fwlink/p/?LinkId=402063 for more information about CREATE DATABASE for Azure SQL Database.
 --
--- See http://go.microsoft.com/fwlink/?LinkId=787139 for more information about CREATE DATABASE for Azure SQL Data Warehouse Database.
+-- See https://go.microsoft.com/fwlink/?LinkId=787139 for more information about CREATE DATABASE for Azure Synapse Analytics Database.
 -- ===================================================================================================================================
 
  
 CREATE DATABASE <Database_Name, sysname, Database_Name> COLLATE <collation_Name, sysname, SQL_Latin1_General_CP1_CI_AS> 
 	(
-	  EDITION = '<EDITION, , Standard>',
-	  SERVICE_OBJECTIVE='<SERVICE_OBJECTIVE,,S0>',
-	  MAXSIZE = <MAX_SIZE,,250 GB>
+	  EDITION = '<EDITION, , GeneralPurpose>',
+	  SERVICE_OBJECTIVE='<SERVICE_OBJECTIVE,,GP_Gen5_2>',
+	  MAXSIZE = <MAX_SIZE,,32 GB>
 	)
 
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Drop Database.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Drop Database.sql
index 6b1c6790..e782dae8 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Drop Database.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Database/Drop Database.sql	
@@ -1,5 +1,5 @@
--- ===================================================================================
--- Drop database template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ===================================================================================
+-- ===================================================================================================================================
+-- Drop database template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand Database
+-- ===================================================================================================================================
 DROP DATABASE <Database_Name, sysname, Database_Name>
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Alter External Data Source DW.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Alter External Data Source DW.sql
index 77a40355..c8923004 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Alter External Data Source DW.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Alter External Data Source DW.sql	
@@ -1,6 +1,6 @@
--- =========================================================================
--- Alter external data source template for Azure SQL Data Warehouse Database 
--- =========================================================================
+-- ========================================================================
+-- Alter external data source template for Azure Synapse Analytics Database 
+-- ========================================================================
 
 ALTER EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source> SET
 	LOCATION = N'<location, sysname, sample_location>',
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source DW.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source DW.sql
index 886d87b6..1f7b36b3 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source DW.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source DW.sql	
@@ -1,20 +1,20 @@
--- ==========================================================================
--- Create external data source template for Azure SQL Data Warehouse Database 
--- ==========================================================================
+-- =========================================================================
+-- Create external data source template for Azure Synapse Analytics Database 
+-- =========================================================================
 
 IF EXISTS (
   SELECT *
-	FROM sys.external_data_sources	
-   WHERE name = N'<data_source_name, sysname, your_data_source_name>'	 
+   FROM sys.external_data_sources	
+   WHERE name = N'<data_source_name, sysname, sample_data_source>'	 
 )
 DROP EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source>
 GO
 
 CREATE EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source> WITH
 (
-	TYPE = <data_source_type, sysname, sample_type>,
-	LOCATION = N'<location, sysname, sample_location>',
-	RESOURCE_MANAGER_LOCATION = N'<resource_manager_location, sysname, sample_resource_manager_location>',
-	CREDENTIAL = <credential_name, sysname, sample_credential>
+    TYPE = <data_source_type, sysname, sample_type>,
+    LOCATION = N'<location, sysname, sample_location>',
+    RESOURCE_MANAGER_LOCATION = N'<resource_manager_location, sysname, sample_resource_manager_location>',
+    CREDENTIAL = <credential_name, sysname, sample_credential>
 )
 GO
\ No newline at end of file
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source.sql
index 13b90e80..200cbce9 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Create External Data Source.sql	
@@ -4,7 +4,7 @@
 IF EXISTS (
   SELECT *
     FROM sys.external_data_sources
-   WHERE name = N'<data_source_name, sysname, your_data_source_name>'
+    WHERE name = N'<data_source_name, sysname, sample_data_source>'
 )
 DROP EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source>
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Drop External Data Source.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Drop External Data Source.sql
index 69e66fd3..1072e9f9 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Drop External Data Source.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External Data Source/Drop External Data Source.sql	
@@ -1,11 +1,11 @@
--- ===============================================================================================
--- Drop external data source template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ===============================================================================================
+-- ======================================================================================================================================
+-- Drop external data source template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ======================================================================================================================================
 
 IF EXISTS (
   SELECT *
-	FROM sys.external_data_sources	
-   WHERE name = N'<data_source_name, sysname, your_data_source_name>'	 
+    FROM sys.external_data_sources	
+    WHERE name = N'<data_source_name, sysname, sample_data_source>'	 
 )
 DROP EXTERNAL DATA SOURCE <data_source_name, sysname, sample_data_source>
 GO
\ No newline at end of file
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Create External File Format.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Create External File Format.sql
index 6f0a5fdf..1772c506 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Create External File Format.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Create External File Format.sql	
@@ -1,6 +1,6 @@
--- ==========================================================================
--- Create external file format template for Azure SQL Data Warehouse Database 
--- ==========================================================================
+-- =========================================================================
+-- Create external file format template for Azure Synapse Analytics Database 
+-- =========================================================================
 
 IF EXISTS (
   SELECT *
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Drop External File Format.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Drop External File Format.sql
index e39fec07..352a5617 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Drop External File Format.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/External File Format/Drop External File Format.sql	
@@ -1,6 +1,6 @@
--- ========================================================================
--- Drop external file format template for Azure SQL Data Warehouse Database 
--- ========================================================================
+-- ==================================================================================================================
+-- Drop external file format template for Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ==================================================================================================================
 
 IF EXISTS (
   SELECT *
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Create Scalar Function DW (New Menu).sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Create Scalar Function DW (New Menu).sql
index bc24016a..1827a584 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Create Scalar Function DW (New Menu).sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Create Scalar Function DW (New Menu).sql	
@@ -1,6 +1,6 @@
--- =====================================================================
--- Create Scalar Function Template for Azure SQL Data Warehouse Database
--- =====================================================================
+-- ====================================================================
+-- Create Scalar Function Template for Azure Synapse Analytics Database
+-- ====================================================================
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Drop Function.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Drop Function.sql
index acce825a..f7b2d7cd 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Drop Function.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Function/Drop Function.sql	
@@ -1,6 +1,6 @@
- --===================================================================================
--- Drop function template for Azure SQL Database and Azure SQL Data Warehouse Database
---====================================================================================
+ --==================================================================================
+-- Drop function template for Azure SQL Database and Azure Synapse Analytics Database
+--===================================================================================
 IF OBJECT_ID (N'<schema_name, sysname, dbo>.<function_name, sysname, EmployeeByID>') IS NOT NULL
    DROP FUNCTION <schema_name, sysname, dbo>.<function_name, sysname, EmployeeByID>
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Create Index.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Create Index.sql
index 861fea58..b37b8b6f 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Create Index.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Create Index.sql	
@@ -1,6 +1,6 @@
--- ==================================================================================
--- Create index template for Azure SQL Database and Azure SQL Data Warehouse Database 
--- ==================================================================================
+-- =================================================================================
+-- Create index template for Azure SQL Database and Azure Synapse Analytics Database 
+-- =================================================================================
 
 CREATE INDEX <index_name, sysname, ind_test>
 ON <schema_name, sysname, Person>.<table_name, sysname, Address> 
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Drop Index.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Drop Index.sql
index 7da05954..4f8f0881 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Drop Index.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Index/Drop Index.sql	
@@ -1,6 +1,6 @@
---========================================================================
--- Drop index template for Azure SQL Database and Azure SQL Data Warehouse
---========================================================================
+--=======================================================================
+-- Drop index template for Azure SQL Database and Azure Synapse Analytics
+--=======================================================================
 IF EXISTS (
   SELECT *
 	FROM sys.indexes
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Create Login.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Create Login.sql
index a060f492..519f58f2 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Create Login.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Create Login.sql	
@@ -1,6 +1,6 @@
--- ======================================================================================
--- Create SQL Login template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ======================================================================================
+-- =============================================================================================================================
+-- Create SQL Login template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- =============================================================================================================================
 
 CREATE LOGIN <SQL_login_name, sysname, login_name> 
 	WITH PASSWORD = '<password, sysname, Change_Password>' 
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Drop Login.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Drop Login.sql
index ce390455..ed021dd8 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Drop Login.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Login/Drop Login.sql	
@@ -1,6 +1,6 @@
--- ====================================================================================
--- Drop SQL Login template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ====================================================================================
+-- ===========================================================================================================================
+-- Drop SQL Login template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ===========================================================================================================================
 
 DROP LOGIN <login_name, sysname, login_name>
 Go
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Create Role.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Create Role.sql
index 216bc3de..174dd2bb 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Create Role.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Create Role.sql	
@@ -1,6 +1,6 @@
--- ==========================================================================================
--- Create Database Role template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ==========================================================================================
+-- =========================================================================================
+-- Create Database Role template for Azure SQL Database and Azure Synapse Analytics Database
+-- =========================================================================================
 -- Create the database role
 CREATE ROLE <role_name, sysname, Production_Owner> AUTHORIZATION [dbo]
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Drop Role.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Drop Role.sql
index 2f00d1ec..ae45b76b 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Drop Role.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Role/Drop Role.sql	
@@ -1,6 +1,6 @@
--- ========================================================================================
--- Drop Database Role template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ========================================================================================
+-- ===============================================================================================================================
+-- Drop Database Role template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ===============================================================================================================================
 
 -- Drop the role
 DROP ROLE <role_name, sysname, Production_Owner>;
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Create Schema.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Create Schema.sql
index 5db793fa..a1f5fa84 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Create Schema.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Create Schema.sql	
@@ -1,6 +1,6 @@
--- ===================================================================================
--- Create Schema Template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ===================================================================================
+-- ==========================================================================================================================
+-- Create Schema Template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ==========================================================================================================================
 
 CREATE SCHEMA <sample_schema, sysname, sample_schema>
 AUTHORIZATION <owner_name, sysname, owner_name>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Drop Schema.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Drop Schema.sql
index ca204aba..60862187 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Drop Schema.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Schema/Drop Schema.sql	
@@ -1,6 +1,6 @@
---==================================================================================
--- Drop Schema template for Azure SQL Database and Azure SQL Data Warehouse Database
---==================================================================================
+--=========================================================================================================================
+-- Drop Schema template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+--=========================================================================================================================
 IF EXISTS(
   SELECT *
     FROM sys.schemas
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Create Statistics.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Create Statistics.sql
index 8010ace8..61e49403 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Create Statistics.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Create Statistics.sql	
@@ -1,6 +1,6 @@
--- ===============================================================================================
--- Create Sampled Statistics Template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ===============================================================================================
+-- ======================================================================================================================================
+-- Create Sampled Statistics Template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ======================================================================================================================================
 CREATE STATISTICS <statistics_name, sysname, statistics_name> 
 ON <schema_name, sysname, schema_name>.<table_name, sysname, table_name>
 ( 
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Drop Statistics.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Drop Statistics.sql
index be0d700a..bbc6cf1c 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Drop Statistics.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Statistics/Drop Statistics.sql	
@@ -1,6 +1,6 @@
---======================================================================================
--- Drop Statistics template for Azure SQL Database and Azure SQL Data Warehouse Database
---======================================================================================
+--=============================================================================================================================
+-- Drop Statistics template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+--=============================================================================================================================
 IF EXISTS (
   SELECT *
 	FROM sys.stats as st
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Create Stored Procedure DW (New Menu).sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Create Stored Procedure DW (New Menu).sql
index a723c18f..cb919301 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Create Stored Procedure DW (New Menu).sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Create Stored Procedure DW (New Menu).sql	
@@ -1,6 +1,6 @@
--- ======================================================================
--- Create Stored Procedure Template for Azure SQL Data Warehouse Database
--- ======================================================================
+-- =====================================================================
+-- Create Stored Procedure Template for Azure Synapse Analytics Database
+-- =====================================================================
 SET ANSI_NULLS ON
 GO
 SET QUOTED_IDENTIFIER ON
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Drop Stored Procedure.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Drop Stored Procedure.sql
index 8914ee50..7af30c9e 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Drop Stored Procedure.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Stored Procedure/Drop Stored Procedure.sql	
@@ -1,6 +1,6 @@
--- ===========================================================================================
--- Drop Stored Procedure Template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ===========================================================================================
+-- ==========================================================================================
+-- Drop Stored Procedure Template for Azure SQL Database and Azure Synapse Analytics Database
+-- ==========================================================================================
 
 -- Drop stored procedure if it already exists
 IF EXISTS (
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create External Table DW.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create External Table DW.sql
index ff56e788..753e1079 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create External Table DW.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create External Table DW.sql	
@@ -1,6 +1,6 @@
--- ====================================================================
--- Create External Table Template for Azure SQL Data Warehouse Database
--- ====================================================================
+-- ===================================================================
+-- Create External Table Template for Azure Synapse Analytics Database
+-- ===================================================================
 
 IF OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_external_table>', 'U') IS NOT NULL
     DROP EXTERNAL TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_external_table>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create Graph Edge Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create Graph Edge Table.sql
index 9c520ee5..d3967030 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create Graph Edge Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create Graph Edge Table.sql	
@@ -1,24 +1,32 @@
 -- =========================================
--- Create Graph Edge Template
+-- Create Graph Edge Table Template
 -- =========================================
+USE <database, sysname, AdventureWorks>
+GO
 
-IF OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>', 'U') IS NOT NULL
-  DROP TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
+DROP TABLE IF EXISTS <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
 GO
 
 CREATE TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
 (
-    -- Columns are optional for Edge Tables.
+    -- Columns are optional for Graph Edge Tables.
     --
     <column1_name, sysname, c1> <column1_datatype, , int> <column1_nullability, , NOT NULL>,
     <column2_name, sysname, c2> <column2_datatype, , char(10)> <column2_nullability, , NULL>,
     <column3_name, sysname, c3> <column3_datatype, , datetime> <column3_nullability, , NULL>,
 
+    -- System generated edge constraint.
+    --
+    CONNECTION (<node_table_name TO <node_table_name>),
+
+    CONSTRAINT EC_<constraint_name> CONNECTION (<node_table_name TO <node_table_name>, <node_table_name> TO <node_table_name>),
     -- Unique index on $edge_id is required.
-    -- If no user-defined index is specified, a default index is created instead.
+    -- If no user-defined index is specified, a default index is created.
+    --
     INDEX ix_graphid UNIQUE ($edge_id),
 
     -- indexes on $from_id and $to_id are optional, but support faster lookups.
+    --
     INDEX ix_fromid ($from_id, $to_id),
     INDEX ix_toid ($to_id, $from_id)
 )
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Partitioned Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Partitioned Table.sql
index 6762010e..ad6873dd 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Partitioned Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Partitioned Table.sql	
@@ -1,6 +1,6 @@
--- =======================================================================
--- Create Partitioned Table Template for Azure SQL Data Warehouse Database
--- =======================================================================
+-- ======================================================================
+-- Create Partitioned Table Template for Azure Synapse Analytics Database
+-- ======================================================================
 
 IF OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_table>', 'U') IS NOT NULL
     DROP TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_table>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Table.sql
index ee646172..ad8859e6 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create SQL DW Table.sql	
@@ -1,6 +1,6 @@
--- ===========================================================
--- Create Table Template for Azure SQL Data Warehouse Database
--- ===========================================================
+-- ==========================================================
+-- Create Table Template for Azure Synapse Analytics Database
+-- ==========================================================
 
 IF OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_table>', 'U') IS NOT NULL
     DROP TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_table>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create System-Versioned Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create System-Versioned Table.sql
index fff691c8..2496fbf9 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create System-Versioned Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Create System-Versioned Table.sql	
@@ -13,7 +13,7 @@
 
 BEGIN
     --If table is system-versioned, SYSTEM_VERSIONING must be set to OFF first 
-    IF ((SELECT temporal_type FROM SYS.TABLES WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<temporal_table_name, sysname, sample_table>', 'U')) = 2)
+    IF ((SELECT temporal_type FROM sys.tables WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<temporal_table_name, sysname, sample_table>', 'U')) = 2)
     BEGIN
         ALTER TABLE [<schema_name, sysname, dbo>].[<temporal_table_name, sysname, sample_table>] SET (SYSTEM_VERSIONING = OFF)
     END
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop External Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop External Table.sql
index 1bb161fa..fad276b0 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop External Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop External Table.sql	
@@ -1,6 +1,6 @@
---==========================================================================================
--- Drop External Table template for Azure SQL Database and Azure SQL Data Warehouse Database 
---==========================================================================================
+--=================================================================================================================================
+-- Drop External Table template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+--=================================================================================================================================
 IF EXISTS (
   SELECT *
 	FROM sys.tables
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop Table.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop Table.sql
index 7758c8b9..8bca0fcf 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop Table.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/Table/Drop Table.sql	
@@ -1,6 +1,6 @@
---=================================================================================
--- Drop Table template for Azure SQL Database and Azure SQL Data Warehouse Database 
---=================================================================================
+--================================================================================
+-- Drop Table template for Azure SQL Database and Azure Synapse Analytics Database 
+--================================================================================
 IF EXISTS (
   SELECT *
 	FROM sys.tables
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/User/Create User.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/User/Create User.sql
index 61de5bf7..cb838af2 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/User/Create User.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/User/Create User.sql	
@@ -1,6 +1,6 @@
--- ========================================================================================
--- Create User as DBO template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ========================================================================================
+-- =======================================================================================
+-- Create User as DBO template for Azure SQL Database and Azure Synapse Analytics Database
+-- =======================================================================================
 -- For login <login_name, sysname, login_name>, create a user in the database
 CREATE USER <user_name, sysname, user_name>
 	FOR LOGIN <login_name, sysname, login_name>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/User/Drop User.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/User/Drop User.sql
index f1a830b4..f21cca8a 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/User/Drop User.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/User/Drop User.sql	
@@ -1,5 +1,5 @@
--- ========================================================================================
--- Create User as DBO template for Azure SQL Database and Azure SQL Data Warehouse Database
--- ========================================================================================
+-- ===============================================================================================================================
+-- Create User as DBO template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+-- ===============================================================================================================================
 DROP USER <user_name, sysname, user_name>
 GO
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/View/Create View.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/View/Create View.sql
index 93570399..151b4106 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/View/Create View.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/View/Create View.sql	
@@ -1,6 +1,6 @@
--- =================================================================================
--- Create View template for Azure SQL Database and Azure SQL Data Warehouse Database
--- =================================================================================
+-- ================================================================================
+-- Create View template for Azure SQL Database and Azure Synapse Analytics Database
+-- ================================================================================
 
 IF object_id(N'<schema_name, sysname, dbo>.<view_name, sysname, Top10Sales>', 'V') IS NOT NULL
 	DROP VIEW <schema_name, sysname, dbo>.<view_name, sysname, Top10Sales>
diff --git a/samples/features/ssms-templates/Sql/SQL Azure Database/View/Drop View.sql b/samples/features/ssms-templates/Sql/SQL Azure Database/View/Drop View.sql
index a5aeb66f..b65c8345 100644
--- a/samples/features/ssms-templates/Sql/SQL Azure Database/View/Drop View.sql	
+++ b/samples/features/ssms-templates/Sql/SQL Azure Database/View/Drop View.sql	
@@ -1,6 +1,6 @@
---================================================================================
--- Drop View template for Azure SQL Database and Azure SQL Data Warehouse Database
---================================================================================
+--=======================================================================================================================
+-- Drop View template for Azure SQL Database, Azure Synapse Analytics Database, and Azure Synapse SQL Analytics on-demand
+--=======================================================================================================================
 IF EXISTS (
   SELECT *
 	FROM sys.views
diff --git a/samples/features/ssms-templates/Sql/Table/Create Graph Edge Table.sql b/samples/features/ssms-templates/Sql/Table/Create Graph Edge Table.sql
index c56b10e4..d3967030 100644
--- a/samples/features/ssms-templates/Sql/Table/Create Graph Edge Table.sql	
+++ b/samples/features/ssms-templates/Sql/Table/Create Graph Edge Table.sql	
@@ -1,26 +1,32 @@
 -- =========================================
--- Create Graph Edge Template
+-- Create Graph Edge Table Template
 -- =========================================
 USE <database, sysname, AdventureWorks>
 GO
 
-IF OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>', 'U') IS NOT NULL
-  DROP TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
+DROP TABLE IF EXISTS <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
 GO
 
 CREATE TABLE <schema_name, sysname, dbo>.<table_name, sysname, sample_edgetable>
 (
-    -- Columns are optional for Edge Tables.
+    -- Columns are optional for Graph Edge Tables.
     --
     <column1_name, sysname, c1> <column1_datatype, , int> <column1_nullability, , NOT NULL>,
     <column2_name, sysname, c2> <column2_datatype, , char(10)> <column2_nullability, , NULL>,
     <column3_name, sysname, c3> <column3_datatype, , datetime> <column3_nullability, , NULL>,
 
+    -- System generated edge constraint.
+    --
+    CONNECTION (<node_table_name TO <node_table_name>),
+
+    CONSTRAINT EC_<constraint_name> CONNECTION (<node_table_name TO <node_table_name>, <node_table_name> TO <node_table_name>),
     -- Unique index on $edge_id is required.
     -- If no user-defined index is specified, a default index is created.
+    --
     INDEX ix_graphid UNIQUE ($edge_id),
 
     -- indexes on $from_id and $to_id are optional, but support faster lookups.
+    --
     INDEX ix_fromid ($from_id, $to_id),
     INDEX ix_toid ($to_id, $from_id)
 )
diff --git a/samples/features/ssms-templates/Sql/Table/Create Memory Optimized System-Versioned Table.sql b/samples/features/ssms-templates/Sql/Table/Create Memory Optimized System-Versioned Table.sql
index 2061a1cd..371dfa33 100644
--- a/samples/features/ssms-templates/Sql/Table/Create Memory Optimized System-Versioned Table.sql	
+++ b/samples/features/ssms-templates/Sql/Table/Create Memory Optimized System-Versioned Table.sql	
@@ -19,7 +19,7 @@ USE <database, sysname, AdventureWorks>
 GO
 
 BEGIN
-       IF ((SELECT temporal_type FROM SYS.TABLES WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_memoryoptimizedtable>', 'U')) = 2)
+       IF ((SELECT temporal_type FROM sys.tables WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<table_name, sysname, sample_memoryoptimizedtable>', 'U')) = 2)
        BEGIN
             ALTER TABLE [<schema_name, sysname, dbo>].[<table_name, sysname, sample_memoryoptimizedtable>] SET (SYSTEM_VERSIONING = OFF)
        END
diff --git a/samples/features/ssms-templates/Sql/Table/Create System-Versioned Table.sql b/samples/features/ssms-templates/Sql/Table/Create System-Versioned Table.sql
index 420f0300..58231ac6 100644
--- a/samples/features/ssms-templates/Sql/Table/Create System-Versioned Table.sql	
+++ b/samples/features/ssms-templates/Sql/Table/Create System-Versioned Table.sql	
@@ -16,7 +16,7 @@ GO
 
 BEGIN
     --If table is system-versioned, SYSTEM_VERSIONING must be set to OFF first 
-    IF ((SELECT temporal_type FROM SYS.TABLES WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<temporal_table_name, sysname, sample_table>', 'U')) = 2)
+    IF ((SELECT temporal_type FROM sys.tables WHERE object_id = OBJECT_ID('<schema_name, sysname, dbo>.<temporal_table_name, sysname, sample_table>', 'U')) = 2)
     BEGIN
         ALTER TABLE [<schema_name, sysname, dbo>].[<temporal_table_name, sysname, sample_table>] SET (SYSTEM_VERSIONING = OFF)
     END
diff --git a/samples/features/ssms-templates/Sql/Table/drop constraint.sql b/samples/features/ssms-templates/Sql/Table/drop constraint.sql
index 893d85fa..15c30a7b 100644
--- a/samples/features/ssms-templates/Sql/Table/drop constraint.sql	
+++ b/samples/features/ssms-templates/Sql/Table/drop constraint.sql	
@@ -3,6 +3,11 @@
 --
 -- This template creates a table with a CHECK CONSTRAINT,  
 -- then it removes the CHECK CONSTRAINT from the table
+
+-- Note: The DROP syntax can also be used to drop
+-- Edge Constraint object types. To achieve this replace
+-- the constraint_name attribute with the name of the
+-- respective Edge Constraint object
 -- ========================================================
 USE <database, sysname, AdventureWorks>
 GO