Adding some additional checks for collation name.

Azure · Dec 8, 2014 · 6b56718 · 6b56718
1 parent 6f3380c
commit 6b56718
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs
@@ -381,10 +381,12 @@ public Database CreateNewDatabase(
                 }
             }
 
+            SqlCollationCheck(databaseCollation);
+
             commandText = string.Format(
                 commandText,
                 SqlEscape(databaseName),
-                SqlEscape(databaseCollation),
+                databaseCollation,
                 SqlEscape(maxSizeVal),
                 SqlEscape(databaseEdition.ToString()),
                 SqlEscape(serviceObjectiveName));
@@ -405,6 +407,23 @@ public Database CreateNewDatabase(
             return GetDatabase(databaseName);
         }
 
+        private void SqlCollationCheck(string databaseCollation)
+        {
+            bool isValid = databaseCollation.All( (c) =>
+                {
+                    if(!char.IsLetterOrDigit(c) && c != '_')
+                    {
+                        return false;
+                    }
+                    return true;
+                });
+
+            if(!isValid)
+            {
+                throw new ArgumentException("Invalid Collation", "Collation");
+            }
+        }
+
         /// <summary>
         /// Updates the property on the database with the name <paramref name="databaseName"/>.
         /// </summary>