Cleanup code and add simple string escaping in SQL statements (#29)

pinchbv · Feb 7, 2019 · ecbca12 · ecbca12
1 parent 7854c3e
commit ecbca12
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/floor_generator/lib/writer/database_writer.dart b/floor_generator/lib/writer/database_writer.dart
@@ -144,7 +144,7 @@ class DatabaseWriter implements Writer {
 
   String _generateSql(Entity entity) {
     final columns = entity.columns.map((column) {
-      var columnString = '${column.name} ${column.type}';
+      var columnString = '`${column.name}` ${column.type}';
 
       final additionals = column.additionals;
       if (additionals != null) {
@@ -153,6 +153,6 @@ class DatabaseWriter implements Writer {
       return columnString;
     }).join(', ');
 
-    return "'CREATE TABLE IF NOT EXISTS ${entity.name} ($columns)'";
+    return "'CREATE TABLE IF NOT EXISTS `${entity.name}` ($columns)'";
   }
 }
diff --git a/floor_generator/lib/writer/delete_method_body_writer.dart b/floor_generator/lib/writer/delete_method_body_writer.dart
@@ -21,7 +21,7 @@ class DeleteMethodBodyWriter implements Writer {
     final methodHeadParameterName = method.parameter.name;
 
     return '''
-    await this.database.rawDelete('DELETE FROM ${entity.name} WHERE ${primaryKeyColumn.name} = \${$methodHeadParameterName.${primaryKeyColumn.field.displayName}}');
+    await database.rawDelete('DELETE FROM `${entity.name}` WHERE `${primaryKeyColumn.name}` = \${$methodHeadParameterName.${primaryKeyColumn.field.displayName}}');
     ''';
   }
 }
diff --git a/floor_generator/lib/writer/insert_method_body_writer.dart b/floor_generator/lib/writer/insert_method_body_writer.dart
@@ -36,7 +36,7 @@ class InsertMethodBodyWriter implements Writer {
     final values = <String, dynamic>{
       $keyValueList
     };
-    await this.database.insert('${entity.name}', values);
+    await database.insert('${entity.name}', values);
     ''';
   }
 

diff --git a/floor_generator/lib/writer/query_method_writer.dart b/floor_generator/lib/writer/query_method_writer.dart
@@ -86,7 +86,7 @@ class QueryMethodWriter implements Writer {
     final mapping = _generateMapping();
 
     return '''
-    final rows = await this.database.rawQuery('${queryMethod.query}');
+    final rows = await database.rawQuery('${queryMethod.query}');
     if (rows.isEmpty) {
       return null;
     }

diff --git a/floor_generator/lib/writer/update_method_body_writer.dart b/floor_generator/lib/writer/update_method_body_writer.dart
@@ -36,7 +36,7 @@ class UpdateMethodBodyWriter implements Writer {
     final values = <String, dynamic>{
       $keyValueList
     };
-    await this.database.update('${entity.name}', values);
+    await database.update('${entity.name}', values);
     ''';
   }