From e3a1d426b87e72f60bdfd0f388d76f5a03c38375 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Tue, 27 Oct 2020 17:31:10 +0100 Subject: [PATCH] DB scheme generator: escape column names --- generator/src/main.rs | 4 ++-- ruby.dbscheme | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/src/main.rs b/generator/src/main.rs index f6e698675ec..4deb7646d7f 100644 --- a/generator/src/main.rs +++ b/generator/src/main.rs @@ -84,7 +84,7 @@ fn add_field( dbscheme::Column { unique: true, db_type: dbscheme::DbColumnType::Int, - name: field_type.clone(), + name: node_types::escape_name(&field_type), ql_type: dbscheme::QlColumnType::Custom(field_type), ql_type_is_ref: true, }, @@ -105,7 +105,7 @@ fn add_field( main_table.columns.push(dbscheme::Column { unique: false, db_type: dbscheme::DbColumnType::Int, - name: field_name, + name: node_types::escape_name(&field_name), ql_type: dbscheme::QlColumnType::Custom(field_type), ql_type_is_ref: true, }); diff --git a/ruby.dbscheme b/ruby.dbscheme index c0631bbb80b..cf392bf3624 100644 --- a/ruby.dbscheme +++ b/ruby.dbscheme @@ -680,7 +680,7 @@ optional_parameter_def( pair_def( unique int id: @pair, - int key: @pair_key_type ref, + int key__: @pair_key_type ref, int value: @underscore_arg ref, int loc: @location ref );