C#: DB upgrade script and stats

calumgrant · calumgrant · commit 14147a1abed6 · 2019-05-24T13:49:05.000+01:00
diff --git a/csharp/ql/src/semmlecode.csharp.dbscheme.stats b/csharp/ql/src/semmlecode.csharp.dbscheme.stats
@@ -392,7 +392,7 @@
 <v>4841</v>
 </e>
 <e>
-<k>@case</k>
+<k>@case_stmt</k>
 <v>52011</v>
 </e>
 <e>
diff --git a/csharp/upgrades/57331d90231fc8247d5a5197f4ac45d502708c6a/semmlecode.csharp.dbscheme b/csharp/upgrades/57331d90231fc8247d5a5197f4ac45d502708c6a/semmlecode.csharp.dbscheme
@@ -542,7 +542,7 @@ compiler_generated(unique int id: @modifiable_direct ref);
 
 @member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
 
-@named_exprorstmt = @goto_stmt | @labeled_stmt | @literal_expr;
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
 
 @virtualizable = @method | @property | @indexer | @event;
 
@@ -806,7 +806,7 @@ case @stmt.kind of
 | 26 = @fixed_stmt
 | 27 = @label_stmt
 | 28 = @catch
-| 29 = @case
+| 29 = @case_stmt
 | 30 = @local_function_stmt
   ;
 
@@ -985,6 +985,10 @@ case @expr.kind of
 | 118 = @switch_case_expr
 ;
 
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+
 @integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
 @real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
 @literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
diff --git a/csharp/upgrades/57331d90231fc8247d5a5197f4ac45d502708c6a/upgrade.properties b/csharp/upgrades/57331d90231fc8247d5a5197f4ac45d502708c6a/upgrade.properties
@@ -1,2 +1,2 @@
-description: Add C#8 expression types
-compatibility: backwards
+description: Add C#8 expression and union types supporting ranges, recursive patterns and switch expressions.
+compatibility: backwards
