Fixed issues caused by merge conflicts.

evolution-gaming · Feb 2, 2024 · c8a0074 · c8a0074
1 parent 1ec65f5
commit c8a0074
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/...ra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/CreateSchema.scala b/...ra/src/main/scala/com/evolutiongaming/kafka/journal/eventual/cassandra/CreateSchema.scala
@@ -49,12 +49,17 @@ object CreateSchema {
         setting = TableName(keyspace = keyspace, table = config.settingTable)
       )
 
-      def table(name: String, query: TableName => Nel[String]) = {
-        val tableName = TableName(keyspace = keyspace, table = name)
-        CreateTables.Table(name = name, queries = query(tableName))
-      }
+      val journalStatement = JournalStatements.createTable(schema.journal)
+      val metaJournalStatement = MetaJournalStatements.createTable(schema.metaJournal)
+      val pointerStatement = PointerStatements.createTable(schema.pointer)
+      val pointer2Statement = Pointer2Statements.createTable(schema.pointer2)
+      val settingStatement = SettingStatements.createTable(schema.setting)
 
-      val journal = table(config.journalTable, a => Nel.of(JournalStatements.createTable(a)))
+      val journal = CreateTables.Table(config.journalTable, journalStatement)
+      val metaJournal = CreateTables.Table(config.metaJournalTable, metaJournalStatement)
+      val pointer = CreateTables.Table(config.pointerTable, pointerStatement)
+      val pointer2 = CreateTables.Table(config.pointer2Table, pointer2Statement)
+      val setting = CreateTables.Table(config.settingTable, settingStatement)
 
       val createSchema =
         if (config.autoCreate) {