Skip to content

Commit

Permalink
3.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
haiyangl committed Nov 6, 2024
1 parent ea5e6bf commit 379b851
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 14 deletions.
18 changes: 13 additions & 5 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<classpathentry kind="src" path="samples"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand All @@ -39,18 +38,27 @@
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<classpathentry kind="src" output="target/classes" path="Users/haiyangl/Landawn/abacus-core/src/jdbc">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 3.8.1

* Improvements and bug fix.

### 3.8.0

* Improve JavaDoc.
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# abacus-jdbc

[![Maven Central](https://img.shields.io/maven-central/v/com.landawn/abacus-jdbc.svg)](https://maven-badges.herokuapp.com/maven-central/com.landawn/abacus-jdbc/)
[![Javadocs](https://img.shields.io/badge/javadoc-3.8.0-brightgreen.svg)](https://www.javadoc.io/doc/com.landawn/abacus-jdbc/3.8.0/index.html)
[![Javadocs](https://img.shields.io/badge/javadoc-3.8.1-brightgreen.svg)](https://www.javadoc.io/doc/com.landawn/abacus-jdbc/3.8.1/index.html)

Hope it will bring you the programming experiences: coding with SQL/DB is just like coding with Collections.

Expand Down Expand Up @@ -143,15 +143,15 @@ The biggest difference between this library and other data(database) access fram
<dependency>
<groupId>com.landawn</groupId>
<artifactId>abacus-jdbc</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
<dependency>
```

* Gradle:

```gradle
// JDK 17 or above:
compile 'com.landawn:abacus-jdbc:3.8.0'
compile 'com.landawn:abacus-jdbc:3.8.1'
```

## User Guide:
Expand Down
2 changes: 1 addition & 1 deletion maven/0.0.1-SNAPSHOT/abacus-jdbc-0.0.1-SNAPSHOT.pom
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.landawn</groupId>
<artifactId>abacus-common</artifactId>
<version>5.3.27</version>
<version>5.3.28</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.landawn</groupId>
<artifactId>abacus-jdbc</artifactId>
<version>3.8.1</version>
<version>3.8.2</version>
<packaging>jar</packaging>

<name>abacus-jdbc</name>
Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>com.landawn</groupId>
<artifactId>abacus-common</artifactId>
<version>5.3.27</version>
<version>5.3.28</version>
<scope>provided</scope>
</dependency>

Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/landawn/abacus/jdbc/JdbcUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.landawn.abacus.jdbc;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
Expand Down Expand Up @@ -44,7 +45,6 @@
import com.landawn.abacus.parser.JSONSerializationConfig.JSC;
import com.landawn.abacus.type.Type;
import com.landawn.abacus.util.BufferedJSONWriter;
import com.landawn.abacus.util.BufferedReader;
import com.landawn.abacus.util.CSVUtil;
import com.landawn.abacus.util.DataSet;
import com.landawn.abacus.util.DateTimeFormat;
Expand Down Expand Up @@ -2255,7 +2255,8 @@ public static long exportCSV(final Writer out, final ResultSet rs, final Collect

long result = 0;
final Type<Object> strType = N.typeOf(String.class);
final BufferedJSONWriter bw = out instanceof BufferedJSONWriter ? (BufferedJSONWriter) out : Objectory.createBufferedJSONWriter(out);
final boolean isBufferedJSONWriter = out instanceof BufferedJSONWriter;
final BufferedJSONWriter bw = isBufferedJSONWriter ? (BufferedJSONWriter) out : Objectory.createBufferedJSONWriter(out);

try {
final boolean checkDateType = JdbcUtil.checkDateType(rs);
Expand Down Expand Up @@ -2347,7 +2348,7 @@ public static long exportCSV(final Writer out, final ResultSet rs, final Collect

bw.flush();
} finally {
if (bw != out) {
if (!isBufferedJSONWriter) {
Objectory.recycle(bw);
}
}
Expand Down

0 comments on commit 379b851

Please sign in to comment.