Merge pull request #207 from angelcolmenares/master

DDL : 1.Added OnFkOption.SetDefault.

Author: mythz

src/ServiceStack.OrmLite.DDLTest/Test.cs

@@ -25,7 +25,8 @@ public void TestFixtureSetup()
 				AddColumnString="ALTER TABLE Model ADD Column1 VARCHAR(128) ;",
 				AlterColumnString="ALTER TABLE Model ALTER Column2 VARCHAR(50) ;",
 				ChangeColumnNameString="ALTER TABLE Model ALTER OldColumn3 TO Column3 ;",
-				AddFKString="ALTER TABLE Child ADD CONSTRAINT JustOneFK FOREIGN KEY (IdModel) REFERENCES Model (Id) ON UPDATE NO ACTION ON DELETE CASCADE;",
+				AddFKString="ALTER TABLE Child ADD CONSTRAINT JustOneFK FOREIGN KEY (IdModel) REFERENCES Model (Id) ON DELETE CASCADE ON UPDATE NO ACTION;",
+				AddFKRestrictString="ALTER TABLE Child ADD CONSTRAINT JustOneMoreFK FOREIGN KEY (IdModel) REFERENCES Model (Id) ON UPDATE NO ACTION;",
 				CreateIndexString="CREATE UNIQUE INDEX JustIndexOnColumn3 ON Model(Column3);"
 
 			});
@@ -34,7 +35,8 @@ public void TestFixtureSetup()
 				AddColumnString="ALTER TABLE `Model` ADD COLUMN `Column1` VARCHAR(255) NULL;",
 				AlterColumnString="ALTER TABLE `Model` MODIFY COLUMN `Column2` VARCHAR(50) NULL;",
 				ChangeColumnNameString="ALTER TABLE `Model` CHANGE COLUMN `OldColumn3` `Column3` VARCHAR(255) NULL;",
-				AddFKString="ALTER TABLE `Child` ADD CONSTRAINT `JustOneFK` FOREIGN KEY (`IdModel`) REFERENCES `Model` (`Id`) ON UPDATE NO ACTION ON DELETE CASCADE;",
+				AddFKString="ALTER TABLE `Child` ADD CONSTRAINT `JustOneFK` FOREIGN KEY (`IdModel`) REFERENCES `Model` (`Id`) ON DELETE CASCADE ON UPDATE NO ACTION;",
+				AddFKRestrictString="ALTER TABLE `Child` ADD CONSTRAINT `JustOneMoreFK` FOREIGN KEY (`IdModel`) REFERENCES `Model` (`Id`) ON DELETE RESTRICT ON UPDATE NO ACTION;",
 				CreateIndexString="CREATE UNIQUE INDEX `JustIndexOnColumn3` ON `Model`(`Column3`);"
 			});
 
@@ -91,7 +93,22 @@ public void CanAddForeignKey ()
 			foreach (var d in dialects) 
 			{
 				OrmLiteConfig.DialectProvider=d.Provider;		
-				Assert.AreEqual(d.AddFKString,d.Provider.ToAddForeignKeyStatement<Child,Model>(f=>f.IdModel, fk=>fk.Id,OnFkOption.NoAction,OnFkOption.Cascade, "JustOneFK"));
+				Assert.AreEqual(d.AddFKString,
+				                d.Provider.ToAddForeignKeyStatement<Child,Model>(f=>f.IdModel,
+				                                                 fk=>fk.Id,OnFkOption.NoAction,OnFkOption.Cascade, "JustOneFK"));
+			}
+		}
+
+		[Test()]
+		public void CanAddForeignKeyRestrict ()
+		{
+			
+			foreach (var d in dialects) 
+			{
+				OrmLiteConfig.DialectProvider=d.Provider;		
+				Assert.AreEqual(d.AddFKRestrictString,
+				                d.Provider.ToAddForeignKeyStatement<Child,Model>(f=>f.IdModel,
+				                                                 fk=>fk.Id,OnFkOption.NoAction,OnFkOption.Restrict, "JustOneMoreFK"));
 			}
 		}
 
@@ -140,6 +157,7 @@ public class Dialect
 		public string AlterColumnString { get; set; }
 		public string ChangeColumnNameString { get; set; }
 		public string AddFKString { get; set; }
+		public string AddFKRestrictString { get; set; }
 		public string CreateIndexString { get; set; }
 
 	}

src/ServiceStack.OrmLite/OrmLiteDDLExtensions.cs

@@ -8,6 +8,7 @@ public enum  OnFkOption{
 		Cascade,
 		SetNull,
 		NoAction,
+		SetDefault,
 		Restrict
 	}
 

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -1015,14 +1015,14 @@ public virtual string  ToAddForeignKeyStatement<T,TForeign>(Expression<Func<T,ob
 			                            "fk_"+sourceMD.ModelName+"_"+ fieldName+"_"+referenceFieldName:
 			                            foreignKeyName);
 
-			return string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}) ON UPDATE {5} ON DELETE {6};",
+			return string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}){5}{6};",
 			                     GetQuotedTableName(sourceMD.ModelName),
 			                     name,
 			                     GetQuotedColumnName(fieldName),
 			                     GetQuotedTableName(referenceMD.ModelName),
 			                     GetQuotedColumnName(referenceFieldName),
-			                     FkOptionToString(onUpdate),
-			                     FkOptionToString(onDelete));	
+			                     GetForeignKeyOnDeleteClause(new ForeignKeyConstraint(typeof(T), onDelete: FkOptionToString( onDelete))),
+			                     GetForeignKeyOnUpdateClause(new ForeignKeyConstraint(typeof(T), onUpdate: FkOptionToString(onUpdate))));	
 		}
 
 		public virtual string ToCreateIndexStatement<T>(Expression<Func<T,object>> field,
@@ -1046,12 +1046,13 @@ public virtual string ToCreateIndexStatement<T>(Expression<Func<T,object>> field
 		}
 
 
-		protected string FkOptionToString(OnFkOption option){
+		protected virtual string FkOptionToString(OnFkOption option){
 			switch(option){
 			case OnFkOption.Cascade: return "CASCADE";
 			case OnFkOption.NoAction: return "NO ACTION"; 
-			case OnFkOption.Restrict: return "RESTRICT"; 
 			case OnFkOption.SetNull: return "SET NULL"; 
+			case OnFkOption.SetDefault: return "SET DEFAULT";
+			case OnFkOption.Restrict:
 			default: return "RESTRICT";
 			}
 		}