diff options
author | Marcello Stanisci <ms@taler.net> | 2020-05-12 17:21:28 +0200 |
---|---|---|
committer | Marcello Stanisci <ms@taler.net> | 2020-05-12 17:21:37 +0200 |
commit | c6ae6c49b7fe76b99c00c0106b46a703c26c0ef1 (patch) | |
tree | a802092773055569d69a696135c9cc6ea599f0cc /nexus/src/main | |
parent | 67c9dfd03afb40ac3824fc2de53ad7c5a12e4900 (diff) | |
download | libeufin-c6ae6c49b7fe76b99c00c0106b46a703c26c0ef1.tar.gz libeufin-c6ae6c49b7fe76b99c00c0106b46a703c26c0ef1.tar.bz2 libeufin-c6ae6c49b7fe76b99c00c0106b46a703c26c0ef1.zip |
fix db column name collision
Diffstat (limited to 'nexus/src/main')
-rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt index e3cf9583..f614fd4b 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt @@ -117,7 +117,7 @@ class RawBankTransactionEntity(id: EntityID<Long>) : LongEntity(id) { */ object PreparedPaymentsTable : IdTable<String>() { /** the UUID representing this payment in the system */ - override val id = BankAccountsTable.varchar("id", ID_MAX_LENGTH).entityId().primaryKey() + override val id = varchar("id", ID_MAX_LENGTH).entityId().primaryKey() val paymentId = long("paymentId") val preparationDate = long("preparationDate") val submissionDate = long("submissionDate").nullable() @@ -164,7 +164,7 @@ class PreparedPaymentEntity(id: EntityID<String>) : Entity<String>(id) { * This table holds triples of <iban, bic, holder name>. */ object BankAccountsTable : IdTable<String>() { - override val id = varchar("id", ID_MAX_LENGTH).entityId().primaryKey() + override val id = varchar("id", ID_MAX_LENGTH).primaryKey().entityId() val accountHolder = text("accountHolder") val iban = text("iban") val bankCode = text("bankCode") @@ -208,7 +208,7 @@ class EbicsSubscriberEntity(id: EntityID<String>) : Entity<String>(id) { } object NexusUsersTable : IdTable<String>() { - override val id = varchar("id", ID_MAX_LENGTH).entityId() + override val id = varchar("id", ID_MAX_LENGTH).entityId().primaryKey() val password = blob("password").nullable() } @@ -235,13 +235,13 @@ fun dbCreateTables() { transaction { addLogger(StdOutSqlLogger) SchemaUtils.create( + NexusUsersTable, PreparedPaymentsTable, EbicsSubscribersTable, BankAccountsTable, RawBankTransactionsTable, TalerIncomingPayments, TalerRequestedPayments, - NexusUsersTable, BankAccountMapsTable ) } |