Explorar el Código

BubbleBlock app fix and migration (#32)

Merge branch 'master' into kris/migration_for_bubble_block_app_fix

Remove not needed migration

Add migration for BubbleBlock app's recent changes

Add more field to add list bubble block action

Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org>
Co-authored-by: Kristijan Mitrovic <kmitrovic@itekako.com>
Reviewed-on: #32
tags/v0.15.4
Kristijan Mitrovic hace 4 años
committed by jonathan
padre
commit
86f61908ce
Se han modificado 3 ficheros con 29 adiciones y 3 borrados
  1. +2
    -2
      bubble-server/src/main/java/db/BubbleMigration.java
  2. +26
    -0
      bubble-server/src/main/java/db/BubbleValueUpdateMigration.java
  3. +1
    -1
      bubble-server/src/main/resources/models/apps/bubble_block/bubbleApp_bubbleBlock.json

+ 2
- 2
bubble-server/src/main/java/db/BubbleMigration.java Ver fichero

@@ -9,7 +9,7 @@ import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.cobbzilla.wizard.spring.config.rdbms.RdbmsConfig;
import org.flywaydb.core.api.migration.JavaMigration;
import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.jasypt.hibernate4.encryptor.HibernatePBEStringEncryptor;

/**
@@ -27,7 +27,7 @@ import org.jasypt.hibernate4.encryptor.HibernatePBEStringEncryptor;
* For example: V2020042301__add_account_payment_archived.sql
*/
@Slf4j
public abstract class BubbleMigration implements JavaMigration {
public abstract class BubbleMigration extends BaseJavaMigration {

@Getter @Setter private static BubbleConfiguration configuration;



+ 26
- 0
bubble-server/src/main/java/db/BubbleValueUpdateMigration.java Ver fichero

@@ -0,0 +1,26 @@
package db;

import lombok.NonNull;
import org.flywaydb.core.api.migration.Context;

public abstract class BubbleValueUpdateMigration extends BubbleMigration {
@Override public void migrate(@NonNull final Context context) throws Exception {
final var connection = context.getConnection();
final var select = connection.prepareStatement("SELECT uuid, " + fieldToUpdate() + " FROM " + tableToUpdate()
+ " WHERE " + condition());
final var update = connection.prepareStatement("UPDATE " + tableToUpdate()
+ " SET " + fieldToUpdate() + " = ? WHERE uuid = ?");

final var rows = select.executeQuery();
while (rows.next()) {
update.setString(1, updateValues(rows.getString(2)));
update.setString(2, rows.getString(1));
update.executeUpdate();
}
}

@NonNull protected abstract String tableToUpdate();
@NonNull protected abstract String fieldToUpdate();
@NonNull protected abstract String condition();
@NonNull protected abstract String updateValues(@NonNull String currentValue);
}

+ 1
- 1
bubble-server/src/main/resources/models/apps/bubble_block/bubbleApp_bubbleBlock.json Ver fichero

@@ -53,7 +53,7 @@
{"name": "removeList", "index": 50, "when": "item.url !== ''"},
{
"name": "createList", "scope": "app", "index": 10,
"params": ["url"],
"params": [ "name", "description", "url", "tagString" ],
"button": "createList"
},
{


Cargando…
Cancelar
Guardar