Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change staging table name format #41

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Change staging table name format #41

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db17e61
Change staging table name format
s-vitaliy Feb 6, 2025
03d0408
Merge branch 'main' into add-table-modifications-queries
s-vitaliy Feb 6, 2025
9828671
Merge from main
s-vitaliy Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/main/scala/services/app/TableManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@ package com.sneaksanddata.arcane.microsoft_synapse_link
package services.app

import models.app.{ArchiveTableSettings, MicrosoftSynapseLinkStreamContext, TargetTableSettings}
import services.app.JdbcTableManager.generateAlterTableSQL
import services.clients.BatchArchivationResult

import com.sneaksanddata.arcane.framework.logging.ZIOLogAnnotations.*
import com.sneaksanddata.arcane.framework.models.ArcaneSchema
import com.sneaksanddata.arcane.framework.services.base.SchemaProvider
import com.sneaksanddata.arcane.framework.logging.ZIOLogAnnotations.*

import scala.jdk.CollectionConverters.*
import com.sneaksanddata.arcane.framework.services.consumers.JdbcConsumerOptions
import com.sneaksanddata.arcane.framework.services.lakehouse.{SchemaConversions, given_Conversion_ArcaneSchema_Schema}
import org.apache.iceberg.Schema
import org.apache.iceberg.types.Type
import org.apache.iceberg.types.Type.TypeID
import org.apache.iceberg.types.Types.TimestampType
import zio.{Task, ZIO, ZLayer}

import java.sql.{Connection, DriverManager, ResultSet}
import scala.concurrent.Future
import org.apache.iceberg.Schema
import org.apache.iceberg.types.Type
import org.apache.iceberg.types.Type.TypeID
import org.apache.iceberg.types.Types.{NestedField, TimestampType}
import com.sneaksanddata.arcane.framework.services.lakehouse.given_Conversion_ArcaneSchema_Schema
import scala.jdk.CollectionConverters.*


trait TableManager:
Expand Down Expand Up @@ -74,6 +75,14 @@ class JdbcTableManager(options: JdbcConsumerOptions,
yield ()
}

def addColumns(targetTableName: String, missingFields: ArcaneSchema): Task[Unit] =
for _ <- ZIO.foreach(missingFields)(field => {
val query = generateAlterTableSQL(targetTableName, field.name, SchemaConversions.toIcebergType(field.fieldType))
zlog(s"Adding column to table $targetTableName: ${field.name} ${field.fieldType}, $query")
*> ZIO.attemptBlocking(sqlConnection.prepareStatement(query).execute())
})
yield ()

private def dropTable(tableName: String): Task[Unit] =
val sql = s"DROP TABLE IF EXISTS $tableName"
val statement = ZIO.attemptBlocking {
Expand Down Expand Up @@ -126,6 +135,9 @@ object JdbcTableManager:
}
}

def generateAlterTableSQL(tableName: String, fieldName: String, fieldType: Type): String =
s"ALTER TABLE $tableName ADD COLUMN $fieldName ${fieldType.convertType}"

private def generateCreateTableSQL(tableName: String, schema: Schema): String =
val columns = schema.columns().asScala.map { field => s"${field.name()} ${field.`type`().convertType}" }.mkString(", ")
s"CREATE TABLE IF NOT EXISTS $tableName ($columns)"
Expand Down
Loading