[libeufin] branch master updated: fix db column name collision

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new c6ae6c4  fix db column name collision
c6ae6c4 is described below

commit c6ae6c49b7fe76b99c00c0106b46a703c26c0ef1
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue May 12 17:21:28 2020 +0200

    fix db column name collision
---
 nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt | 8 ++++----
 1 file 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 e3cf958..f614fd4 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
          )
     }

-- 
To stop receiving notification emails like this one, please contact
address@hidden.