You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/11/02 14:55:56 UTC

[1/3] incubator-trafodion git commit: TRAFODION-2787 jdbc does not implement wrapper related api

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 68fe67f4f -> bf2ad712e


TRAFODION-2787 jdbc does not implement wrapper related api


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/71fa57bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/71fa57bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/71fa57bc

Branch: refs/heads/master
Commit: 71fa57bc19704e71d39874526e264759c07013a0
Parents: 371cb71
Author: gpj1987 <gp...@gmail.com>
Authored: Mon Oct 30 17:03:54 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Mon Oct 30 17:03:54 2017 +0800

----------------------------------------------------------------------
 .../jdbcT4/src/main/java/T4Messages.properties  |  4 ++
 .../org/trafodion/jdbc/t4/TrafT4Connection.java | 14 ++++--
 .../java/org/trafodion/jdbc_test/TestWrap.java  | 50 ++++++++++++++++++++
 3 files changed, 64 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71fa57bc/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index 6317a2b..3d0a43c 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -703,3 +703,7 @@ cursor_is_before_first_row_sqlcode=29189
 cursor_after_last_row_msg=The cursor is after last row, which could be due to the result set containing no rows, or all rows have been retrieved.
 cursor_after_last_row_sqlstate=HY109
 cursor_after_last_row_sqlcode=29190
+
+unable_unwrap_msg=The interface is not unable to wrap.
+unable_unwrap_sqlstate=HY109
+unable_unwrap_sqlcode=29190

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71fa57bc/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
index 2a8e381..dff6fa0 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
@@ -1849,13 +1849,19 @@ public class TrafT4Connection extends PreparedStatementManager implements java.s
 
 
 	public Object unwrap(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
+		try {
+			return iface.cast(this);
+		} catch (ClassCastException cce) {
+			throw TrafT4Messages.createSQLException(props_, this.getLocale(), "unable_unwrap", iface.toString());
+		}
 	}
 
 	public boolean isWrapperFor(Class iface) throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
+		if (_isClosed() == true) {
+			throw TrafT4Messages.createSQLException(props_, null, "invalid_connection", null);
+		} else {
+			return iface.isInstance(this);
+		}
 	}
 
 	public Clob createClob() throws SQLException {

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71fa57bc/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
new file mode 100644
index 0000000..07ae116
--- /dev/null
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
@@ -0,0 +1,50 @@
+import static org.junit.Assert.assertTrue;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.junit.Test;
+
+public class TestWrap {
+
+    @Test
+    public void testIsWrapFor() {
+        Connection conn = null;
+        try {
+            System.out.println("Connecting to database...");
+            conn = Utils.getUserConnection();
+            boolean result = conn.isWrapperFor(Connection.class);
+            assertTrue("It is wrapper for this interface", result);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test(expected = SQLException.class)
+    public void testConnectIsClose() throws SQLException {
+        Connection conn = null;
+        try {
+            System.out.println("Connecting to database...");
+            conn = Utils.getUserConnection();
+            conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        conn.isWrapperFor(Connection.class) ;
+    }
+
+    @Test
+    public void testUnwrap() {
+        Connection conn = null;
+        try {
+            System.out.println("Connecting to database...");
+            conn = Utils.getUserConnection();
+            boolean result = conn.unwrap(Connection.class) instanceof Connection;
+            assertTrue("It is unwrape for this interface", result);
+            result = conn.unwrap(Connection.class) instanceof TestWrap;
+            assertTrue("It is unwrape for this interface", !result);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}


[2/3] incubator-trafodion git commit: add copyright

Posted by db...@apache.org.
add copyright


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/133714df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/133714df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/133714df

Branch: refs/heads/master
Commit: 133714dfe6d569e99ee8db21d5b689bced1e4b88
Parents: 71fa57b
Author: gpj1987 <gp...@gmail.com>
Authored: Tue Oct 31 19:20:30 2017 +0800
Committer: gpj1987 <gp...@gmail.com>
Committed: Tue Oct 31 19:20:30 2017 +0800

----------------------------------------------------------------------
 .../java/org/trafodion/jdbc_test/TestWrap.java  | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/133714df/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
----------------------------------------------------------------------
diff --git a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
index 07ae116..4716f97 100644
--- a/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
+++ b/dcs/src/test/jdbc_test/src/test/java/org/trafodion/jdbc_test/TestWrap.java
@@ -1,3 +1,39 @@
+/*
+/* @@@ START COPYRIGHT @@@
+/*
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+/*
+or more contributor license agreements.  See the NOTICE file
+/*
+distributed with this work for additional information
+/*
+regarding copyright ownership.  The ASF licenses this file
+/*
+to you 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
+/*
+/*
+  http://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.
+/*
+/* @@@ END COPYRIGHT @@@
+/*/
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;


[3/3] incubator-trafodion git commit: Merge [TRAFODION-2787] PR 1284 Add JDBC Wrapper API

Posted by db...@apache.org.
Merge [TRAFODION-2787] PR 1284 Add JDBC Wrapper API


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bf2ad712
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bf2ad712
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bf2ad712

Branch: refs/heads/master
Commit: bf2ad712e5ce1c64c5ff180fe8235ae58a36f225
Parents: 68fe67f 133714d
Author: Dave Birdsall <db...@apache.org>
Authored: Thu Nov 2 14:54:31 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu Nov 2 14:54:31 2017 +0000

----------------------------------------------------------------------
 .../jdbcT4/src/main/java/T4Messages.properties  |  4 +
 .../org/trafodion/jdbc/t4/TrafT4Connection.java | 14 +++-
 .../java/org/trafodion/jdbc_test/TestWrap.java  | 86 ++++++++++++++++++++
 3 files changed, 100 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bf2ad712/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Connection.java
----------------------------------------------------------------------