Started introducing support for specifying a default schema for migrations.

Author: bittercoder

src/Migrator.Console/MigratorConsole.cs

@@ -34,6 +34,7 @@ public class MigratorConsole
 		string _migrationsAssembly;
 		string _provider;
 		bool _trace;
+		string _defaultSchema;
 
 		/// <summary>
 		/// Builds a new console
@@ -118,7 +119,7 @@ public void Dump()
 		{
 			CheckArguments();
 
-			var dumper = new SchemaDumper(_provider, _connectionString);
+			var dumper = new SchemaDumper(_provider, _connectionString, _defaultSchema);
 
 			dumper.DumpTo(_dumpTo);
 		}
@@ -140,6 +141,7 @@ public void PrintUsage()
 			Console.WriteLine("\t{0} {1}", "migrationAssembly".PadRight(tab), "Path to the assembly containing the migrations");
 			Console.WriteLine("Options:");
 			Console.WriteLine("\t-{0}{1}", "version NO".PadRight(tab), "To specific version to migrate the database to");
+			Console.WriteLine("\t-{0}{1}", "defaultSchema <schema>".PadRight(tab), "To specify the default schema");
 			Console.WriteLine("\t-{0}{1}", "list".PadRight(tab), "List migrations");
 			Console.WriteLine("\t-{0}{1}", "trace".PadRight(tab), "Show debug informations");
 			Console.WriteLine("\t-{0}{1}", "dump FILE".PadRight(tab), "Dump the database schema as migration code");
@@ -161,7 +163,7 @@ Migrator GetMigrator()
 		{
 			Assembly asm = Assembly.LoadFrom(_migrationsAssembly);
 
-			var migrator = new Migrator(_provider, _connectionString, asm, _trace);
+			var migrator = new Migrator(_provider, _connectionString, _defaultSchema, asm, _trace);
 			migrator.args = args;
 			migrator.DryRun = _dryrun;
 			return migrator;
@@ -188,6 +190,10 @@ void ParseArguments(string[] argv)
 					_migrateTo = long.Parse(argv[i + 1]);
 					i++;
 				}
+				else if (argv[i].EndsWith("-defaultSchema"))
+				{
+					_defaultSchema = argv[i + 1];
+				}
 				else if (argv[i].Equals("-dump"))
 				{
 					_dumpTo = argv[i + 1];

src/Migrator.MSBuild/MigrateTask.cs

@@ -55,6 +55,8 @@ public class Migrate : Task
 		[Required]
 		public string Provider { set; get; }
 
+		public string DefaultSchema { get; set; }
+
 		[Required]
 		public string ConnectionString { set; get; }
 
@@ -124,7 +126,7 @@ public override bool Execute()
 
 		void Execute(Assembly asm)
 		{
-			var mig = new Migrator(Provider, ConnectionString, asm, Trace, new TaskLogger(this));
+			var mig = new Migrator(Provider, ConnectionString, DefaultSchema, asm, Trace, new TaskLogger(this));
 			mig.DryRun = DryRun;
 			if (ScriptChanges)
 			{

src/Migrator.NAnt/MigrateTask.cs

@@ -42,6 +42,9 @@ public class MigrateTask : Task
 		string _scriptFile;
 		long _to = -1; // To last revision
 
+		[TaskAttribute("defaultschema")]
+		public string DefaultSchema { get; set; }
+
 		[TaskAttribute("provider", Required = true)]
 		public string Provider { set; get; }
 
@@ -112,7 +115,7 @@ protected override void ExecuteTask()
 
 		void Execute(Assembly asm)
 		{
-			var mig = new Migrator(Provider, ConnectionString, asm, Trace, new TaskLogger(this));
+			var mig = new Migrator(Provider, ConnectionString, DefaultSchema, asm, Trace, new TaskLogger(this));
 			mig.DryRun = DryRun;
 			if (ScriptChanges)
 			{

src/Migrator.Providers/Dialect.cs

@@ -85,11 +85,11 @@ public virtual bool IsReservedWord(string reservedWord)
 			return isReserved;
 		}
 
-		public abstract ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString);
+		public abstract ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString, string defaultSchema);
 
-		public ITransformationProvider NewProviderForDialect(string connectionString)
+		public ITransformationProvider NewProviderForDialect(string connectionString, string defaultSchema)
 		{
-			return GetTransformationProvider(this, connectionString);
+			return GetTransformationProvider(this, connectionString, defaultSchema);
 		}
 
 		/// <summary>

src/Migrator.Providers/Impl/Mysql/MySqlTransformationProvider.cs

@@ -12,7 +12,7 @@ namespace Migrator.Providers.Mysql
 	public class MySqlTransformationProvider : TransformationProvider
 	{
 		public MySqlTransformationProvider(Dialect dialect, string connectionString)
-			: base(dialect, connectionString)
+			: base(dialect, connectionString, null) // we ignore schemas for MySql (schema == database for MySql)
 		{
 			_connection = new MySqlConnection(_connectionString);
 			_connection.ConnectionString = _connectionString;

src/Migrator.Providers/Impl/Mysql/MysqlDialect.cs

@@ -67,7 +67,7 @@ public override string QuoteTemplate
 			get { return "`{0}`"; }
 		}
 
-		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString)
+		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString, string defaultSchema)
 		{
 			return new MySqlTransformationProvider(dialect, connectionString);
 		}

src/Migrator.Providers/Impl/Oracle/OracleDialect.cs

@@ -89,9 +89,9 @@ public override bool TableNameNeedsQuote
 			get { return false; }
 		}
 
-		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString)
+		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString, string defaultSchema)
 		{
-			return new OracleTransformationProvider(dialect, connectionString);
+			return new OracleTransformationProvider(dialect, connectionString, defaultSchema);
 		}
 	}
 }

src/Migrator.Providers/Impl/Oracle/OracleTransformationProvider.cs

@@ -13,8 +13,8 @@ public class OracleTransformationProvider : TransformationProvider
 	{
 		public const string TemporaryColumnName = "TEMPCOL";
 
-		public OracleTransformationProvider(Dialect dialect, string connectionString)
-			: base(dialect, connectionString)
+		public OracleTransformationProvider(Dialect dialect, string connectionString, string defaultSchema)
+			: base(dialect, connectionString, defaultSchema)
 		{
 			_connection = new OracleConnection();
 			_connection.ConnectionString = _connectionString;

src/Migrator.Providers/Impl/PostgreSQL/PostgreSQLDialect.cs

@@ -89,9 +89,9 @@ public override bool IdentityNeedsType
 			get { return false; }
 		}
 
-		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString)
+		public override ITransformationProvider GetTransformationProvider(Dialect dialect, string connectionString, string defaultSchema)
 		{
-			return new PostgreSQLTransformationProvider(dialect, connectionString);
+			return new PostgreSQLTransformationProvider(dialect, connectionString, defaultSchema);
 		}
 	}
 }

src/Migrator.Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs

@@ -24,8 +24,8 @@ namespace Migrator.Providers.PostgreSQL
 	/// </summary>
 	public class PostgreSQLTransformationProvider : TransformationProvider
 	{
-		public PostgreSQLTransformationProvider(Dialect dialect, string connectionString)
-			: base(dialect, connectionString)
+		public PostgreSQLTransformationProvider(Dialect dialect, string connectionString, string defaultSchema)
+			: base(dialect, connectionString, defaultSchema)
 		{
 			_connection = new NpgsqlConnection();
 			_connection.ConnectionString = _connectionString;