Merge pull request #8809 from AlexDenisov/alexdenisov/rename-swift-db-columns

Swift: rename certain dbscheme columns

swift/codegen/schema.yml

@@ -308,7 +308,7 @@ ArrowExpr:
 AssignExpr:
   _extends: Expr
   dest: Expr
-  src: Expr
+  source: Expr
 
 BindOptionalExpr:
   _extends: Expr
@@ -661,7 +661,7 @@ PrefixUnaryExpr:
 
 SelfApplyExpr:
   _extends: ApplyExpr
-  base: Expr
+  base_expr: Expr
 
 ArrayExpr:
   _extends: CollectionExpr
@@ -843,12 +843,12 @@ StmtCondition:
 
 RepeatWhileStmt:
   _extends: LabeledStmt
-  cond: Expr
+  condition: Expr
   body: Stmt
 
 SwitchStmt:
   _extends: LabeledStmt
-  subject_expr: Expr
+  expr: Expr
   cases: CaseStmt*
 
 BoundGenericClassType:

swift/ql/lib/swift.dbscheme

@@ -659,7 +659,7 @@ arrow_exprs(
 assign_exprs(
   unique int id: @assign_expr,
   int dest: @expr ref,
-  int src: @expr ref
+  int source: @expr ref
 );
 
 bind_optional_exprs(
@@ -1324,7 +1324,7 @@ prefix_unary_exprs(
 #keyset[id]
 self_apply_exprs(
   int id: @self_apply_expr ref,
-  int base: @expr ref
+  int base_expr: @expr ref
 );
 
 array_exprs(
@@ -1625,13 +1625,13 @@ stmt_condition_elements(
 
 repeat_while_stmts(
   unique int id: @repeat_while_stmt,
-  int cond: @expr ref,
+  int condition: @expr ref,
   int body: @stmt ref
 );
 
 switch_stmts(
   unique int id: @switch_stmt,
-  int subject_expr: @expr ref
+  int expr: @expr ref
 );
 
 #keyset[id, index]