Merge pull request #258 from DataObjects-NET/warnings-resolve

All compile-time warnings resolved

Author: alex-kulakov

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v4_0/Extractor.Queries.cs

@@ -0,0 +1,75 @@
+// Copyright (C) 2021 Xtensive LLC.
+// This code is distributed under MIT license terms.
+// See the License.txt file in the project root for more information.
+
+namespace Xtensive.Sql.Drivers.Firebird.v4_0
+{
+  internal partial class Extractor
+  {
+    protected override string GetExtractTableColumnsQuery()
+    {
+      return @"
+select   schema
+        ,table_name
+        ,ordinal_position
+        ,column_name
+        ,field_type
+        ,column_subtype
+        ,column_size
+        ,numeric_precision
+        ,-numeric_scale as numeric_scale
+        ,character_max_length
+        ,(1 - coalesce(column_nullable,0)) as column_nullable
+        ,column_default
+        ,relation_type
+from     (select   cast(null as varchar(30)) as schema
+                  ,trim(rfr.rdb$relation_name) as table_name
+                  ,trim(rfr.rdb$field_name) as column_name
+                  ,fld.rdb$field_sub_type as column_subtype
+                  ,cast(fld.rdb$field_length as integer) as column_size
+                  ,cast(fld.rdb$field_precision as integer) as numeric_precision
+                  ,cast(fld.rdb$field_scale as integer) as numeric_scale
+                  ,cast(fld.rdb$character_length as integer) as character_max_length
+                  ,cast(fld.rdb$field_length as integer) as character_octet_length
+                  ,rfr.rdb$field_position as ordinal_position
+                  ,trim(rfr.rdb$field_source) as domain_name
+                  ,trim(rfr.rdb$default_source) as column_default
+                  ,trim(fld.rdb$computed_source) as computed_source
+                  ,fld.rdb$dimensions as column_array
+                  ,coalesce(fld.rdb$null_flag, rfr.rdb$null_flag) as column_nullable
+                  ,0 as is_readonly
+                  ,fld.rdb$field_type as field_type
+                  ,trim(cs.rdb$character_set_name) as character_set_name
+                  ,trim(coll.rdb$collation_name) as collation_name
+                  ,trim(rfr.rdb$description) as description
+                  ,cast(rr.rdb$relation_type as integer) as relation_type
+          from     rdb$relations rr join rdb$relation_fields rfr on rfr.rdb$relation_name = rr.rdb$relation_name
+                   left join rdb$fields fld on rfr.rdb$field_source = fld.rdb$field_name
+                   left join rdb$character_sets cs
+                      on cs.rdb$character_set_id = fld.rdb$character_set_id
+                   left join rdb$collations coll
+                      on (coll.rdb$collation_id = fld.rdb$collation_id
+                      and coll.rdb$character_set_id = fld.rdb$character_set_id)
+          where    rr.rdb$relation_type in (0, 4, 5) and rr.rdb$relation_name not starts with 'RDB$' and rr.rdb$relation_name not starts with 'MON$'
+          order by table_name, ordinal_position)";
+    }
+
+    protected override string GetExtractUniqueAndPrimaryKeyConstraintsQuery()
+    {
+      return @"
+select     cast(null as varchar(30)) as schema
+          ,trim(rel.rdb$relation_name) as table_name
+          ,trim(rel.rdb$constraint_name) as constraint_name
+          ,trim(rel.rdb$constraint_type) constraint_type
+          ,trim(seg.rdb$field_name) as column_name
+          ,seg.rdb$field_position as column_position
+from       rdb$relation_constraints rel
+left join rdb$indices idx on rel.rdb$index_name = idx.rdb$index_name
+left join rdb$index_segments seg on idx.rdb$index_name = seg.rdb$index_name
+where      rel.rdb$constraint_type in ('PRIMARY KEY', 'UNIQUE')
+           and rel.rdb$relation_name not starts with 'RDB$'
+           and rel.rdb$relation_name not starts with 'MON$'
+order by   rel.rdb$relation_name, rel.rdb$constraint_name, seg.rdb$field_position";
+    }
+  }
+}

Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v4_0/Extractor.cs

@@ -701,179 +701,4 @@ public Extractor(SqlDriver driver)
     {
     }
   }
-
-  internal partial class Extractor
-  {
-    protected virtual string GetExtractSchemasQuery()
-    {
-      return @"select " + Constants.DefaultSchemaName + @"from rdb$database";
-    }
-
-    protected virtual string GetExtractTablesQuery()
-    {
-      return @"
-select cast(null as varchar(30)) as schema
-      ,trim(rdb$relation_name) as table_name
-      ,rdb$relation_type as table_type
-from rdb$relations 
-where rdb$relation_type in (0, 5, 4) and rdb$relation_name not starts with 'RDB$' and rdb$relation_name not starts with 'MON$'";
-    }
-
-    protected virtual string GetExtractTableColumnsQuery()
-    {
-      return @"
-select   schema
-        ,table_name
-        ,ordinal_position
-        ,column_name
-        ,field_type
-        ,column_subtype
-        ,column_size
-        ,numeric_precision
-        ,-numeric_scale as numeric_scale
-        ,character_max_length
-        ,(1 - coalesce(column_nullable,0)) as column_nullable
-        ,column_default
-        ,relation_type
-from     (select   cast(null as varchar(30)) as schema
-                  ,trim(rfr.rdb$relation_name) as table_name
-                  ,trim(rfr.rdb$field_name) as column_name
-                  ,fld.rdb$field_sub_type as column_subtype
-                  ,cast(fld.rdb$field_length as integer) as column_size
-                  ,cast(fld.rdb$field_precision as integer) as numeric_precision
-                  ,cast(fld.rdb$field_scale as integer) as numeric_scale
-                  ,cast(fld.rdb$character_length as integer) as character_max_length
-                  ,cast(fld.rdb$field_length as integer) as character_octet_length
-                  ,rfr.rdb$field_position as ordinal_position
-                  ,trim(rfr.rdb$field_source) as domain_name
-                  ,trim(rfr.rdb$default_source) as column_default
-                  ,trim(fld.rdb$computed_source) as computed_source
-                  ,fld.rdb$dimensions as column_array
-                  ,coalesce(fld.rdb$null_flag, rfr.rdb$null_flag) as column_nullable
-                  ,0 as is_readonly
-                  ,fld.rdb$field_type as field_type
-                  ,trim(cs.rdb$character_set_name) as character_set_name
-                  ,trim(coll.rdb$collation_name) as collation_name
-                  ,trim(rfr.rdb$description) as description
-                  ,cast(rr.rdb$relation_type as integer) as relation_type
-          from     rdb$relations rr join rdb$relation_fields rfr on rfr.rdb$relation_name = rr.rdb$relation_name
-                   left join rdb$fields fld on rfr.rdb$field_source = fld.rdb$field_name
-                   left join rdb$character_sets cs
-                      on cs.rdb$character_set_id = fld.rdb$character_set_id
-                   left join rdb$collations coll
-                      on (coll.rdb$collation_id = fld.rdb$collation_id
-                      and coll.rdb$character_set_id = fld.rdb$character_set_id)
-          where    rr.rdb$relation_type in (0, 4, 5) and rr.rdb$relation_name not starts with 'RDB$' and rr.rdb$relation_name not starts with 'MON$'
-          order by table_name, ordinal_position)";
-    }
-
-    protected virtual string GetExtractViewsQuery()
-    {
-      return @"
-select cast(null as varchar(30)) as schema
-      ,trim(rdb$relation_name) as table_name
-      ,rdb$view_source as view_source
-from rdb$relations
-where rdb$relation_type = 1";
-    }
-
-    protected virtual string GetExtractViewColumnsQuery()
-    {
-      return @"
-select     cast(null as varchar(30)) as schema
-          ,trim(rfr.rdb$relation_name) as table_name
-          ,trim(rfr.rdb$field_name) as column_name
-          ,rfr.rdb$field_position as ordinal_position
-from       rdb$relations rr join rdb$relation_fields rfr on rfr.rdb$relation_name = rr.rdb$relation_name
-where      rr.rdb$relation_type = 1
-order by   rfr.rdb$relation_name, rfr.rdb$field_position";
-    }
-
-    protected virtual string GetExtractIndexesQuery()
-    {
-      return @"
-select     cast(null as varchar(30)) as schema
-          ,trim(ri.rdb$relation_name) as table_name
-          ,trim(ri.rdb$index_name) as index_name
-          ,ri.rdb$index_id as index_seq
-          ,ri.rdb$index_type as descend
-          ,ri.rdb$unique_flag as unique_flag
-          ,trim(ris.rdb$field_name) as column_name
-          ,ris.rdb$field_position as column_position
-          ,ri.rdb$expression_source as expression_source
-from       rdb$indices ri left join rdb$index_segments ris on ris.rdb$index_name = ri.rdb$index_name
-where      ri.rdb$system_flag = 0
-       and not exists
-              (select   1
-               from     rdb$relation_constraints rc
-               where    rc.rdb$constraint_type in ('PRIMARY KEY', 'FOREIGN KEY')
-                    and rc.rdb$relation_name = ri.rdb$relation_name
-                    and rc.rdb$index_name = ri.rdb$index_name)
-order by   ri.rdb$relation_name, ri.rdb$index_id, ris.rdb$field_position";
-    }
-
-    protected virtual string GetExtractForeignKeysQuery()
-    {
-      return @"
-select     cast(null as varchar(30)) as schema
-          ,trim(co.rdb$relation_name) as table_name
-          ,trim(co.rdb$constraint_name) as constraint_name
-          ,trim(co.rdb$deferrable) as is_deferrable
-          ,trim(co.rdb$initially_deferred) as deferred
-          ,trim(ref.rdb$delete_rule) as delete_rule
-          ,trim(coidxseg.rdb$field_name) as column_name
-          ,coidxseg.rdb$field_position as column_position
-          ,cast(null as varchar(30)) as referenced_schema
-          ,trim(refidx.rdb$relation_name) as referenced_table_name
-          ,trim(refidxseg.rdb$field_name) as referenced_column_name
-          ,trim(ref.rdb$match_option) as match_option
-          ,trim(ref.rdb$update_rule) as update_rule
-from       rdb$relation_constraints co join rdb$ref_constraints ref on co.rdb$constraint_name = ref.rdb$constraint_name
-           join rdb$indices tempidx
-              on co.rdb$index_name = tempidx.rdb$index_name
-           join rdb$index_segments coidxseg
-              on co.rdb$index_name = coidxseg.rdb$index_name
-           join rdb$relation_constraints unqc
-              on ref.rdb$const_name_uq = unqc.rdb$constraint_name and unqc.rdb$constraint_type in ('UNIQUE', 'PRIMARY KEY')
-           join rdb$indices refidx
-              on refidx.rdb$index_name = unqc.rdb$index_name and refidx.rdb$relation_name not starts with 'RDB$'
-           join rdb$index_segments refidxseg
-              on refidx.rdb$index_name = refidxseg.rdb$index_name
-             and coidxseg.rdb$field_position = refidxseg.rdb$field_position
-where      co.rdb$constraint_type = 'FOREIGN KEY'
-order by   co.rdb$relation_name, co.rdb$constraint_name, coidxseg.rdb$field_position";
-    }
-
-    protected override string GetExtractUniqueAndPrimaryKeyConstraintsQuery()
-    {
-      return @"
-select     cast(null as varchar(30)) as schema
-          ,trim(rel.rdb$relation_name) as table_name
-          ,trim(rel.rdb$constraint_name) as constraint_name
-          ,trim(rel.rdb$constraint_type) constraint_type
-          ,trim(seg.rdb$field_name) as column_name
-          ,seg.rdb$field_position as column_position
-from       rdb$relation_constraints rel
-left join rdb$indices idx on rel.rdb$index_name = idx.rdb$index_name
-left join rdb$index_segments seg on idx.rdb$index_name = seg.rdb$index_name
-where      rel.rdb$constraint_type in ('PRIMARY KEY', 'UNIQUE')
-           and rel.rdb$relation_name not starts with 'RDB$'
-           and rel.rdb$relation_name not starts with 'MON$'
-order by   rel.rdb$relation_name, rel.rdb$constraint_name, seg.rdb$field_position";
-    }
-
-    protected virtual string GetExtractCheckConstraintsQuery()
-    {
-      return @"
-select     cast(null as varchar(30)) as schema
-          ,trim(chktb.rdb$relation_name) as table_name
-          ,trim(chktb.rdb$constraint_name) as constraint_name
-          ,trim(trig.rdb$trigger_source) as check_clausule
-from       rdb$relation_constraints chktb inner join rdb$check_constraints chk
-              on (chktb.rdb$constraint_name = chk.rdb$constraint_name and chktb.rdb$constraint_type = 'CHECK')
-           inner join rdb$triggers trig
-              on chk.rdb$trigger_name = trig.rdb$trigger_name and trig.rdb$trigger_type = 1
-order by   chktb.rdb$relation_name, chktb.rdb$constraint_name";
-    }
-  }
 }