Merge pull request #431 from DataObjects-NET/7.1-filter-ms-tables

MS SQL Server: Filter out database objects created by microsoft

Author: alex-kulakov

ChangeLog/7.1.5_dev.txt

@@ -1,3 +1,4 @@
 [main] Addressed certain cases of overlaping server-side error by new one when temporary tables are used in query
 [postgresql] Improved .Milliseconds translation for types which have this part
-[postgresql] Improved TimeSpan.TotalMilliseconds translation
+[postgresql] Improved TimeSpan.TotalMilliseconds translation
+[sqlserver] Database schema objects which are "microsoft shipped", e.g. created for replication mechanisms, etc., are excluded on schema extraction

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v09/Extractor.cs

@@ -72,6 +72,7 @@ public ExtractionContext(Catalog catalog, IReadOnlyCollection<string> targetSche
     }
 
     protected const string SysTablesFilterPlaceholder = "{SYSTABLE_FILTER}";
+    protected const string SysObjectFilterPlaceholder = "{SYSOBJECT_FILTER}";
     protected const string CatalogPlaceholder = "{CATALOG}";
     protected const string SchemaFilterPlaceholder = "{SCHEMA_FILTER}";
 
@@ -125,6 +126,7 @@ protected virtual void RegisterReplacements(ExtractionContext context)
     {
       context.RegisterReplacement(SchemaFilterPlaceholder, MakeSchemaFilter(context));
       context.RegisterReplacement(SysTablesFilterPlaceholder, "1 > 0");
+      context.RegisterReplacement(SysObjectFilterPlaceholder, "is_ms_shipped = 0");
     }
 
     private ExtractionContext CreateContext(string catalogName, string[] schemaNames)
@@ -303,14 +305,15 @@ private string BuildExtractTablesAndViewsQuery(ExtractionContext context)
       name,
       0 type
     FROM {CATALOG}.sys.tables
-    WHERE {SYSTABLE_FILTER}
+    WHERE {SYSTABLE_FILTER} AND {SYSOBJECT_FILTER}
     UNION 
     SELECT
       schema_id,
       object_id,
       name,
       1 type
     FROM {CATALOG}.sys.views
+    WHERE {SYSOBJECT_FILTER}
     ) AS t
   WHERE t.schema_id {SCHEMA_FILTER}
   ORDER BY t.schema_id, t.object_id";
@@ -411,13 +414,14 @@ INNER JOIN (
       object_id,
       0 as type
     FROM {CATALOG}.sys.tables
-    WHERE {SYSTABLE_FILTER}
+    WHERE {SYSTABLE_FILTER} AND {SYSOBJECT_FILTER}
     UNION
     SELECT
       schema_id,
       object_id,
       1 AS type
     FROM {CATALOG}.sys.views
+    WHERE {SYSOBJECT_FILTER}
     ) AS t ON c.object_id = t.object_id
   LEFT OUTER JOIN {CATALOG}.sys.default_constraints AS dc
     ON c.object_id = dc.parent_object_id 
@@ -501,6 +505,7 @@ WHERE seed_value IS NOT NULL
     AND increment_value IS NOT NULL
     AND {SYSTABLE_FILTER}
     AND t.schema_id {SCHEMA_FILTER}
+    AND t.{SYSOBJECT_FILTER}
   ORDER BY
     t.schema_id,
     ic.object_id";
@@ -560,13 +565,14 @@ INNER JOIN (
       object_id,
       0 AS type
     FROM {CATALOG}.sys.tables
-    WHERE {SYSTABLE_FILTER}
+    WHERE {SYSTABLE_FILTER} AND {SYSOBJECT_FILTER}
     UNION
     SELECT
       schema_id,
       object_id,
       1 AS type
     FROM {CATALOG}.sys.views
+    WHERE {SYSOBJECT_FILTER}
     ) AS t
       ON i.object_id = t.object_id
   INNER JOIN {CATALOG}.sys.index_columns ic
@@ -839,7 +845,7 @@ INNER JOIN {CATALOG}.sys.indexes AS i
     ON fic.object_id = i.object_id
       AND fi.unique_index_id = i.index_id
   WHERE {SYSTABLE_FILTER}
-    AND t.schema_id {SCHEMA_FILTER}
+    AND t.schema_id {SCHEMA_FILTER} AND t.{SYSOBJECT_FILTER}
   ORDER BY
     t.schema_id,
     fic.object_id,

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v10/Extractor.cs

@@ -36,13 +36,14 @@ INNER JOIN (
       object_id,
       0 AS type
     FROM {CATALOG}.sys.tables
-    WHERE {SYSTABLE_FILTER}
+    WHERE {SYSTABLE_FILTER} AND {SYSOBJECT_FILTER}
     UNION
     SELECT
       schema_id,
       object_id,
       1 AS type
     FROM {CATALOG}.sys.views
+    WHERE {SYSOBJECT_FILTER}
     ) AS t 
       ON i.object_id = t.object_id 
   INNER JOIN {CATALOG}.sys.index_columns ic

Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/v11/Extractor.cs

@@ -68,7 +68,7 @@ private string BuildExtractSequencesQuery(ExtractionContext context)
     is_cycling,
     current_value
   FROM {CATALOG}.sys.sequences
-  WHERE schema_id {SCHEMA_FILTER}
+  WHERE schema_id {SCHEMA_FILTER} AND {SYSOBJECT_FILTER}
   ORDER BY
     schema_id,
     object_id";