L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-23887-33-2' of https://github.com/snake/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-01-03 00:25:42 +01:00
parent 0829f91214 7ec58e84b0
commit c2155bef19
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/mssql_sql_generator.php
+5 -5
View File
@@ -548,9 +548,9 @@ class mssql_sql_generator extends sql_generator {
$fieldname = $xmldb_field->getName();
// Look for any default constraint in this field and drop it
if ($default = $this->mdb->get_record_sql("SELECT id, object_name(cdefault) AS defaultconstraint
FROM syscolumns
WHERE id = object_id(?)
if ($default = $this->mdb->get_record_sql("SELECT object_id, object_name(default_object_id) AS defaultconstraint
FROM sys.columns
WHERE object_id = object_id(?)
AND name = ?", array($tablename, $fieldname))) {
return $default->defaultconstraint;
} else {
@@ -607,7 +607,7 @@ class mssql_sql_generator extends sql_generator {
case 'fk':
case 'ck':
if ($check = $this->mdb->get_records_sql("SELECT name
FROM sysobjects
FROM sys.objects
WHERE lower(name) = ?", array(strtolower($object_name)))) {
return true;
}
@@ -615,7 +615,7 @@ class mssql_sql_generator extends sql_generator {
case 'ix':
case 'uix':
if ($check = $this->mdb->get_records_sql("SELECT name
FROM sysindexes
FROM sys.indexes
WHERE lower(name) = ?", array(strtolower($object_name)))) {
return true;
}
lib/dml/mssql_native_moodle_database.php
+2 -2
View File
@@ -481,8 +481,8 @@ class mssql_native_moodle_database extends moodle_database {
quotename(table_name)), column_name, 'IsIdentity') AS auto_increment,
column_default AS default_value
FROM tempdb.INFORMATION_SCHEMA.COLUMNS
JOIN tempdb..sysobjects ON name = table_name
WHERE id = object_id('tempdb..{" . $table . "}')
JOIN tempdb.sys.objects ON name = table_name
WHERE object_id = object_id('tempdb..{" . $table . "}')
ORDER BY ordinal_position";
}