Added a 'needsapp_' reserved prefix, and changed to use a list of res…

…erved prefixes instead of two consts
7digital · Oct 11, 2012 · 01e084d · 01e084d
1 parent f9d3e30
commit 01e084d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/DatabaseMigraine.Tests/DatabaseComparisonTests.cs b/src/DatabaseMigraine.Tests/DatabaseComparisonTests.cs
@@ -260,8 +260,7 @@ private IEnumerable<Database> GetListOfAdditionalDbsInRefEnv(Server referenceSer
 
 		private bool GenericDiscard<T>(T dbElement) where T : IScriptableDatabaseElementWithName
 		{
-			return dbElement.Name.ToLower().StartsWith(DbScriptFolderManager.TempPrefix) ||
-			       dbElement.Name.ToLower().StartsWith(DbScriptFolderManager.DbaPrefix)  ||
+			return DbScriptFolderManager.ReservedPrefixes.Any(reservedPrefix => dbElement.Name.ToLower().StartsWith(reservedPrefix)) ||
 			       Discard(dbElement);
 		}
 

diff --git a/src/DatabaseMigraine/DbScriptFolderManager.cs b/src/DatabaseMigraine/DbScriptFolderManager.cs
@@ -154,9 +154,7 @@ protected virtual void CheckContentViolationRules(Dictionary<string, string> ele
 			CheckNameNotMatchingElementViolation(elementNameToScriptContents);
 		}
 
-		public const string TempPrefix = "tmp";
-
-		public const string DbaPrefix = "dba_";
+		public static readonly IEnumerable<string> ReservedPrefixes = new[] { "tmp", "dba_", "needsapp_" }; 
 
 		private static string CheckScriptNameConventions(FileInfo script)
 		{
@@ -173,14 +171,13 @@ private static string CheckScriptNameConventions(FileInfo script)
 					"No script should start with the '{0}' prefix, please use DatabaseScripter to transform into Migrator structure: {1}", dboPrefix, elementName));
 			}
 
-			if (elementName.ToLower().StartsWith(TempPrefix)) {
-				throw new ArgumentException(String.Format(
-					"Elements with the prefix '{0}' are reserved for DBA use, not development: {1}", TempPrefix, elementName));
-			}
-
-			if (elementName.ToLower().StartsWith(DbaPrefix)) {
-				throw new ArgumentException(String.Format(
-					"Elements with the prefix '{0}' are reserved for DBA use, not development: {1}", DbaPrefix, elementName));
+			foreach (var reservedPrefix in ReservedPrefixes)
+			{
+				if (elementName.ToLower().StartsWith(reservedPrefix))
+				{
+					throw new ArgumentException(String.Format(
+						"Elements with the prefix '{0}' are reserved for DBA use, not development: {1}", reservedPrefix, elementName));
+				}
 			}
 
 			return elementName;