Skip to content

Commit

Permalink
Add support for Oracle bind marker scheme using R2DBC
Browse files Browse the repository at this point in the history
We now support Oracle's bind marker scheme that identifies dynamic
parameters using names that are prefixed with a colon such as
`:P0_myparam`.

Closes spring-projectsgh-26680
  • Loading branch information
mp911de authored and lxbzmy committed Mar 26, 2022
1 parent 38fe44c commit 3379ea9
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -118,10 +118,12 @@ static class BuiltInBindMarkersFactoryProvider implements BindMarkerFactoryProvi

static {
BUILTIN.put("H2", BindMarkersFactory.indexed("$", 1));
BUILTIN.put("MariaDB", BindMarkersFactory.anonymous("?"));
BUILTIN.put("Microsoft SQL Server", BindMarkersFactory.named("@", "P", 32,
BuiltInBindMarkersFactoryProvider::filterBindMarker));
BUILTIN.put("MySQL", BindMarkersFactory.anonymous("?"));
BUILTIN.put("MariaDB", BindMarkersFactory.anonymous("?"));
BUILTIN.put("Oracle", BindMarkersFactory.named(":", "P", 32,
BuiltInBindMarkersFactoryProvider::filterBindMarker));
BUILTIN.put("PostgreSQL", BindMarkersFactory.indexed("$", 1));
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/*
* Copyright 2002-2021 the original author or authors.
*
* 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
*
* https://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.springframework.r2dbc.core.binding;

import io.r2dbc.spi.Connection;
import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.ConnectionFactoryMetadata;
import org.junit.jupiter.api.Test;
import org.reactivestreams.Publisher;

import static org.assertj.core.api.Assertions.assertThat;

/**
* Unit tests for {@link BindMarkersFactoryResolver}.
*
* @author Mark Paluch
*/
class BindMarkersFactoryResolverUnitTests {

@Test
void shouldReturnBindMarkersFactoryForH2() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("H2")).create();

assertThat(bindMarkers.next().getPlaceholder()).isEqualTo("$1");
}

@Test
void shouldReturnBindMarkersFactoryForMariaDB() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("MariaDB")).create();

assertThat(bindMarkers.next().getPlaceholder()).isEqualTo("?");
}

@Test
void shouldReturnBindMarkersFactoryForMicrosoftSQLServer() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("Microsoft SQL Server")).create();

assertThat(bindMarkers.next("foo").getPlaceholder()).isEqualTo("@P0_foo");
}

@Test
void shouldReturnBindMarkersFactoryForMySQL() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("MySQL")).create();

assertThat(bindMarkers.next().getPlaceholder()).isEqualTo("?");
}

@Test
void shouldReturnBindMarkersFactoryForOracle() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("Oracle Database")).create();

assertThat(bindMarkers.next("foo").getPlaceholder()).isEqualTo(":P0_foo");
}

@Test
void shouldReturnBindMarkersFactoryForPostgreSQL() {

BindMarkers bindMarkers = BindMarkersFactoryResolver
.resolve(new MockConnectionFactory("PostgreSQL")).create();

assertThat(bindMarkers.next().getPlaceholder()).isEqualTo("$1");
}

static class MockConnectionFactory implements ConnectionFactory {

private final String driverName;

MockConnectionFactory(String driverName) {
this.driverName = driverName;
}

@Override
public Publisher<? extends Connection> create() {
throw new UnsupportedOperationException();
}

@Override
public ConnectionFactoryMetadata getMetadata() {
return () -> driverName;
}

}

}

0 comments on commit 3379ea9

Please sign in to comment.