Merge pull request #27 from Zocdoc/mvs-schemazen-create-tables

Mvs schemazen create tables
Zocdoc · Dec 13, 2016 · 5780cec · 5780cec
2 parents fe679c1 + 61bda32
commit 5780cec
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 42 deletions.
diff --git a/console/Create.cs b/console/Create.cs
@@ -29,7 +29,8 @@ public override int Run(string[] remainingArguments) {
             };
 
 		    try {
-		        createCommand.Execute(DatabaseFilesPath);
+                createCommand.CreateDatabase(DatabaseFilesPath);
+                createCommand.CreateTables(DatabaseFilesPath);
 		    } catch (BatchSqlFileException ex) {
 		        _logger.Log(TraceLevel.Info, Environment.NewLine + "Create completed with the following errors:");
 		        foreach (var e in ex.Exceptions) {

diff --git a/model/Command/CreateCommand.cs b/model/Command/CreateCommand.cs
@@ -5,7 +5,7 @@
 namespace SchemaZen.Library.Command {
     public class CreateCommand : BaseCommand {
 
-        public void Execute(string databaseFilesPath)
+        public void CreateDatabase(string databaseFilesPath)
         {
             var db = CreateDatabase();
             if (!Directory.Exists(db.Dir))
@@ -20,8 +20,18 @@ public void Execute(string databaseFilesPath)
                 throw new InvalidOperationException(msg);
             }
 
-            db.CreateFromDir(Overwrite, databaseFilesPath, Logger.Log);
-            Logger.Log(TraceLevel.Info, Environment.NewLine + "Database created successfully.");
+            db.CreateDBFromDir(databaseFilesPath, Logger.Log);
+        }
+
+        public void CreateTables(string databaseFilesPath)
+        {
+            var db = CreateDatabase();
+            if (!Directory.Exists(db.Dir))
+            {
+                throw new FileNotFoundException(string.Format("Snapshot dir {0} does not exist.", db.Dir));
+            }
+
+            db.CreateDbObjectsFromDir(databaseFilesPath, Logger.Log);
         }
     }
 }
diff --git a/model/Models/Database.cs b/model/Models/Database.cs
@@ -1420,43 +1420,11 @@ public void ImportData(Action<TraceLevel, string> log = null) {
 			log(TraceLevel.Info, string.Format("Data imported successfully for {0}", DatabaseName));
 		}
 
-		public void CreateFromDir(bool overwrite, string databaseFilesPath = null, Action<TraceLevel, string> log = null) {
+		public void CreateDbObjectsFromDir(string databaseFilesPath = null, Action<TraceLevel, string> log = null) {
 			if (log == null) log = (tl, s) => { };
 
-			if (DBHelper.DbExists(Connection)) {
-				log(TraceLevel.Verbose, string.Format("Dropping existing database for {0}", DatabaseName));
-				DBHelper.DropDb(Connection);
-				log(TraceLevel.Verbose, string.Format("Existing database dropped for {0}", DatabaseName));
-			}
-
-			log(TraceLevel.Info, string.Format("Creating database {0}", DatabaseName));
-			//create database
-			DBHelper.CreateDb(Connection, databaseFilesPath);
-
-			//run scripts
-			if (File.Exists(Dir + "/props.sql")) {
-				log(TraceLevel.Verbose, string.Format("Setting database properties {0}", DatabaseName));
-				try {
-					DBHelper.ExecBatchSql(Connection, File.ReadAllText(Dir + "/props.sql"));
-				} catch (SqlBatchException ex) {
-					throw new SqlFileException(Dir + "/props.sql", ex);
-				}
-
-				// COLLATE can cause connection to be reset
-				// so clear the pool so we get a new connection
-				DBHelper.ClearPool(Connection);
-			}
-
-			if (File.Exists(Dir + "/schemas.sql")) {
-				log(TraceLevel.Verbose, string.Format("Creating database schemas for {0}", DatabaseName));
-				try {
-					DBHelper.ExecBatchSql(Connection, File.ReadAllText(Dir + "/schemas.sql"));
-				} catch (SqlBatchException ex) {
-					throw new SqlFileException(Dir + "/schemas.sql", ex);
-				}
-			}
 
-			log(TraceLevel.Info, string.Format("Creating database objects for {0}", DatabaseName));
+			log(TraceLevel.Info, "Creating database objects...");
 			// create db objects
 
 			// resolve dependencies by trying over and over
@@ -1518,9 +1486,50 @@ public void CreateFromDir(bool overwrite, string databaseFilesPath = null, Actio
 				ex.Exceptions = errors;
 				throw ex;
 			}
-		}
 
-		private List<string> GetScripts() {
+            log(TraceLevel.Info, Environment.NewLine + "Database objects created successfully.");
+        }
+
+        public void CreateDBFromDir(string databaseFilesPath, Action<TraceLevel, string> log) {
+            if (log == null) log = (tl, s) => { };
+
+            if (DBHelper.DbExists(Connection)) {
+                log(TraceLevel.Verbose, string.Format("Dropping existing database for {0}", DatabaseName));
+                DBHelper.DropDb(Connection);
+                log(TraceLevel.Verbose, string.Format("Existing database dropped for {0}", DatabaseName));
+            }
+
+            log(TraceLevel.Info, string.Format("Creating database {0}", DatabaseName));
+            //create database
+            DBHelper.CreateDb(Connection, databaseFilesPath);
+
+	        //run scripts
+	        if (File.Exists(Dir + "/props.sql")) {
+                log(TraceLevel.Verbose, string.Format("Setting database properties {0}", DatabaseName));
+                try {
+	                DBHelper.ExecBatchSql(Connection, File.ReadAllText(Dir + "/props.sql"));
+	            } catch (SqlBatchException ex) {
+	                throw new SqlFileException(Dir + "/props.sql", ex);
+	            }
+
+	            // COLLATE can cause connection to be reset
+	            // so clear the pool so we get a new connection
+	            DBHelper.ClearPool(Connection);
+	        }
+
+	        if (File.Exists(Dir + "/schemas.sql")) {
+                log(TraceLevel.Verbose, string.Format("Creating database schemas for {0}", DatabaseName));
+                try {
+	                DBHelper.ExecBatchSql(Connection, File.ReadAllText(Dir + "/schemas.sql"));
+	            } catch (SqlBatchException ex) {
+	                throw new SqlFileException(Dir + "/schemas.sql", ex);
+	            }
+	        }
+
+            log(TraceLevel.Info, Environment.NewLine + string.Format("Database {0} created successfully.", DatabaseName));
+        }
+
+        private List<string> GetScripts() {
 			var scripts = new List<string>();
 			foreach (
 				var dirPath in _dirs.Where(dir => dir != "foreign_keys").Select(dir => Dir + "/" + dir).Where(Directory.Exists)) {

diff --git a/model/Schemazen.Library.nuspec b/model/Schemazen.Library.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Schemazen.Library</id>
-    <version>1.0.66</version>
+    <version>1.0.69</version>
     <title>Schemazen.Library</title>
     <authors>sethreno</authors>
     <owners>sethreno</owners>

diff --git a/test/DatabaseTester.cs b/test/DatabaseTester.cs
@@ -676,7 +676,7 @@ public void TestScriptToDir() {
 			var copy = new Database("ScriptToDirTestCopy");
 			copy.Dir = db.Dir;
 			copy.Connection = ConfigHelper.TestDB.Replace("database=TESTDB", "database=" + copy.Name);
-			copy.CreateFromDir(true);
+			copy.CreateDbObjectsFromDir();
 			copy.Load();
 			TestCompare(db, copy);
 		}