Merge branch 'sequelize:v6' into v6

sequelize · Nov 27, 2023 · 3d01469 · 3d01469
2 parents 4228c62 + 47cba67
commit 3d01469
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/dialects/mssql/query-generator.js b/src/dialects/mssql/query-generator.js
@@ -192,7 +192,7 @@ class MSSQLQueryGenerator extends AbstractQueryGenerator {
       "c.IS_NULLABLE as 'IsNull',",
       "COLUMN_DEFAULT AS 'Default',",
       "pk.CONSTRAINT_TYPE AS 'Constraint',",
-      "COLUMNPROPERTY(OBJECT_ID(c.TABLE_SCHEMA+'.'+c.TABLE_NAME), c.COLUMN_NAME, 'IsIdentity') as 'IsIdentity',",
+      "COLUMNPROPERTY(OBJECT_ID('[' + c.TABLE_SCHEMA + '].[' + c.TABLE_NAME + ']'), c.COLUMN_NAME, 'IsIdentity') as 'IsIdentity',",
       "CAST(prop.value AS NVARCHAR) AS 'Comment'",
       'FROM',
       'INFORMATION_SCHEMA.TABLES t',
@@ -209,7 +209,7 @@ class MSSQLQueryGenerator extends AbstractQueryGenerator {
       'AND pk.table_name=c.table_name ',
       'AND pk.column_name=c.column_name ',
       'INNER JOIN sys.columns AS sc',
-      "ON sc.object_id = object_id(t.table_schema + '.' + t.table_name) AND sc.name = c.column_name",
+      "ON sc.object_id = OBJECT_ID('[' + t.TABLE_SCHEMA + '].[' + t.TABLE_NAME + ']') AND sc.name = c.column_name",
       'LEFT JOIN sys.extended_properties prop ON prop.major_id = sc.object_id',
       'AND prop.minor_id = sc.column_id',
       "AND prop.name = 'MS_Description'",

diff --git a/test/integration/query-interface/describeTable.test.js b/test/integration/query-interface/describeTable.test.js
@@ -174,5 +174,16 @@ describe(Support.getTestDialectTeaser('QueryInterface'), () => {
       expect(metalumni.ctrycod.primaryKey).to.eql(false);
       expect(metalumni.city.primaryKey).to.eql(false);
     });
+
+    it('should correctly return the columns when the table contains a dot in the name', async function() {
+      const User = this.sequelize.define('my.user', {
+        name: DataTypes.STRING
+      }, { freezeTableName: true });
+
+      await User.sync({ force: true });
+      const metadata = await this.queryInterface.describeTable('my.user');
+
+      expect(metadata).to.haveOwnProperty('name');
+    });
   });
 });