Merge branch '3.2.x'

* 3.2.x:
  [ticket/14532] Do not escape column default in mssql
This commit is contained in:
Tristan Darricau 2016-04-03 16:03:07 +02:00
commit 3c89a69701

View file

@ -605,7 +605,7 @@ class mssql extends tools
if (!empty($column_data['default'])) if (!empty($column_data['default']))
{ {
// Add new default value constraint // Add new default value constraint
$statements[] = 'ALTER TABLE [' . $table_name . '] ADD CONSTRAINT [DF_' . $table_name . '_' . $column_name . '_1] ' . $this->db->sql_escape($column_data['default']) . ' FOR [' . $column_name . ']'; $statements[] = 'ALTER TABLE [' . $table_name . '] ADD CONSTRAINT [DF_' . $table_name . '_' . $column_name . '_1] ' . $column_data['default'] . ' FOR [' . $column_name . ']';
} }
if (!empty($indexes)) if (!empty($indexes))