# HG changeset patch
# User Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
# Date 1502991102 -7200
# Node ID 352b54ff0436e17ad54529e4fb2c9d9a0e10c619
# Parent  3d5ea891bb74055fe9977511f1aa5abe36808de9
Implemented ResultSet method getNCharacterStream()

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 # This file is updated with Maddlog
 
 * Thu Aug 17 2017 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Implemented ResultSet method getNCharacterStream()
 - In class MonetClob implemented methods getCharacterStream()
   and getCharacterStream(long pos, long length).  Method
   getCharacterStream() is called by DBeaver to fetch the Clob value.
diff --git a/release.txt b/release.txt
--- a/release.txt
+++ b/release.txt
@@ -64,9 +64,9 @@ Currently implemented JDBC 4.1 interface
     The next features/methods are NOT implemented:
     - getArray
     - getAsciiStream, getUnicodeStream
-    - getNCharacterStream, getNClob, getNString
+    - getNClob
     - getRef, getRowId, getSQLXML
-    - all methods related to updateable result sets
+    - All methods related to updateable result sets
 
   * java.sql.ResultSetMetaData
 
diff --git a/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java b/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
+++ b/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
@@ -515,7 +515,7 @@ public class MonetResultSet extends Mone
 	 */
 	@Override
 	public Reader getNCharacterStream(int columnIndex) throws SQLException {
-		throw newSQLFeatureNotSupportedException("getNCharacterStream");
+		return getCharacterStream(columnIndex);
 	}
 
 	/**
@@ -534,7 +534,7 @@ public class MonetResultSet extends Mone
 	 */
 	@Override
 	public Reader getNCharacterStream(String columnLabel) throws SQLException {
-		throw newSQLFeatureNotSupportedException("getNCharacterStream");
+		return getCharacterStream(findColumn(columnLabel));
 	}
 
 	/**
@@ -2534,7 +2534,7 @@ public class MonetResultSet extends Mone
 	 */
 	@Override
 	public String getNString(String columnLabel) throws SQLException {
-		return getNString(findColumn(columnLabel));
+		return getString(findColumn(columnLabel));
 	}
 
 	/**