KEYCLOAK-10744 Fix MariaDB cannot create database
This commit is contained in:
parent
1c5f7c1420
commit
04f266d381
2 changed files with 46 additions and 0 deletions
|
@ -0,0 +1,44 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2019 Red Hat, Inc. and/or its affiliates
|
||||||
|
* and other contributors as indicated by the @author tags.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.keycloak.connections.jpa.updater.liquibase;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
import liquibase.database.core.MariaDBDatabase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
|
||||||
|
*/
|
||||||
|
public class UpdatedMariaDBDatabase extends MariaDBDatabase {
|
||||||
|
|
||||||
|
private static final Set<String> RESERVED_WORDS = new HashSet<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isReservedWord(String string) {
|
||||||
|
return super.isReservedWord(string) || RESERVED_WORDS.contains(string.toUpperCase());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getPriority() {
|
||||||
|
return super.getPriority() + 1; // Always take precedence over factory MariaDBDatabase
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
RESERVED_WORDS.add("PERIOD");
|
||||||
|
}
|
||||||
|
}
|
|
@ -34,6 +34,7 @@ import org.jboss.logging.Logger;
|
||||||
import org.keycloak.Config;
|
import org.keycloak.Config;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
|
import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.PostgresPlusDatabase;
|
import org.keycloak.connections.jpa.updater.liquibase.PostgresPlusDatabase;
|
||||||
|
import org.keycloak.connections.jpa.updater.liquibase.UpdatedMariaDBDatabase;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.UpdatedMySqlDatabase;
|
import org.keycloak.connections.jpa.updater.liquibase.UpdatedMySqlDatabase;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.lock.CustomInsertLockRecordGenerator;
|
import org.keycloak.connections.jpa.updater.liquibase.lock.CustomInsertLockRecordGenerator;
|
||||||
import org.keycloak.connections.jpa.updater.liquibase.lock.CustomLockDatabaseChangeLogGenerator;
|
import org.keycloak.connections.jpa.updater.liquibase.lock.CustomLockDatabaseChangeLogGenerator;
|
||||||
|
@ -96,6 +97,7 @@ public class DefaultLiquibaseConnectionProvider implements LiquibaseConnectionPr
|
||||||
DatabaseFactory.getInstance().register(new PostgresPlusDatabase());
|
DatabaseFactory.getInstance().register(new PostgresPlusDatabase());
|
||||||
// Adding newer version of MySQL/MariaDB support to liquibase
|
// Adding newer version of MySQL/MariaDB support to liquibase
|
||||||
DatabaseFactory.getInstance().register(new UpdatedMySqlDatabase());
|
DatabaseFactory.getInstance().register(new UpdatedMySqlDatabase());
|
||||||
|
DatabaseFactory.getInstance().register(new UpdatedMariaDBDatabase());
|
||||||
|
|
||||||
// Change command for creating lock and drop DELETE lock record from it
|
// Change command for creating lock and drop DELETE lock record from it
|
||||||
SqlGeneratorFactory.getInstance().register(new CustomInsertLockRecordGenerator());
|
SqlGeneratorFactory.getInstance().register(new CustomInsertLockRecordGenerator());
|
||||||
|
|
Loading…
Reference in a new issue