Skip to content

Commit

Permalink
adding support for YearMonth data type - pgjdbcgh-591
Browse files Browse the repository at this point in the history
  • Loading branch information
steverigney committed Aug 13, 2023
1 parent 53f74aa commit a340c02
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/main/java/io/r2dbc/postgresql/codec/DefaultCodecs.java
Expand Up @@ -264,6 +264,7 @@ private static List<Codec<?>> getDefaultCodecs(ByteBufAllocator byteBufAllocator
new UrlCodec(byteBufAllocator),
new UuidCodec(byteBufAllocator),
new YearCodec(byteBufAllocator),
new YearMonthCodec(byteBufAllocator),
new ZoneIdCodec(byteBufAllocator),

// JSON
Expand Down
31 changes: 31 additions & 0 deletions src/main/java/io/r2dbc/postgresql/codec/YearMonthCodec.java
@@ -0,0 +1,31 @@
/*
* Copyright 2017 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 io.r2dbc.postgresql.codec;

import io.netty.buffer.ByteBufAllocator;

import java.time.Year;
import java.time.YearMonth;

import static java.time.temporal.ChronoField.PROLEPTIC_MONTH;

final class YearMonthCodec extends StringCodecDelegate<YearMonth> {

YearMonthCodec(ByteBufAllocator byteBufAllocator) {
super(YearMonth.class, byteBufAllocator, YearMonth::toString, YearMonth::parse);
}
}
@@ -1,4 +1,16 @@
[
{
"name": "[Ljava.time.Period;",
"unsafeAllocated": true
},
{
"name": "[Ljava.time.MonthDay;",
"unsafeAllocated": true
},
{
"name": "[Ljava.time.YearMonth;",
"unsafeAllocated": true
},
{
"name": "[Lio.r2dbc.postgresql.codec.Box;",
"unsafeAllocated": true
Expand Down
98 changes: 98 additions & 0 deletions src/test/java/io/r2dbc/postgresql/codec/YearMonthCodecTest.java
@@ -0,0 +1,98 @@
package io.r2dbc.postgresql.codec;

import io.netty.buffer.ByteBuf;
import io.r2dbc.postgresql.client.EncodedParameter;
import io.r2dbc.postgresql.client.ParameterAssert;
import org.junit.jupiter.api.Test;

import java.nio.charset.Charset;
import java.time.YearMonth;
import java.time.format.DateTimeParseException;

import static io.r2dbc.postgresql.client.EncodedParameter.NULL_VALUE;
import static io.r2dbc.postgresql.codec.PostgresqlObjectId.BPCHAR;
import static io.r2dbc.postgresql.codec.PostgresqlObjectId.CHAR;
import static io.r2dbc.postgresql.codec.PostgresqlObjectId.NAME;
import static io.r2dbc.postgresql.codec.PostgresqlObjectId.TEXT;
import static io.r2dbc.postgresql.codec.PostgresqlObjectId.VARCHAR;
import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;

class YearMonthCodecTest {

@Test
void constructorNoByteBufAllocator() {
assertThatIllegalArgumentException().isThrownBy(() -> new YearMonthCodec(null))
.withMessage("byteBufAllocator must not be null");
}

@Test
void decode() {
final YearMonth yearMonth = YearMonth.now();

final ByteBuf buffer = TEST.buffer();

final int charsWritten = buffer.writeCharSequence(yearMonth.toString(), Charset.defaultCharset());
assertThat(charsWritten).isEqualTo(yearMonth.toString().length());

assertThat(new YearMonthCodec(TEST)
.decode(buffer, VARCHAR, FORMAT_TEXT, YearMonth.class))
.isEqualTo(yearMonth);
}

@Test
void decodeJunkString() {
final String junkString = "hello world";
final ByteBuf buffer = TEST.buffer();

final int charsWritten = buffer.writeCharSequence(junkString, Charset.defaultCharset());
assertThat(charsWritten).isEqualTo(junkString.length());

assertThatExceptionOfType(DateTimeParseException.class)
.isThrownBy(() -> new YearMonthCodec(TEST).decode(buffer, VARCHAR, FORMAT_TEXT, YearMonth.class));
}

@Test
void decodeNoByteBuf() {
assertThat(new YearMonthCodec(TEST).decode(null, VARCHAR.getObjectId(), FORMAT_TEXT, YearMonth.class)).isNull();
}

@Test
void doCanDecode() {
YearMonthCodec codec = new YearMonthCodec(TEST);

assertThat(codec.doCanDecode(VARCHAR, FORMAT_TEXT)).isTrue();
assertThat(codec.doCanDecode(CHAR, FORMAT_TEXT)).isTrue();
assertThat(codec.doCanDecode(BPCHAR, FORMAT_TEXT)).isTrue();
assertThat(codec.doCanDecode(NAME, FORMAT_TEXT)).isTrue();
assertThat(codec.doCanDecode(TEXT, FORMAT_TEXT)).isTrue();
}

@Test
void doCanDecodeNoType() {
assertThatIllegalArgumentException().isThrownBy(() -> new YearMonthCodec(TEST).doCanDecode(null, FORMAT_TEXT))
.withMessage("type must not be null");
}

@Test
void doEncodeNoValue() {
assertThatIllegalArgumentException().isThrownBy(() -> new YearMonthCodec(TEST).doEncode(null))
.withMessage("value must not be null");
}

@Test
void encodeItemNoValue() {
assertThatIllegalArgumentException().isThrownBy(() -> new YearMonthCodec(TEST).encode(null))
.withMessage("value must not be null");
}

@Test
void encodeNull() {
ParameterAssert.assertThat(new YearMonthCodec(TEST).encodeNull())
.isEqualTo(new EncodedParameter(FORMAT_TEXT, VARCHAR.getObjectId(), NULL_VALUE));
}

}

0 comments on commit a340c02

Please sign in to comment.