Merge pull request #36 from gibachan/fix-database-name-conflict

Fix to prevent conflicts between database and table names
Lighter-swift · Oct 22, 2024 · 28450e5 · 28450e5
2 parents cc09c1d + b4fff57
commit 28450e5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Plugins/Libraries/LighterGeneration/GenModel/SchemaInit.swift b/Plugins/Libraries/LighterGeneration/GenModel/SchemaInit.swift
@@ -11,6 +11,7 @@ public extension DatabaseInfo {
     var entities = [ EntityInfo ]()
     entities.reserveCapacity(schema.tables.count + schema.views.count)
 
+    let dbName = schema.tables.contains(where: { $0.name == name }) ? "\(name)DB" : name
     for table in schema.tables {
       let isWithoutRowID = table.isTableWithoutRowID
       let indices  = schema.indices [table.name] ?? []
@@ -56,7 +57,7 @@ public extension DatabaseInfo {
       entities.append(entity)
     }
 
-    self.init(name: name, userVersion: schema.userVersion, entities: entities)
+    self.init(name: dbName, userVersion: schema.userVersion, entities: entities)
   }
 }
 

diff --git a/Tests/EntityGenTests/ASTDatabaseStructGenerationTests.swift b/Tests/EntityGenTests/ASTDatabaseStructGenerationTests.swift
@@ -228,4 +228,11 @@ final class ASTDatabaseStructGenerationTests: XCTestCase {
     XCTAssertTrue(source.contains(
       "[ Person.self, Address.self, AFancyTestTable.self ]"))
   }
+
+  func testResolveConflictedDatabaseName() throws {
+    let name   = try XCTUnwrap(Fixtures.addressSchema.tables.first?.name)
+    let dbInfo = DatabaseInfo(name: name, schema: Fixtures.addressSchema)
+
+    XCTAssertEqual(dbInfo.name, "\(name)DB")
+  }
 }