Skip to content

Commit 2e20a6e

Browse files
committed
change regular expression to match all double and single quotes to be removed from Table and Column names
1 parent 85361c0 commit 2e20a6e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/org/ngbsn/generator/ModelGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static List<Table> parse(final String sqlScript) {
3939
//Iterating over all Tables
4040
if (statement instanceof CreateTable parsedTable) {
4141
Table table = new Table();
42-
table.setTableName(parsedTable.getTable().getName().replaceAll("^\"|\"$", ""));
42+
table.setTableName(parsedTable.getTable().getName().replaceAll("[\"']", ""));
4343
tablesMap.put(table.getTableName(), table);
4444
table.setClassName(Util.convertSnakeCaseToCamelCase(table.getTableName(), true));
4545

@@ -134,7 +134,7 @@ private static void extractColumns(CreateTable parsedTable, Set<Column> columns)
134134
columns.add(column);
135135
Set<String> columnAnnotations = new HashSet<>();
136136
column.setAnnotations(columnAnnotations);
137-
column.setColumnName(columnDefinition.getColumnName().replaceAll("^\"|\"$", ""));
137+
column.setColumnName(columnDefinition.getColumnName().replaceAll("[\"']", ""));
138138
//Adding @Column
139139
columnAnnotations.add(ColumnAnnotation.builder().columnName(column.getColumnName()).build().toString());
140140
column.setFieldName(Util.convertSnakeCaseToCamelCase(column.getColumnName(), false));

0 commit comments

Comments
 (0)