From 541a7f96094041acb3d56c62cb86f54c070f0161 Mon Sep 17 00:00:00 2001
From: Dave Cramer <davecramer@gmail.com>
Date: Thu, 14 Nov 2019 15:48:40 -0500
Subject: [PATCH 1/2] fix: PgSQLXML setCharacterStream() results in null value
 fixes Issue #731

---
 .../java/org/postgresql/jdbc/PgSQLXML.java    |  1 +
 .../org/postgresql/jdbc/PgSQLXMLTest.java     | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java

diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgSQLXML.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgSQLXML.java
index 3cf1277f8e..919df065b9 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgSQLXML.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgSQLXML.java
@@ -175,6 +175,7 @@ public synchronized OutputStream setBinaryStream() throws SQLException {
   public synchronized Writer setCharacterStream() throws SQLException {
     checkFreed();
     initialize();
+    active = true;
     stringWriter = new StringWriter();
     return stringWriter;
   }
diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
new file mode 100644
index 0000000000..18cea2a0f3
--- /dev/null
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2004, PostgreSQL Global Development Group
+ * See the LICENSE file in the project root for more information.
+ */
+
+package org.postgresql.jdbc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.BaseTest4;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.Writer;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLXML;
+import java.sql.Statement;
+
+public class PgSQLXMLTest extends BaseTest4 {
+
+  @Override
+  @Before
+  public void setUp() throws Exception {
+    super.setUp();
+    TestUtil.createTempTable(con, "xmltab","x xml");
+  }
+
+  @Test
+  public void setCharacterStream() throws  Exception {
+    String exmplar = "<x>value</x>";
+    SQLXML pgSQLXML = con.createSQLXML();
+    Writer writer = pgSQLXML.setCharacterStream();
+    writer.write(exmplar);
+    PreparedStatement preparedStatement = con.prepareStatement("insert into xmltab values (?)");
+    preparedStatement.setSQLXML(1,pgSQLXML);
+    preparedStatement.execute();
+
+    Statement statement = con.createStatement();
+    ResultSet rs = statement.executeQuery("select * from xmltab");
+    assertTrue(rs.next());
+    SQLXML result = rs.getSQLXML(1);
+    assertNotNull(result);
+    assertEquals(exmplar, result.getString());
+  }
+}

From 1f8bdf6a3143ce874d0efbe2dd95af28839a8539 Mon Sep 17 00:00:00 2001
From: Dave Cramer <davecramer@gmail.com>
Date: Thu, 14 Nov 2019 16:14:28 -0500
Subject: [PATCH 2/2] add to test suite and fix copyright date

---
 pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java      | 2 +-
 .../src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
index 18cea2a0f3..53fd56dc13 100644
--- a/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
+++ b/pgjdbc/src/test/java/org/postgresql/jdbc/PgSQLXMLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, PostgreSQL Global Development Group
+ * Copyright (c) 2019, PostgreSQL Global Development Group
  * See the LICENSE file in the project root for more information.
  */
 
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
index 7dc50232d0..004f1b614a 100644
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
@@ -13,6 +13,7 @@
 import org.postgresql.core.ReturningParserTest;
 import org.postgresql.core.v3.V3ParameterListTests;
 import org.postgresql.jdbc.DeepBatchedInsertStatementTest;
+import org.postgresql.jdbc.PgSQLXMLTest;
 import org.postgresql.jdbc.PrimitiveArraySupportTest;
 import org.postgresql.test.core.JavaVersionTest;
 import org.postgresql.test.core.LogServerMessagePropertyTest;
@@ -82,6 +83,7 @@
     PGPropertyTest.class,
     PGTimestampTest.class,
     PGTimeTest.class,
+    PgSQLXMLTest.class,
     PreparedStatementTest.class,
     PrimitiveArraySupportTest.class,
     QuotationTest.class,