Merge pull request #444 from Jehoel/temporal-tables-and-generated-cols

Temporal tables and generated cols (synonym bugfixes)

Author: sjh37

EntityFramework.Reverse.POCO.Generator/EF.Reverse.POCO.Core.ttinclude

@@ -1745,9 +1745,8 @@ CREATE NONCLUSTERED INDEX IX_EfPoco_Columns
         is_identity,is_rowguidcol,is_computed,generated_always_type
     );
 
---SELECT * FROM #Columns;
-
 -----------
+
 SELECT
     u.TABLE_SCHEMA,
     u.TABLE_NAME,
@@ -1850,11 +1849,6 @@ FROM
         FROM
             sys.tables AS st
     ) AS tt ON c.table_object_id = tt.object_id
-
-ORDER BY
-    c.TABLE_SCHEMA,
-    c.TABLE_NAME,
-    c.ORDINAL_POSITION;
 ";
 
         private const string SynonymTableSQLSetup = @"
@@ -1868,6 +1862,7 @@ SELECT TOP (0)
     sc.name AS SchemaName,
     sn.name AS TableName,
     'SN' AS TableType,
+    CONVERT( tinyint, 0 ) AS TableTemporalType,
     COLUMNPROPERTY(c.object_id, c.name, 'ordinal') AS Ordinal,
     c.name AS ColumnName,
     c.is_nullable AS IsNullable,
@@ -1877,7 +1872,10 @@ SELECT TOP (0)
     ISNULL(CONVERT(NVARCHAR(4000), OBJECT_DEFINITION(c.default_object_id)), '') AS [Default],
     CAST(ISNULL(CONVERT(SMALLINT, CASE WHEN c.system_type_id IN (40, 41, 42, 43, 58, 61) THEN ODBCSCALE(c.system_type_id, c.scale) END), 0) AS INT) AS DateTimePrecision,
     ISNULL(CONVERT(INT, CASE WHEN c.system_type_id IN (40, 41, 42, 43, 58, 61) THEN NULL ELSE ODBCSCALE(c.system_type_id, c.scale) END), 0) AS Scale,
-    CAST(COLUMNPROPERTY(OBJECT_ID(sn.base_object_name), c.NAME, 'IsIdentity') AS BIT) AS IsIdentity,
+    c.is_identity AS IsIdentity,
+    c.is_rowguidcol AS IsRowGuid,
+    c.is_computed AS IsComputed,
+    CONVERT( tinyint, [c].[generated_always_type] ) AS GeneratedAlwaysType,
     CAST(CASE
         WHEN COLUMNPROPERTY(OBJECT_ID(QUOTENAME(sc.NAME) + '.' + QUOTENAME(o.NAME)), c.NAME, 'IsIdentity') = 1 THEN 1
         WHEN COLUMNPROPERTY(OBJECT_ID(QUOTENAME(sc.NAME) + '.' + QUOTENAME(o.NAME)), c.NAME, 'IsComputed') = 1 THEN 1
@@ -1959,8 +1957,8 @@ SELECT
                 c.is_rowguidcol = 1 OR
                 c.is_computed = 1 OR
                 [c].[generated_always_type] <> 0 OR
-                c.DATA_TYPE IN ( 'rowversion', 'timestamp' ) OR
-                ( c.DATA_TYPE = 'uniqueidentifier' AND c.COLUMN_DEFAULT LIKE '%newsequentialid%' )
+                t.name IN ( ''rowversion'', ''timestamp'' ) OR
+                ( t.name = ''uniqueidentifier'' AND sd.definition LIKE ''%newsequentialid%'' )
                 THEN 1
             ELSE 0
         END
@@ -1975,6 +1973,8 @@ FROM
     INNER JOIN sys.columns c ON c.[object_id] = st.base_object_id
 
     LEFT JOIN sys.types t ON c.user_type_id = t.user_type_id
+
+    LEFT OUTER JOIN sys.default_constraints sd ON c.default_object_id = sd.object_id
 
     INNER JOIN sys.objects o ON c.[object_id] = o.[object_id]
 
@@ -2049,13 +2049,13 @@ WHERE
 -- Loop through synonyms and populate #SynonymDetails
 DECLARE @synonmymDatabaseName sysname = (SELECT TOP (1) DatabaseName FROM #SynonymTargets)
 DECLARE @synonmymDetailsSelect nvarchar(max)
-WHILE (@synonmymDatabaseName IS NOT NULL)
+WHILE ( @synonmymDatabaseName IS NOT NULL)
 BEGIN
-SET @synonmymDetailsSelect = REPLACE(@synonymDetailsQueryTemplate, '[@synonmymDatabaseName]', '[' + @synonmymDatabaseName + ']')
---SELECT @synonmymDetailsSelect
-EXEC sp_executesql @stmt=@synonmymDetailsSelect, @params=N'@synonmymDatabaseName sysname', @synonmymDatabaseName=@synonmymDatabaseName
-DELETE FROM #SynonymTargets WHERE DatabaseName = @synonmymDatabaseName
-SET @synonmymDatabaseName = (SELECT TOP (1) DatabaseName FROM #SynonymTargets)
+    SET @synonmymDetailsSelect = REPLACE(@synonymDetailsQueryTemplate, '[@synonmymDatabaseName]', '[' + @synonmymDatabaseName + ']')
+    --SELECT @synonmymDetailsSelect
+    EXEC sp_executesql @stmt=@synonmymDetailsSelect, @params=N'@synonmymDatabaseName sysname', @synonmymDatabaseName=@synonmymDatabaseName
+    DELETE FROM #SynonymTargets WHERE DatabaseName = @synonmymDatabaseName
+    SET @synonmymDatabaseName = (SELECT TOP (1) DatabaseName FROM #SynonymTargets)
 END
 SET NOCOUNT OFF;
 ";
@@ -2668,30 +2668,45 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
             return _sqlDatabaseEngineEdition == "Azure";
         }
 
-        public override Tables ReadSchema()
+        private String GetReadSchemaSql()
         {
-            var result = new Tables();
-            if(Cmd == null)
-                return result;
-
-            if(Settings.IncludeSynonyms)
-                Cmd.CommandText = SynonymTableSQLSetup + TableSQL + SynonymTableSQL + IncludeQueryTraceOn9481();
-            else
-                Cmd.CommandText = TableSQL + IncludeQueryTraceOn9481();
-
-            if (Settings.IsSqlCe)
-                Cmd.CommandText = TableSQLCE;
+            if( Settings.IsSqlCe )
+            {
+                return TableSQLCE;
+            }
+            
+            String sql;
+            if( Settings.IncludeSynonyms )
+            {
+                sql = SynonymTableSQLSetup + TableSQL + SynonymTableSQL + IncludeQueryTraceOn9481();
+            }
             else
-                Cmd.CommandTimeout = Settings.CommandTimeout;
+            {
+                sql = TableSQL + IncludeQueryTraceOn9481();
+            }
 
             if (!Settings.TemporalTableSupport)
             {
-                Cmd.CommandText = Cmd.CommandText
+                // Replace the column names (only present in SQL Server 2016 or later) with literal constants so the query works with older versions of SQL Server.
+                sql = sql
                     .Replace("[sc].[generated_always_type]", "0" )
                     .Replace("[c].[generated_always_type]", "0" )
                     .Replace("[st].[temporal_type]", "0" );
             }
 
+            return sql;
+        }
+
+        public override Tables ReadSchema()
+        {
+            var result = new Tables();
+            if (Cmd == null)
+                return result;
+
+            Cmd.CommandText = this.GetReadSchemaSql();
+
+            if (!Settings.IsSqlCe) Cmd.CommandTimeout = Settings.CommandTimeout;
+
             using(var rdr = Cmd.ExecuteReader())
             {
                 var rxClean = new Regex("^(event|Equals|GetHashCode|GetType|ToString|repo|Save|IsNew|Insert|Update|Delete|Exists|SingleOrDefault|Single|First|FirstOrDefault|Fetch|Page|Query)$");
@@ -2713,12 +2728,15 @@ SELECT  SERVERPROPERTY('Edition') AS Edition,
                         table = result.Find(x => x.Name == tableName && x.Schema == schema);
                         if(table == null)
                         {
+                            String tableType = ((String)rdr["TableType"]).Trim();
+                            TableTemporalType tableTemporalType = (TableTemporalType)(Byte)rdr["TableTemporalType"];
+
                             table = new Table
                             {
                                 Name = tableName,
                                 Schema = schema,
-                                IsView = string.Compare(rdr["TableType"].ToString().Trim(), "View", StringComparison.OrdinalIgnoreCase) == 0,
-                                TemporalType = (TableTemporalType)(Byte)rdr["TableTemporalType"],
+                                IsView = string.Compare(tableType, "View", StringComparison.OrdinalIgnoreCase) == 0,
+                                TemporalType = tableTemporalType,
 
                                 // Will be set later
                                 HasForeignKey = false,