> rowList)
@@ -320,7 +322,7 @@ private static class MondrianOlap4jConnectionJdbc4
extends MondrianOlap4jConnection
implements OlapConnection
{
- public MondrianOlap4jConnectionJdbc4(
+ MondrianOlap4jConnectionJdbc4(
Factory factory,
String url,
Properties info) throws SQLException
@@ -328,6 +330,14 @@ public MondrianOlap4jConnectionJdbc4(
super(factory, url, info);
}
+ public OlapStatement createStatement() {
+ return super.createStatement();
+ }
+
+ public OlapDatabaseMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.Connection methods
// introduced in JDBC 4.0/JDK 1.6
@@ -387,6 +397,10 @@ public MondrianOlap4jCellSetJdbc4(
super(olap4jStatement, query);
}
+ public CellSetMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.CellSet methods
// introduced in JDBC 4.0/JDK 1.6
@@ -629,6 +643,10 @@ public MondrianOlap4jPreparedStatementJdbc4(
super(olap4jConnection, mdx);
}
+ public CellSetMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.PreparedStatement methods
// introduced in JDBC 4.0/JDK 1.6
@@ -730,6 +748,10 @@ public MondrianOlap4jDatabaseMetaDataJdbc4(
super(olap4jConnection);
}
+ public OlapConnection getConnection() {
+ return super.getConnection();
+ }
+
// implement java.sql.DatabaseMetaData methods
// introduced in JDBC 4.0/JDK 1.6
diff --git a/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java b/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
index 6a50631..b8ddff7 100644
--- a/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
+++ b/src/mondrian/olap4j/MondrianOlap4jDatabaseMetaData.java
@@ -767,7 +767,7 @@ public ResultSet getUDTs(
throw new UnsupportedOperationException();
}
- public OlapConnection getConnection() throws SQLException {
+ public OlapConnection getConnection() {
return olap4jConnection;
}
diff --git a/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java b/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java
index 3ddedb7..d9e6623 100644
--- a/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java
+++ b/src/mondrian/olap4j/MondrianOlap4jPreparedStatement.java
@@ -198,7 +198,7 @@ public void setArray(int parameterIndex, Array x) throws SQLException {
throw new UnsupportedOperationException();
}
- public CellSetMetaData getMetaData() throws SQLException {
+ public CellSetMetaData getMetaData() {
return cellSetMetaData;
}
diff --git a/src/org/olap4j/OlapDatabaseMetaData.java b/src/org/olap4j/OlapDatabaseMetaData.java
index 4af41e6..a6ad8a5 100644
--- a/src/org/olap4j/OlapDatabaseMetaData.java
+++ b/src/org/olap4j/OlapDatabaseMetaData.java
@@ -483,7 +483,7 @@ ResultSet getDimensions(
*
* @exception OlapException if a database access error occurs
*
- * @see #getFunctions(String, String, String)
+ * @see java.sql.DatabaseMetaData#getFunctions(String, String, String)
* @see #getSearchStringEscape
*/
ResultSet getOlapFunctions(
diff --git a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
index fa050d0..3272bd2 100644
--- a/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
+++ b/src/org/olap4j/driver/xmla/FactoryJdbc4Impl.java
@@ -13,7 +13,7 @@
import java.io.Reader;
import java.io.InputStream;
-import org.olap4j.OlapConnection;
+import org.olap4j.*;
/**
* Implementation of {@link Factory} for JDBC 4.0.
@@ -311,6 +311,14 @@ public XmlaOlap4jConnectionJdbc4(
super(factory, proxy, url, info);
}
+ public OlapStatement createStatement() {
+ return super.createStatement();
+ }
+
+ public OlapDatabaseMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.Connection methods
// introduced in JDBC 4.0/JDK 1.6
@@ -370,6 +378,10 @@ public XmlaOlap4jCellSetJdbc4(
super(olap4jStatement, is);
}
+ public CellSetMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.CellSet methods
// introduced in JDBC 4.0/JDK 1.6
@@ -603,14 +615,19 @@ public void updateNClob(
}
private static class XmlaOlap4jPreparedStatementJdbc4
- extends XmlaOlap4jPreparedStatement {
- public XmlaOlap4jPreparedStatementJdbc4(
+ extends XmlaOlap4jPreparedStatement
+ {
+ XmlaOlap4jPreparedStatementJdbc4(
XmlaOlap4jConnection olap4jConnection,
String mdx)
{
super(olap4jConnection, mdx);
}
+ public CellSetMetaData getMetaData() {
+ return super.getMetaData();
+ }
+
// implement java.sql.PreparedStatement methods
// introduced in JDBC 4.0/JDK 1.6
@@ -705,13 +722,18 @@ public void setNClob(
}
private static class XmlaOlap4jDatabaseMetaDataJdbc4
- extends XmlaOlap4jDatabaseMetaData {
- public XmlaOlap4jDatabaseMetaDataJdbc4(
+ extends XmlaOlap4jDatabaseMetaData
+ {
+ XmlaOlap4jDatabaseMetaDataJdbc4(
XmlaOlap4jConnection olap4jConnection)
{
super(olap4jConnection);
}
+ public OlapConnection getConnection() {
+ return super.getConnection();
+ }
+
// implement java.sql.DatabaseMetaData methods
// introduced in JDBC 4.0/JDK 1.6
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
index 8f29509..262c110 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCellSet.java
@@ -53,7 +53,7 @@ public XmlaOlap4jCellSet(
}
}
- public CellSetMetaData getMetaData() throws OlapException {
+ public CellSetMetaData getMetaData() {
return metaData;
}
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
index 861c0b0..748aae9 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jDatabaseMetaData.java
@@ -685,7 +685,7 @@ public ResultSet getUDTs(
throw new UnsupportedOperationException();
}
- public OlapConnection getConnection() throws SQLException {
+ public OlapConnection getConnection() {
return olap4jConnection;
}
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
index 0b00f14..dcebf7b 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jPreparedStatement.java
@@ -187,7 +187,7 @@ public void setArray(int parameterIndex, Array x) throws SQLException {
throw new UnsupportedOperationException();
}
- public CellSetMetaData getMetaData() throws SQLException {
+ public CellSetMetaData getMetaData() {
return cellSetMetaData;
}
diff --git a/src/org/olap4j/query/SelectionFactory.java b/src/org/olap4j/query/SelectionFactory.java
index db03d8c..498d362 100644
--- a/src/org/olap4j/query/SelectionFactory.java
+++ b/src/org/olap4j/query/SelectionFactory.java
@@ -12,7 +12,7 @@
import org.olap4j.metadata.Member;
/**
- * Contains factory methods for creating {@link SelectionImpl}s.
+ * Contains factory methods for creating implementations of {@link Selection}.
*
* Created using {@link Query#getSelectionFactory()}.
*