[5.5] Change datetime to datetime2 (#18962)

* Change datetime to datetime2 * Fix databaseschema test * Fix databaseschema sqlserver test
laravel · Apr 27, 2017 · a9cb9ef · a9cb9ef
1 parent d037ed8
commit a9cb9ef
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -468,7 +468,7 @@ protected function typeDate(Fluent $column)
      */
     protected function typeDateTime(Fluent $column)
     {
-        return "datetime($column->precision)";
+        return "datetime2($column->precision)";
     }
 
     /**
@@ -513,10 +513,10 @@ protected function typeTimeTz(Fluent $column)
     protected function typeTimestamp(Fluent $column)
     {
         if ($column->useCurrent) {
-            return "datetime($column->precision) default CURRENT_TIMESTAMP";
+            return "datetime2($column->precision) default CURRENT_TIMESTAMP";
         }
 
-        return "datetime($column->precision)";
+        return "datetime2($column->precision)";
     }
 
     /**

diff --git a/tests/Database/DatabaseSchemaBlueprintTest.php b/tests/Database/DatabaseSchemaBlueprintTest.php
@@ -73,6 +73,6 @@ public function testDefaultCurrentTimestamp()
         $this->assertEquals(['alter table "users" add column "created" datetime default CURRENT_TIMESTAMP not null'], $blueprint->toSql($connection, new SQLiteGrammar));
 
         $blueprint = clone $base;
-        $this->assertEquals(['alter table "users" add "created" datetime(0) default CURRENT_TIMESTAMP not null'], $blueprint->toSql($connection, new SqlServerGrammar));
+        $this->assertEquals(['alter table "users" add "created" datetime2(0) default CURRENT_TIMESTAMP not null'], $blueprint->toSql($connection, new SqlServerGrammar));
     }
 }
diff --git a/tests/Database/DatabaseSqlServerSchemaGrammarTest.php b/tests/Database/DatabaseSqlServerSchemaGrammarTest.php
@@ -446,7 +446,7 @@ public function testAddingDateTime()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertEquals(1, count($statements));
-        $this->assertEquals('alter table "users" add "foo" datetime(0) not null', $statements[0]);
+        $this->assertEquals('alter table "users" add "foo" datetime2(0) not null', $statements[0]);
     }
 
     public function testAddingDateTimeTz()
@@ -486,7 +486,7 @@ public function testAddingTimeStamp()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertEquals(1, count($statements));
-        $this->assertEquals('alter table "users" add "foo" datetime(0) not null', $statements[0]);
+        $this->assertEquals('alter table "users" add "foo" datetime2(0) not null', $statements[0]);
     }
 
     public function testAddingTimeStampTz()
@@ -506,7 +506,7 @@ public function testAddingTimeStamps()
         $statements = $blueprint->toSql($this->getConnection(), $this->getGrammar());
 
         $this->assertEquals(1, count($statements));
-        $this->assertEquals('alter table "users" add "created_at" datetime(0) null, "updated_at" datetime(0) null', $statements[0]);
+        $this->assertEquals('alter table "users" add "created_at" datetime2(0) null, "updated_at" datetime2(0) null', $statements[0]);
     }
 
     public function testAddingTimeStampsTz()