Fixing more issues

cakephp · Jan 14, 2014 · 4e2367c · 4e2367c
1 parent ecf1c35
commit 4e2367c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Cake/Database/Schema/SqlserverSchema.php b/Cake/Database/Schema/SqlserverSchema.php
@@ -254,6 +254,15 @@ public function convertForeignKeyDescription(Table $table, $row) {
 		$table->addConstraint($name, $data);
 	}
 
+/**
+ * {@inheritdoc}
+ *
+ */
+	protected function _foreignOnClause($on) {
+		$parent = parent::_foreignOnClause($on);
+		return $parent === Table::ACTION_RESTRICT ? Table::ACTION_SET_NULL : $parent;
+	}
+
 /**
  * {@inheritdoc}
  *

diff --git a/Cake/Test/TestCase/Database/Schema/SqlserverSchemaTest.php b/Cake/Test/TestCase/Database/Schema/SqlserverSchemaTest.php
@@ -571,7 +571,7 @@ public function testCreateSql() {
 
 		$expected = <<<SQL
 CREATE TABLE [schema_articles] (
-[id] SERIAL,
+[id] INTEGER NOT NULL,
 [title] VARCHAR NOT NULL,
 [body] TEXT,
 [created] DATETIME,