getDbVendorErrorType(SQLException e) {
- String message = e.getMessage();
- if (message.contains("Login failed for user")) {
- return of(INVALID_CREDENTIALS);
- } else if (message.contains("Cannot open database")) {
- return of(INVALID_DATABASE);
- } else if (message.contains("invalidHost")) {
- return of(CANNOT_REACH);
- }
- return empty();
- }
-
-}
diff --git a/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerBinaryDbType.java b/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerBinaryDbType.java
deleted file mode 100644
index 22bd4393a..000000000
--- a/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerBinaryDbType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.internal.domain.connection.sqlserver.types;
-
-import org.mule.db.commons.internal.domain.connection.DbConnection;
-import org.mule.db.commons.internal.domain.type.AbstractStructuredDbType;
-import org.mule.db.commons.internal.domain.type.DbType;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * {@link DbType} implementation of BINARY for SQL Server.
- *
- * SQL Server requires String values that are
- *
- * @since 1.1.0
- */
-public class SqlServerBinaryDbType extends AbstractStructuredDbType {
-
- public SqlServerBinaryDbType() {
- super(-2, "binary");
- }
-
- @Override
- public Object getParameterValue(CallableStatement statement, int index) throws SQLException {
- return super.getParameterValue(statement, index);
- }
-
- @Override
- public void setParameterValue(PreparedStatement statement, int index, Object value, DbConnection connection)
- throws SQLException {
- if (value instanceof String) {
- value = ((String) value).getBytes();
- }
- super.setParameterValue(statement, index, value, connection);
- }
-}
diff --git a/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerVarBinaryDbType.java b/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerVarBinaryDbType.java
deleted file mode 100644
index 47bd5550c..000000000
--- a/src/main/java/org/mule/extension/db/internal/domain/connection/sqlserver/types/SqlServerVarBinaryDbType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.internal.domain.connection.sqlserver.types;
-
-import org.mule.db.commons.internal.domain.connection.DbConnection;
-import org.mule.db.commons.internal.domain.type.AbstractStructuredDbType;
-import org.mule.db.commons.internal.domain.type.DbType;
-
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-/**
- * {@link DbType} implementation of VARBINARY for SQL Server.
- *
- * SQL Server requires String values that are
- *
- * @since 1.1.0
- */
-public class SqlServerVarBinaryDbType extends AbstractStructuredDbType {
-
- public SqlServerVarBinaryDbType() {
- super(-3, "varbinary");
- }
-
- @Override
- public Object getParameterValue(CallableStatement statement, int index) throws SQLException {
- return super.getParameterValue(statement, index);
- }
-
- @Override
- public void setParameterValue(PreparedStatement statement, int index, Object value, DbConnection connection)
- throws SQLException {
- if (value instanceof String) {
- value = ((String) value).getBytes();
- }
- super.setParameterValue(statement, index, value, connection);
- }
-}
diff --git a/src/main/java/org/mule/extension/db/internal/domain/connection/teradata/TeradataConnectionProvider.java b/src/main/java/org/mule/extension/db/internal/domain/connection/teradata/TeradataConnectionProvider.java
index a0a4d2a1c..38619f755 100644
--- a/src/main/java/org/mule/extension/db/internal/domain/connection/teradata/TeradataConnectionProvider.java
+++ b/src/main/java/org/mule/extension/db/internal/domain/connection/teradata/TeradataConnectionProvider.java
@@ -10,7 +10,6 @@
import org.mule.db.commons.internal.domain.connection.DbConnection;
import org.mule.db.commons.internal.domain.connection.DbConnectionProvider;
import org.mule.db.commons.internal.domain.type.ResolvedDbType;
-import org.mule.extension.db.internal.domain.connection.mysql.MySqlConnectionParameters;
import org.mule.runtime.api.connection.ConnectionProvider;
import org.mule.runtime.extension.api.annotation.Alias;
import org.mule.runtime.extension.api.annotation.ExternalLib;
@@ -18,14 +17,12 @@
import org.mule.runtime.extension.api.annotation.param.display.DisplayName;
import javax.sql.DataSource;
-import java.sql.Connection;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import static java.util.Optional.empty;
import static java.util.Optional.ofNullable;
import static org.mule.extension.db.internal.util.MigrationUtils.mapDataSourceConfig;
-import static org.mule.runtime.api.meta.ExternalLibraryType.JAR;
import static org.mule.runtime.extension.api.annotation.param.ParameterGroup.CONNECTION;
/**
diff --git a/src/main/java/org/mule/extension/db/internal/domain/logger/MuleMySqlLoggerEnhancerFactory.java b/src/main/java/org/mule/extension/db/internal/domain/logger/MuleMySqlLoggerEnhancerFactory.java
deleted file mode 100644
index 2f2ce3686..000000000
--- a/src/main/java/org/mule/extension/db/internal/domain/logger/MuleMySqlLoggerEnhancerFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.internal.domain.logger;
-
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import org.mule.extension.db.api.logger.MuleMySqlLogger;
-
-/**
- * Factory class that creates instances of {@link MuleMySqlLogger} wrapped by CGLIB's {@link Enhancer} implementing the
- * available Log interface (either com.mysql.cj.log.Log or com.mysql.jdbc.log.Log) at runtime and delegating the method
- * call to the passed instance.
- */
-public class MuleMySqlLoggerEnhancerFactory {
-
- public static final String MYSQL_DRIVER_CLASS = "com.mysql.jdbc.Driver";
- public static final String NEW_MYSQL_DRIVER_CLASS = "com.mysql.cj.jdbc.Driver";
- private ClassLoader classLoader;
- private MuleMySqlLogger delegatedLogger;
-
- public MuleMySqlLoggerEnhancerFactory(ClassLoader classLoader, MuleMySqlLogger delegatedLogger) {
- this.classLoader = classLoader;
- this.delegatedLogger = delegatedLogger;
- }
-
- public MuleMySqlLogger create() {
- Enhancer enhancer = new Enhancer();
-
- enhancer.setSuperclass(delegatedLogger.getClass());
- enhancer.setClassLoader(classLoader);
- enhancer.setInterfaces(new Class[] {getAvailableMySqlLogInterface()});
- enhancer
- .setCallback((MethodInterceptor) (obj, method, args, methodProxy) -> methodProxy.invoke(delegatedLogger, args));
-
- return (MuleMySqlLogger) enhancer.create(new Class[] {String.class}, new Object[] {"MySql"});
- }
-
- private Class getAvailableMySqlLogInterface() {
- try {
- return classLoader.loadClass("com.mysql.cj.log.Log");
- } catch (ClassNotFoundException e) {
- try {
- return classLoader.loadClass("com.mysql.jdbc.log.Log");
- } catch (ClassNotFoundException ex) {
- throw new IllegalArgumentException("Neither class, com.mysql.cj.log.Log or com.mysql.jdbc.log.Log, were found. " +
- "An unsupported driver was provided.", ex);
- }
- }
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/CredentialsMaskUtilTestCase.java b/src/test/java/org/mule/extension/db/CredentialsMaskUtilTestCase.java
index b6c05ea4c..9f52f25a5 100644
--- a/src/test/java/org/mule/extension/db/CredentialsMaskUtilTestCase.java
+++ b/src/test/java/org/mule/extension/db/CredentialsMaskUtilTestCase.java
@@ -10,30 +10,19 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mule.db.commons.internal.util.CredentialsMaskUtils.maskUrlUserAndPassword;
-import static org.mule.extension.db.internal.domain.connection.oracle.util.OracleCredentialsMaskUtils.maskUrlUserAndPasswordForOracle;
import org.junit.Test;
public class CredentialsMaskUtilTestCase {
private static final String URL_TEST =
- "jdbc:sqlserver://1.1.1.1:1443;databaseName=STAGING;user=mulesoftuser;password=mulesoftpass;";
+ "jdbc:teradata://1.1.1.1:1443;databaseName=STAGING;user=mulesoftuser;password=mulesoftpass;";
private static final String EXPECTED_URL_TEST_MASKED =
- "jdbc:sqlserver://1.1.1.1:1443;databaseName=STAGING;user=<>;password=<>;";
+ "jdbc:teradata://1.1.1.1:1443;databaseName=STAGING;user=<>;password=<>;";
@Test
public void whenUrlWithUserAndPasswordMaskUserPassword() {
String maskedUrl = maskUrlUserAndPassword(URL_TEST);
assertThat(maskedUrl, equalTo(EXPECTED_URL_TEST_MASKED));
}
-
- @Test
- public void maskOracleUserAndPasswordUrl() {
- String originalUrl = "jdbc:oracle:thin:secretUser/secretP@ssword@somehost.com:1521/sid";
- String expectedUrl = "jdbc:oracle:thin:<>/<>@somehost.com:1521/sid";
- String scapedUrl = maskUrlUserAndPasswordForOracle(originalUrl);
-
- assertThat(scapedUrl, is(expectedUrl));
- }
-
}
diff --git a/src/test/java/org/mule/extension/db/integration/DbArtifactClassLoaderRunnerConfig.java b/src/test/java/org/mule/extension/db/integration/DbArtifactClassLoaderRunnerConfig.java
index bbc8866d7..0d91c50e1 100644
--- a/src/test/java/org/mule/extension/db/integration/DbArtifactClassLoaderRunnerConfig.java
+++ b/src/test/java/org/mule/extension/db/integration/DbArtifactClassLoaderRunnerConfig.java
@@ -15,8 +15,7 @@
* @since 1.0
*/
@ArtifactClassLoaderRunnerConfig(
- applicationSharedRuntimeLibs = {"org.apache.derby:derby", "mysql:mysql-connector-java", "com.microsoft.sqlserver:mssql-jdbc",
- "com.oracle.database.jdbc:ojdbc8", "org.mule.connectors:mule-db-client", "com.experlog:xapool", "com.mchange:c3p0",
+ applicationSharedRuntimeLibs = {"org.mule.connectors:mule-db-client", "com.experlog:xapool", "com.mchange:c3p0",
"com.mchange:mchange-commons-java", "com.github.ben-manes.caffeine:caffeine", "org.apache.commons:commons-lang3",
"commons-collections:commons-collections", "commons-io:commons-io", "com.teradata:terajdbc4"})
public interface DbArtifactClassLoaderRunnerConfig {
diff --git a/src/test/java/org/mule/extension/db/integration/TestDbConfig.java b/src/test/java/org/mule/extension/db/integration/TestDbConfig.java
index bdeeda019..9713f6cc6 100644
--- a/src/test/java/org/mule/extension/db/integration/TestDbConfig.java
+++ b/src/test/java/org/mule/extension/db/integration/TestDbConfig.java
@@ -18,118 +18,20 @@
public class TestDbConfig {
static {
- USE_MYSQL = getValueFor("mysql");
- USE_MYSQL_OLD_DRIVER = getValueFor("mysql-old-version");
- USE_MSSQL_SERVER = getValueFor("mssql");
- USE_DERBY = getValueFor("derby");
- USE_ORACLE = getValueFor("oracle");
USE_TERADATA = getValueFor("teradata");
}
- private static boolean USE_DERBY;
-
- /**
- * Developer Note:
- * To run the MySQL tests you need to follow the following steps:
- *
- * - Set this USE_MYSQL flag to true
- * - Download a docker MySQL image:
docker pull mysql
- * - Start the container
docker run -p 3306:3306 --name some-mysql -e MYSQL_ROOT_PASSWORD=mysql -d mysql:latest
- *
- *
- * Alternately, you can enable the system property mysql.
- */
- private static boolean USE_MYSQL;
- private static boolean USE_MYSQL_OLD_DRIVER;
-
- /**
- * Developer Note:
- * To run the oracle tests you need to follow the following steps:
- *
- * - Set this USE_ORACLE flag to true
- * - Download a docker Oracle image:
docker pull store/oracle/database-enterprise:12.2.0.1
- * - Start the container:
docker run -d -it --name oracle-db -p 1521:1521 store/oracle/database-enterprise:12.2.0.1
- * - Install in your maven repository an oracle-jdbc-driver using the mvn install:install-file command
- * - Add the installed driver dependency to this project so the test can find it in the classpath
- * - Add the driver as a shared dependency on {@link DbArtifactClassLoaderRunnerConfig}
- *
- *
- * Alternately, you can enable the system property oracle, and follow just the steps five and six above.
- */
- private static boolean USE_ORACLE;
-
- /**
- * Developer Note:
- * To run the MsSQL tests you need to follow the following steps:
- *
- * - Set this USE_MSSQL_SERVER flag to true
- * - Download a docker MsSQL image:
docker pull microsoft/mssql-server-linux
- * - Start the container:
docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=yourStrong(!)Password' -p 1433:1433 -d microsoft/mssql-server-linux
- *
- *
- * Alternately, you can enable the system property mssql.
- */
- private static boolean USE_MSSQL_SERVER;
-
private static boolean USE_TERADATA;
public static List getResources() {
-
- if (!(USE_DERBY || USE_MYSQL || USE_MYSQL_OLD_DRIVER || USE_MSSQL_SERVER || USE_ORACLE || USE_TERADATA)) {
- USE_TERADATA = true;
- }
-
+ USE_TERADATA = true;
List result = new ArrayList<>();
- result.addAll(getDerbyResource());
- result.addAll(getMySqlResource());
- result.addAll(getOracleResource());
- result.addAll(getSqlServerResource());
result.addAll(getTeradataResource());
return result;
}
- public static List getDerbyResource() {
- if (USE_DERBY) {
- final DerbyTestDatabase derbyTestDatabase = new DerbyTestDatabase();
- return singletonList(new Object[] {"integration/config/derby-datasource.xml", derbyTestDatabase,
- derbyTestDatabase.getDbType(), emptyList()});
- } else {
- return emptyList();
- }
- }
-
- public static List getMySqlResource() {
- if (USE_MYSQL || USE_MYSQL_OLD_DRIVER) {
- final MySqlTestDatabase mySqlTestDatabase = new MySqlTestDatabase();
- return singletonList(new Object[] {"integration/config/mysql-db-config.xml", mySqlTestDatabase,
- mySqlTestDatabase.getDbType(), emptyList()});
- } else {
- return emptyList();
- }
- }
-
- public static List getOracleResource() {
- if (USE_ORACLE) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- return singletonList(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- } else {
- return emptyList();
- }
- }
-
- public static List getSqlServerResource() {
- if (USE_MSSQL_SERVER) {
- final SqlServerTestDataBase sqlServerTestDataBase = new SqlServerTestDataBase();
- return singletonList(new Object[] {"integration/config/mssql-db-config.xml", sqlServerTestDataBase,
- sqlServerTestDataBase.getDbType(), singletonList("merge")});
- } else {
- return emptyList();
- }
- }
-
public static List getTeradataResource() {
if (USE_TERADATA) {
final TeradataTestDatabase teradataTestDataBase = new TeradataTestDatabase();
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingMySqlTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingMySqlTestCase.java
deleted file mode 100644
index 22776eae3..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingMySqlTestCase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity;
-
-import static java.lang.System.getProperty;
-import static java.lang.System.setProperty;
-import static org.mule.extension.db.integration.TestDbConfig.getMySqlResource;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.runners.Parameterized;
-
-public class DataSourcePoolingMySqlTestCase extends DataSourcePoolingTestCase {
-
- private static final String DB_HOST_KEY = "db.host";
- private static final String DB_HOST_VALUE = "0.0.0.0";
- private static final String DB_PORT_KEY = "db.port";
- private static final String DB_PORT_VALUE = getProperty("mysql.db.port");
-
- @Before
- public void setUp() {
- setProperty(DB_HOST_KEY, DB_HOST_VALUE);
- setProperty(DB_PORT_KEY, DB_PORT_VALUE);
- setConcurrentRequests(2);
- }
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- return getMySqlResource();
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/connectivity/mysql-db-pooling-config.xml",
- "integration/connectivity/connection-pooling-config.xml"};
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingOracleTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingOracleTestCase.java
deleted file mode 100644
index 06e34903d..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingOracleTestCase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity;
-
-import static java.lang.System.getProperty;
-import static java.lang.System.setProperty;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.runners.Parameterized;
-
-public class DataSourcePoolingOracleTestCase extends DataSourcePoolingTestCase {
-
- private static final String DB_HOST_KEY = "db.host";
- private static final String DB_HOST_VALUE = "0.0.0.0";
- private static final String DB_PORT_KEY = "db.port";
- private static final String DB_PORT_VALUE = getProperty("oracle.db.port");
-
- @Before
- public void setUp() {
- setProperty(DB_HOST_KEY, DB_HOST_VALUE);
- setProperty(DB_PORT_KEY, DB_PORT_VALUE);
- setConcurrentRequests(2);
- }
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- return getOracleResource();
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/connectivity/oracle-db-pooling-config.xml",
- "integration/connectivity/connection-pooling-config.xml"};
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingTestCase.java
index 934ccb059..2dd115012 100644
--- a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/connectivity/DataSourcePoolingTestCase.java
@@ -10,7 +10,7 @@
import static java.util.stream.IntStream.range;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
+import static org.mule.extension.db.integration.TestDbConfig.getTeradataResource;
import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
@@ -39,7 +39,7 @@ public class DataSourcePoolingTestCase extends AbstractDbIntegrationTestCase {
@Parameterized.Parameters(name = "{2}")
public static List parameters() {
- return getDerbyResource();
+ return getTeradataResource();
}
@Before
@@ -54,7 +54,7 @@ protected void setConcurrentRequests(int count) {
@Override
protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/config/derby-pooling-db-config.xml",
+ return new String[] {"integration/connectivity/teradata-db-pooling-config.xml",
"integration/connectivity/connection-pooling-config.xml"};
}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourceSqlServerTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/DataSourceSqlServerTestCase.java
deleted file mode 100644
index 24bb5d326..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/DataSourceSqlServerTestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity;
-
-import static java.lang.System.getProperty;
-import static java.lang.System.setProperty;
-import static org.mule.extension.db.integration.TestDbConfig.getSqlServerResource;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.runners.Parameterized;
-
-public class DataSourceSqlServerTestCase extends DataSourcePoolingTestCase {
-
- private static final String DB_HOST_KEY = "db.host";
- private static final String DB_HOST_VALUE = "0.0.0.0";
- private static final String DB_USER_KEY = "db.user";
- private static final String DB_USER_VALUE = "sa";
- private static final String DB_PORT_KEY = "db.port";
- private static final String DB_PORT_VALUE = getProperty("mssql.db.port");
-
- @Before
- public void setUp() {
- setProperty(DB_HOST_KEY, DB_HOST_VALUE);
- setProperty(DB_USER_KEY, DB_USER_VALUE);
- setProperty(DB_PORT_KEY, DB_PORT_VALUE);
- setConcurrentRequests(2);
- }
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- return getSqlServerResource();
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/connectivity/sqlserver-db-pooling-config.xml",
- "integration/connectivity/connection-pooling-config.xml"};
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/StalePooledConnectionResetTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/StalePooledConnectionResetTestCase.java
index 9b12a0b07..97ba1f151 100644
--- a/src/test/java/org/mule/extension/db/integration/connectivity/StalePooledConnectionResetTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/connectivity/StalePooledConnectionResetTestCase.java
@@ -11,7 +11,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.fail;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
+
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.runtime.core.api.event.CoreEvent;
@@ -21,16 +22,14 @@
import org.junit.Test;
import org.junit.runners.Parameterized;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports
+// Stale Pooled Connection Reset.
+@Ignore
public class StalePooledConnectionResetTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters
- public static List parameters() {
- return getDerbyResource();
- }
-
@Override
protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/connectivity/derby-db-pool-reset-config.xml"};
+ return new String[] {"integration/connectivity/teradata-db-pooling-config.xml"};
}
@Test
@@ -47,12 +46,12 @@ public void resetsStalePooledConnection() throws Exception {
}
private void startDatabase() throws SQLException {
- registerDriver(new org.apache.derby.jdbc.EmbeddedDriver());
+ registerDriver(new com.teradata.jdbc.TeraDriver());
}
private void stopDatabase() {
try {
- getConnection("jdbc:derby:;shutdown=true");
+ getConnection("jdbc:teradata:;shutdown=true");
fail("Expected to throw an exception while shutting down the database");
} catch (Exception e) {
// Expected
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/negative/MissingDriverNegativeTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/negative/MissingDriverNegativeTestCase.java
index 74aedbf58..d56218775 100644
--- a/src/test/java/org/mule/extension/db/integration/connectivity/negative/MissingDriverNegativeTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/connectivity/negative/MissingDriverNegativeTestCase.java
@@ -12,8 +12,6 @@
import static org.mule.tck.junit4.matcher.ErrorTypeMatcher.errorType;
import org.junit.Ignore;
-import org.mule.extension.db.internal.domain.connection.oracle.OracleDbConnectionProvider;
-
import org.junit.Assume;
import org.junit.Test;
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/negative/MySqlNegativeConnectivityTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/negative/MySqlNegativeConnectivityTestCase.java
deleted file mode 100644
index 6956b7467..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/negative/MySqlNegativeConnectivityTestCase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity.negative;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.mule.db.commons.api.exception.connection.DbError.CANNOT_REACH;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_CREDENTIALS;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_DATABASE;
-import static org.mule.tck.junit4.matcher.ErrorTypeMatcher.errorType;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class MySqlNegativeConnectivityTestCase extends AbstractDbNegativeConnectivityTestCase {
-
- @Test
- public void mySqlConfigInvalidHost() {
- utils.assertFailedConnection("mySqlConfigInvalidHost", IS_CONNECTION_EXCEPTION, is(errorType(CANNOT_REACH)));
- }
-
- @Test
- public void mySqlConfigInvalidCredentials() {
- utils.assertFailedConnection("mySqlConfigInvalidCredentials", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_CREDENTIALS)));
- }
-
- @Test
- public void mySqlConfigInvalidDatabaseName() {
- utils.assertFailedConnection("mySqlConfigInvalidDatabaseName", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_DATABASE)));
- }
-
- @Test
- public void mySqlConfigInvalidSocketTimeoutValue() {
- utils.assertFailedConnection("mySqlConfigInvalidSocketTimeoutValue", IS_CONNECTION_EXCEPTION, is(errorType(CANNOT_REACH)));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/negative/OracleNegativeConnectivityTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/negative/OracleNegativeConnectivityTestCase.java
deleted file mode 100644
index ac4f73304..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/negative/OracleNegativeConnectivityTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity.negative;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.mule.db.commons.api.exception.connection.DbError.CANNOT_REACH;
-import static org.mule.db.commons.api.exception.connection.DbError.CONNECTIVITY;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_CREDENTIALS;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_DATABASE;
-import static org.mule.tck.junit4.matcher.ErrorTypeMatcher.errorType;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class OracleNegativeConnectivityTestCase extends AbstractDbNegativeConnectivityTestCase {
-
- @Test
- public void oracleConfigInvalidCredentials() {
- utils.assertFailedConnection("oracleConfigInvalidCredentials", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_CREDENTIALS)));
- }
-
- @Test
- public void oracleInstanceAndServiceNameAtTheSameType() {
- utils.assertFailedConnection("oracleInstanceAndServiceNameAtTheSameType", IS_CONNECTION_EXCEPTION,
- is(errorType(CONNECTIVITY)));
- }
-
- @Test
- public void oracleConfigUnknownInstance() {
- utils.assertFailedConnection("oracleConfigUnknownInstance", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_DATABASE)));
- }
-
- @Test
- public void oracleConfigUnknownHost() {
- utils.assertFailedConnection("oracleConfigUnknownHost", IS_CONNECTION_EXCEPTION, is(errorType(CANNOT_REACH)));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/connectivity/negative/SqlServerNegativeConnectivityTestCase.java b/src/test/java/org/mule/extension/db/integration/connectivity/negative/SqlServerNegativeConnectivityTestCase.java
deleted file mode 100644
index ae5f62928..000000000
--- a/src/test/java/org/mule/extension/db/integration/connectivity/negative/SqlServerNegativeConnectivityTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.connectivity.negative;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.mule.db.commons.api.exception.connection.DbError.CANNOT_REACH;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_CREDENTIALS;
-import static org.mule.db.commons.api.exception.connection.DbError.INVALID_DATABASE;
-import static org.mule.tck.junit4.matcher.ErrorTypeMatcher.errorType;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class SqlServerNegativeConnectivityTestCase extends AbstractDbNegativeConnectivityTestCase {
-
- @Test
- public void invalidHost() {
- utils.assertFailedConnection("sqlServerInvalidHost", IS_CONNECTION_EXCEPTION, is(errorType(CANNOT_REACH)));
- }
-
- @Test
- public void invalidCredentials() {
- utils.assertFailedConnection("sqlServerInvalidCredentials", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_CREDENTIALS)));
- }
-
- @Test
- public void invalidCredentialsForUser() {
- utils.assertFailedConnection("sqlServerInvalidCredentialsForUser", IS_CONNECTION_EXCEPTION,
- is(errorType(INVALID_CREDENTIALS)));
- }
-
- @Test
- public void invalidDatabase() {
- utils.assertFailedConnection("sqlServerInvalidDatabase", IS_CONNECTION_EXCEPTION, is(errorType(INVALID_DATABASE)));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/function/oracle/CreateArrayOracleTestCase.java b/src/test/java/org/mule/extension/db/integration/function/oracle/CreateArrayOracleTestCase.java
deleted file mode 100644
index ad5277d66..000000000
--- a/src/test/java/org/mule/extension/db/integration/function/oracle/CreateArrayOracleTestCase.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.function.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.runtime.api.metadata.TypedValue;
-import org.mule.runtime.core.api.event.CoreEvent;
-
-import java.math.BigDecimal;
-import java.sql.Array;
-import java.sql.Clob;
-import java.sql.SQLException;
-import java.sql.Struct;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class CreateArrayOracleTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameter(4)
- public String flowSuffix;
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "Create-Array"});
- }
- return configs;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/function/oracle/create-array.xml"};
- }
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).createPersonTable(getDefaultDataSource().getConnection());
- }
-
- @Test
- public void createArrayWithClobDataType() throws Exception {
- createArrayWithClob("createArrayFromObjectArray");
- }
-
- @Test
- public void createArrayFromList() throws Exception {
- createArrayWithClob("createArrayFromDWArray");
- }
-
- @Test
- public void createArrayFromStruct() throws Exception {
- createArrayWithClob("createArrayFromStruct");
- }
-
- private void createArrayWithClob(String createArrayFromStruct) throws Exception {
- CoreEvent createArray = flowRunner(createArrayFromStruct).run();
- TypedValue personTable = (TypedValue) createArray.getVariables().get("PERSON");
- validateOutputSQLArray(personTable);
- }
-
- private void validateOutputSQLArray(TypedValue personTable) throws SQLException {
- Object[] array = (Object[]) personTable.getValue().getArray();
- Struct struct = (Struct) array[0];
- Object[] attributes = struct.getAttributes();
-
- assertThat(attributes[0], is(instanceOf(String.class)));
- assertThat(attributes[1], is(instanceOf(Clob.class)));
- assertThat(attributes[2], is(instanceOf(BigDecimal.class)));
- }
-
- @After
- public void clean() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).dropPersonTable(getDefaultDataSource().getConnection());
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/function/oracle/CreateStructOracleTestCase.java b/src/test/java/org/mule/extension/db/integration/function/oracle/CreateStructOracleTestCase.java
deleted file mode 100644
index 4bc6e6e2d..000000000
--- a/src/test/java/org/mule/extension/db/integration/function/oracle/CreateStructOracleTestCase.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.function.oracle;
-
-import static java.lang.reflect.Array.get;
-import static java.util.Collections.emptyList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.runtime.core.api.event.CoreEvent;
-
-import java.sql.SQLException;
-import java.sql.Struct;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class CreateStructOracleTestCase extends AbstractDbIntegrationTestCase {
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).createPersonType(getDefaultDataSource().getConnection());
- }
-
- @Parameterized.Parameter(4)
- public String flowSuffix;
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "Create-Struct"});
- }
- return configs;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/function/oracle/create-struct.xml"};
- }
-
- @Test
- public void createStructWithClobDataType() throws Exception {
- Object[] person = new Object[] {1234, "Apple", 45};
-
- CoreEvent coreEvent = flowRunner("createStruct")
- .withVariable("struct", person).run();
-
- Object result = coreEvent.getVariables().get("STRUCT").getValue();
- assertThat(result, instanceOf(java.sql.Struct.class));
-
- Struct struct = (Struct) result;
-
- assertThat(struct.getAttributes().length, is(3));
-
- Object clobAttribute = get(struct.getAttributes(), 1);
-
- assertThat(clobAttribute.getClass().getName(), is("oracle.sql.CLOB"));
- }
-
- @After
- public void clean() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).dropPersonType(getDefaultDataSource().getConnection());
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/insert/oracle/AbstractOracleInsertNestedTableTestCase.java b/src/test/java/org/mule/extension/db/integration/insert/oracle/AbstractOracleInsertNestedTableTestCase.java
deleted file mode 100644
index d80017ec9..000000000
--- a/src/test/java/org/mule/extension/db/integration/insert/oracle/AbstractOracleInsertNestedTableTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.insert.oracle;
-
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.runtime.api.streaming.object.CursorIterator;
-import org.mule.runtime.api.streaming.object.CursorIteratorProvider;
-
-import java.sql.SQLException;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public abstract class AbstractOracleInsertNestedTableTestCase extends AbstractDbIntegrationTestCase {
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).initUdts(getDefaultDataSource().getConnection());
- }
-
- @Parameterized.Parameter(4)
- public String flowSuffix;
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/insert/oracle/insert-nested-tables.xml"};
- }
-
- @Test
- public void insertAndSelect() throws Exception {
- flowRunner("insertNestedTables")
- .withVariable("id", 123)
- .withVariable("name", "Apple")
- .withVariable("quantity", 456)
- .run();
-
- Object selectNestedTables = flowRunner("selectNestedTables")
- .keepStreamsOpen()
- .run().getMessage().getPayload().getValue();
-
- CursorIteratorProvider result = (CursorIteratorProvider) selectNestedTables;
- CursorIterator cursorIterator = result.openCursor();
-
- while (cursorIterator.hasNext()) {
- Map row = (Map) cursorIterator.next();
- assertRow(row);
- }
- }
-
- protected abstract void assertRow(Map row);
-}
diff --git a/src/test/java/org/mule/extension/db/integration/insert/oracle/WithMappingInsertNestedTablesTestCase.java b/src/test/java/org/mule/extension/db/integration/insert/oracle/WithMappingInsertNestedTablesTestCase.java
deleted file mode 100644
index 8a784dea4..000000000
--- a/src/test/java/org/mule/extension/db/integration/insert/oracle/WithMappingInsertNestedTablesTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.insert.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.select.Fruit;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.runners.Parameterized;
-
-public class WithMappingInsertNestedTablesTestCase extends AbstractOracleInsertNestedTableTestCase {
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-with-column-types-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "With-Mapping"});
- }
- return configs;
- }
-
- @Override
- protected void assertRow(Map row) {
- Object[] fruits = (Object[]) row.get("FRUITS");
- Object possibleFruit = fruits[0];
- assertThat(possibleFruit, is(instanceOf(Fruit.class)));
-
- Fruit fruit = (Fruit) possibleFruit;
- assertThat(fruit.getFruitID(), is(123L));
- assertThat(fruit.getFruitName(), is("Apple"));
- assertThat(fruit.getFruitQuantity(), is(456));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/insert/oracle/WithOutMappingInsertNestedTablesTestCase.java b/src/test/java/org/mule/extension/db/integration/insert/oracle/WithOutMappingInsertNestedTablesTestCase.java
deleted file mode 100644
index b2efc7b41..000000000
--- a/src/test/java/org/mule/extension/db/integration/insert/oracle/WithOutMappingInsertNestedTablesTestCase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.insert.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.runners.Parameterized;
-
-public class WithOutMappingInsertNestedTablesTestCase extends AbstractOracleInsertNestedTableTestCase {
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "With-Out-Mapping"});
- }
- return configs;
- }
-
-
- @Override
- protected void assertRow(Map row) {
- Object[] fruits = (Object[]) row.get("FRUITS");
- Object possibleFruit = fruits[0];
- assertThat(possibleFruit, is(instanceOf(Object[].class)));
-
- Object[] fruit = (Object[]) possibleFruit;
- assertThat(fruit[0], is(new BigDecimal(123L)));
- assertThat(fruit[1], is("Apple"));
- assertThat(fruit[2], is(new BigDecimal(456L)));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/model/DerbyTestDatabase.java b/src/test/java/org/mule/extension/db/integration/model/DerbyTestDatabase.java
deleted file mode 100644
index df37f6ff3..000000000
--- a/src/test/java/org/mule/extension/db/integration/model/DerbyTestDatabase.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.model;
-
-import org.mule.extension.db.integration.DbTestUtil;
-import org.mule.extension.db.integration.model.derbyutil.DerbyTestStoredProcedure;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Date;
-
-import javax.sql.DataSource;
-
-public class DerbyTestDatabase extends AbstractTestDatabase {
-
- @Override
- public DbTestUtil.DbType getDbType() {
- return DbTestUtil.DbType.DERBY;
- }
-
- private static final String DERBY_ERROR_OBJECT_ALREADY_EXISTS = "X0Y68";
-
- public static String SQL_CREATE_SP_UPDATE_TEST_TYPE_1 =
- "CREATE PROCEDURE updateTestType1()\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "MODIFIES SQL DATA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".updateTestType1'";
-
- public static String SQL_CREATE_SP_PARAM_UPDATE_TEST_TYPE_1 =
- "CREATE PROCEDURE updateParamTestType1(name VARCHAR(40))\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "MODIFIES SQL DATA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".updateParameterizedTestType1'";
-
- public static String SQL_CREATE_SP_PARAM_UPDATE_PLANET_DESCRIPTION =
- "CREATE PROCEDURE updatePlanetDescription(name VARCHAR(40), description CLOB)\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "MODIFIES SQL DATA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".updatePlanetDescription'";
-
- public static String SQL_CREATE_SP_GET_LANGUAGE_SAMPLE_TEXT =
- "CREATE PROCEDURE getSpanishLanguageSample(INOUT language CLOB)\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".getSpanishLanguageSample'";
-
- public static String SQL_CREATE_SP_COUNT_RECORDS =
- "CREATE PROCEDURE countTestRecords(OUT COUNT INTEGER)\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "READS SQL DATA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".countTestRecords'";
-
- public static String SQL_CREATE_SP_GET_RECORDS =
- "CREATE PROCEDURE getTestRecords()\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "READS SQL DATA\n" +
- "DYNAMIC RESULT SETS 1\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".getTestRecords'";
-
- public static String SQL_CREATE_SP_GET_SPLIT_RECORDS =
- "CREATE PROCEDURE getSplitTestRecords()\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "READS SQL DATA\n" +
- "DYNAMIC RESULT SETS 2\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".getSplitTestRecords'";
-
- public static String SQL_CREATE_SP_DOUBLE_MY_INT =
- "CREATE PROCEDURE doubleMyInt(INOUT MYINT INTEGER)\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".doubleMyInt'";
-
- public static String SQL_CREATE_SP_MULTIPLY_INTS =
- "CREATE PROCEDURE multiplyInts(IN INT1 INTEGER, IN INT2 INTEGER, OUT RESULT1 INTEGER, IN INT3 INTEGER, OUT RESULT2 INTEGER)\n"
- +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".multiplyInts'";
-
- public static String SQL_CREATE_SP_RETURN_NULL_VALUE =
- "CREATE PROCEDURE returnNullValue(IN INT1 VARCHAR(100), IN INT2 VARCHAR(100), OUT RESULT VARCHAR(200))\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".returnNullValue'";
-
- public static String SQL_CREATE_SP_CONCATENATE_STRINGS =
- "CREATE PROCEDURE concatenateStrings(IN INT1 VARCHAR(100), IN INT2 VARCHAR(100), OUT RESULT VARCHAR(200))\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".concatenateStrings'";
-
- public static final String SQL_CREATE_DELAY_FUNCTION =
- "create function delay(SECONDS INTEGER) " +
- "returns INTEGER language java parameter style java external name " +
- "'" + DerbyTestStoredProcedure.class.getName() + ".timeDelay'";
-
- public static final String SQL_CREATE_CONTACT_DETAIL_FUNCTION =
- "create function createContactDetails(DESCRIPTION VARCHAR(32), PHONE VARCHAR(32), EMAIL VARCHAR(32)) "
- + "returns CONTACT_DETAILS language java parameter style java external name " + "'"
- + DerbyTestStoredProcedure.class.getName() + ".createContactDetails'";
-
- public static final String SQL_CREATE_SP_GET_MANAGER_DETAILS =
- "CREATE PROCEDURE getManagerDetails(IN NAME VARCHAR(32), OUT RESULT CONTACT_DETAILS)\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".getManagerDetails'";
-
- public static final String CREATE_CONTACT_DETAILS_TYPE =
- "CREATE TYPE CONTACT_DETAILS EXTERNAL NAME '" + ContactDetails.class.getName() + "' LANGUAGE JAVA";
-
- public static final String SQL_CREATE_SP_ADD_ONE =
- "CREATE PROCEDURE mathFunction.addOne(INOUT number INTEGER)" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".addOne'";
-
- public static final String SQL_CREATE_SP_ADD_ONE_DEFAULT_SCHEMA =
- "CREATE PROCEDURE addOne(INOUT number INTEGER)" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".substractOne'";
-
- public static String SQL_CREATE_SP_CONCATENATE_STRING_DATE =
- "CREATE PROCEDURE concatStringDate(IN DATE DATE, IN TEXT VARCHAR(100), OUT RESULT VARCHAR(200))\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".concatStringDate'";
-
- public static String SQL_CREATE_SP_CONCATENATE_STRING_TIMESTAMP =
- "CREATE PROCEDURE concatStringTimestamp(IN TEXT VARCHAR(100), IN DATE_TIME TIMESTAMP, OUT RESULT VARCHAR(200))\n" +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".concatStringTimestamp'";
-
- public static String SQL_CREATE_SP_EXTRACT_REDUCED_BIO =
- "CREATE PROCEDURE getReducedBiography(IN NAME VARCHAR(100), IN BIRTH_DATE DATE, IN PLACE_BIRTH VARCHAR(100), IN DIED TIMESTAMP, IN PLACE_DEATH VARCHAR(100), IN PROFESSION VARCHAR(50), IN ALMA_MATER VARCHAR(50), IN NATIONALITY VARCHAR(50), IN CHILDREN INTEGER, IN SPOUSE VARCHAR(50), IN MOTHER VARCHAR(50), IN FATHER VARCHAR(50), IN BIO CLOB, OUT RESULT VARCHAR(200))\n"
- +
- "PARAMETER STYLE JAVA\n" +
- "LANGUAGE JAVA\n" +
- "DYNAMIC RESULT SETS 0\n" +
- "EXTERNAL NAME '" + DerbyTestStoredProcedure.class.getName() + ".getReducedBiography'";
-
- @Override
- public void grantUserAllAccess(DataSource dataSource) throws SQLException {
- executeDdl(dataSource,
- "GRANT ALL\n" +
- "ON INTEGRATION_TEST\n" +
- "TO dbc;\n COMMIT WORK; \n");
- }
-
- @Override
- public void createPlanetTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE PLANET(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,POSITION INTEGER,NAME VARCHAR(255), PICTURE BLOB, DESCRIPTION CLOB)");
- }
-
- @Override
- public void createSpaceshipTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE SPACESHIP(ID INTEGER GENERATED BY DEFAULT AS IDENTITY(START WITH 0) NOT NULL PRIMARY KEY,MODEL VARCHAR(255), MANUFACTURER VARCHAR(255))");
- }
-
- @Override
- public void createLanguagesTable(Connection connection) throws SQLException {
- executeDdl(connection, "CREATE TABLE LANGUAGES (NAME VARCHAR(128), SAMPLE_TEXT CLOB)");
- }
-
- @Override
- public void createMathFunctionSchema(Connection connection) throws SQLException {
- createSchema(connection, "CREATE SCHEMA AUTHORIZATION mathFunction");
- }
-
- @Override
- protected String getInsertPlanetSql(String name, int position) {
- return "INSERT INTO PLANET(POSITION, NAME) VALUES (" + position + ", '" + name + "')";
- }
-
- @Override
- public void createStoredProcedureUpdateTestType1(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_UPDATE_TEST_TYPE_1);
- }
-
- @Override
- public void createStoredProcedureGetSpanishLanguageSampleText(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_LANGUAGE_SAMPLE_TEXT);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdatePlanetDescription(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_PARAM_UPDATE_PLANET_DESCRIPTION);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdateTestType1(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_PARAM_UPDATE_TEST_TYPE_1);
- }
-
- @Override
- public void createStoredProcedureCountRecords(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_COUNT_RECORDS);
- }
-
- @Override
- public void createStoredProcedureGetRecords(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_RECORDS);
- }
-
- @Override
- public void createStoredProcedureGetSplitRecords(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_SPLIT_RECORDS);
- }
-
- @Override
- public void createStoredProcedureDoubleMyInt(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_DOUBLE_MY_INT);
- }
-
- @Override
- public void createStoredProcedureAddOne(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_ADD_ONE);
- }
-
- @Override
- public void createStoredProcedureAddOneDefaultSchema(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_ADD_ONE_DEFAULT_SCHEMA);
- }
-
- @Override
- protected boolean supportsSimpleUdt() {
- return true;
- }
-
- @Override
- public void createStoredProcedureGetManagerDetails(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_MANAGER_DETAILS);
- }
-
- @Override
- protected void createContactDetailsType(Connection connection) throws SQLException {
- try {
- String ddl = CREATE_CONTACT_DETAILS_TYPE;
-
- executeDdl(connection, ddl);
- } catch (SQLException e) {
- // Ignore exception when type already exists
- if (!DERBY_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-
- @Override
- protected void deleteRegionManagersTable(Connection connection) throws SQLException {
- executeUpdate(connection, "DELETE FROM REGION_MANAGERS");
- }
-
- @Override
- protected void createRegionManagersTable(Connection connection) throws SQLException {
- String ddl = "CREATE TABLE REGION_MANAGERS(" + "REGION_NAME VARCHAR(32) NOT NULL PRIMARY KEY,"
- + "MANAGER_NAME VARCHAR(32) NOT NULL," + "DETAILS CONTACT_DETAILS NOT NULL)";
- executeDdl(connection, ddl);
-
- executeDdl(connection, SQL_CREATE_CONTACT_DETAIL_FUNCTION);
- }
-
- @Override
- protected String getInsertRegionManagerSql(RegionManager regionManager) {
- StringBuilder builder = new StringBuilder("INSERT INTO REGION_MANAGERS VALUES ('").append(regionManager.getRegionName())
- .append("', '").append(regionManager.getName()).append("', createContactDetails('")
- .append(regionManager.getContactDetails().getDescription()).append("', '")
- .append(regionManager.getContactDetails().getPhoneNumber()).append("', '")
- .append(regionManager.getContactDetails().getEmail()).append("'))");
-
- return builder.toString();
- }
-
- @Override
- public void createStoredProcedureMultiplyInts(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_MULTIPLY_INTS);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringDate(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_CONCATENATE_STRING_DATE);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringTimestamp(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_CONCATENATE_STRING_TIMESTAMP);
- }
-
- @Override
- public void createStoredProcedureExtractReducedBio(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_EXTRACT_REDUCED_BIO);
- }
-
- @Override
- public void returnNullValue(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_RETURN_NULL_VALUE);
- }
-
- @Override
- public void createStoredProcedureConcatenateStrings(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_SP_CONCATENATE_STRINGS);
- }
-
- @Override
- public void createDelayFunction(DataSource dataSource) throws SQLException {
- createStoredProcedure(dataSource, SQL_CREATE_DELAY_FUNCTION);
- }
-
- @Override
- public String getInsertLanguageSql(String name, String sampleText) {
- return "INSERT INTO LANGUAGES VALUES ('" + name + "', '" + sampleText + "')";
- }
-
- public void createStoredProcedure(DataSource dataSource, String sql) throws SQLException {
- try {
- super.createStoredProcedure(dataSource, sql);
- } catch (SQLException e) {
- // Ignore exception when stored procedure already exists
- if (!DERBY_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-
- public void createSchema(Connection connection, String sql) throws SQLException {
- try {
- executeDdl(connection, sql);
- } catch (SQLException e) {
- // Ignore exception when user already exists
- if (!DERBY_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/model/MySqlTestDatabase.java b/src/test/java/org/mule/extension/db/integration/model/MySqlTestDatabase.java
deleted file mode 100644
index e22f6b569..000000000
--- a/src/test/java/org/mule/extension/db/integration/model/MySqlTestDatabase.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.model;
-
-import org.mule.extension.db.integration.DbTestUtil;
-import org.mule.metadata.api.model.MetadataType;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-public class MySqlTestDatabase extends AbstractTestDatabase {
-
- @Override
- public DbTestUtil.DbType getDbType() {
- return DbTestUtil.DbType.MYSQL;
- }
-
- public static String SQL_CREATE_SP_UPDATE_TEST_TYPE_1 = "CREATE DEFINER=CURRENT_USER PROCEDURE updateTestType1()\n" + "BEGIN\n"
- + " UPDATE PLANET SET NAME='Mercury' WHERE POSITION=4;\n" + "END;";
-
- public static String SQL_CREATE_SP_GET_RECORDS =
- "CREATE DEFINER=CURRENT_USER PROCEDURE getTestRecords()\n" + "BEGIN\n" + " SELECT * FROM PLANET;\n" + "END;";
-
- public static String SQL_CREATE_SP_GET_SPLIT_RECORDS = "CREATE DEFINER=CURRENT_USER PROCEDURE getSplitTestRecords()\n"
- + "BEGIN\n" + " SELECT * FROM PLANET WHERE POSITION <= 2;\n" + " SELECT * FROM PLANET WHERE POSITION > 2;\n" + "END;";
-
- @Override
- public void grantUserAllAccess(DataSource dataSource) throws SQLException {
- executeDdl(dataSource,
- "GRANT ALL\n" +
- "ON INTEGRATION_TEST\n" +
- "TO dbc;\n COMMIT WORK; \n");
- }
-
- @Override
- public void createPlanetTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE PLANET(ID INTEGER NOT NULL AUTO_INCREMENT,POSITION INTEGER,NAME VARCHAR(255), PICTURE BLOB, DESCRIPTION LONGTEXT, PRIMARY KEY (ID))");
- }
-
- @Override
- public void createSpaceshipTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE SPACESHIP(ID INTEGER NOT NULL AUTO_INCREMENT,MODEL VARCHAR(255), MANUFACTURER VARCHAR(255), PRIMARY KEY (ID))");
- }
-
- @Override
- public void createLanguagesTable(Connection connection) throws SQLException {
- executeDdl(connection, "CREATE TABLE LANGUAGES (NAME VARCHAR(128), SAMPLE_TEXT LONGTEXT)");
- }
-
- @Override
- public void createMathFunctionSchema(Connection connection) throws SQLException {
- executeDdl(connection, "CREATE SCHEMA IF NOT EXISTS mathFunction");
- }
-
- @Override
- protected String getInsertPlanetSql(String name, int position) {
- return "INSERT INTO PLANET(POSITION, NAME) VALUES (" + position + ", '" + name + "')";
- }
-
- @Override
- public void createStoredProcedureGetRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getTestRecords;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_RECORDS);
- }
-
- @Override
- public void createStoredProcedureUpdateTestType1(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updateTestType1;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_UPDATE_TEST_TYPE_1);
- }
-
- @Override
- public void createStoredProcedureGetSpanishLanguageSampleText(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getSpanishLanguageSample;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE getSpanishLanguageSample(INOUT language LONGTEXT)\n" +
- "BEGIN\n" +
- " SELECT SAMPLE_TEXT INTO language FROM LANGUAGES WHERE NAME = 'Spanish';\n" +
- "END;\n";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdatePlanetDescription(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updatePlanetDescription;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE updatePlanetDescription(IN pName VARCHAR(50), IN pDescription LONGTEXT)\n" +
- "BEGIN\n" +
- "update PLANET SET DESCRIPTION=pDescription where NAME = pName;\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdateTestType1(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updateParamTestType1;\n");
-
- final String sql = "CREATE DEFINER=CURRENT_USER PROCEDURE updateParamTestType1(IN pName VARCHAR(50))\n" +
- "BEGIN\n" +
- " DECLARE name VARCHAR(50);\n" +
- " SET name = pName;\n" +
- " IF pName IS NULL THEN SET name = 'NullLand';\n" +
- " END IF;\n" +
- " UPDATE PLANET SET NAME=name WHERE POSITION=4;\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureCountRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS countTestRecords;\n");
-
- final String sql = "CREATE DEFINER=CURRENT_USER PROCEDURE countTestRecords(OUT pResult INT)\n" + "BEGIN\n"
- + "select count(*) into pResult from PLANET;\n" + "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringDate(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatStringDate;\n");
-
- final String sql =
- "CREATE PROCEDURE concatStringDate(IN pDate DATE, IN pText VARCHAR(50), OUT pResult VARCHAR(100))\n"
- + "BEGIN\n"
- + " SET pResult := CONCAT(pText, pDate);\n"
- + "END;";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringTimestamp(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatStringTimestamp;\n");
-
- final String sql =
- "CREATE PROCEDURE concatStringTimestamp(IN pText VARCHAR(50), IN pTimestamp TIMESTAMP, OUT pResult VARCHAR(100))\n"
- + "BEGIN\n"
- + " SET pResult := CONCAT(pText, pTimestamp);\n"
- + "END;";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureExtractReducedBio(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getReducedBiography;\n");
-
- final String sql =
- "CREATE PROCEDURE getReducedBiography(IN pName VARCHAR(50), IN pBirthDate DATE, IN pPlaceBirth VARCHAR(50), IN timestamp TIMESTAMP, IN pPlaceDeath VARCHAR(50), IN pProfession VARCHAR(50), IN pAlmaMater VARCHAR(50), IN pNationality VARCHAR(50), IN pChildren INTEGER, IN pSpouse VARCHAR(50), IN father VARCHAR(50), IN mother VARCHAR(50), IN bio VARCHAR(500), OUT pResult VARCHAR(100))\n"
- + "BEGIN\n"
- + " SET pResult := CONCAT(pName, \" was born \", pBirthDate, \", in \", pPlaceBirth, \" and died in \", pPlaceDeath);\n"
- + "END;";
- createStoredProcedure(dataSource, sql);
- }
-
-
- @Override
- public void createStoredProcedureGetSplitRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getSplitTestRecords;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_SPLIT_RECORDS);
-
- }
-
- @Override
- public void createStoredProcedureDoubleMyInt(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS doubleMyInt;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE doubleMyInt(INOUT pInt INT)\n" + "BEGIN\n" + "SET pInt := pInt * 2;\n" + "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureAddOne(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS mathFunction.addOne");
-
- final String sql = "CREATE PROCEDURE mathFunction.addOne(INOUT num INT)\n" +
- "BEGIN\n" +
- " SET num := num + 1;\n" +
- "END;";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureAddOneDefaultSchema(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS addOne");
-
- String sql = "CREATE PROCEDURE addOne(INOUT num INT)\n" +
- "BEGIN\n" +
- " SET num := num - 1;\n" +
- "END;";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureMultiplyInts(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS multiplyInts;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE multiplyInts(IN pInt1 INT, IN pInt2 INT, OUT pResult1 INT, IN pInt3 INT, OUT pResult2 INT)\n"
- + "BEGIN\n" + "SET pResult1 := pInt1 * pInt2;\n" + "SET pResult2 := pInt1 * pInt2 * pInt3;\n" + "END";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void returnNullValue(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS returnNullValue;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE returnNullValue(IN pString1 VARCHAR(50), IN pString2 VARCHAR(50), OUT pResult VARCHAR(100))\n"
- + "BEGIN\n" + "SET pResult := null;\n" + "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStrings(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatenateStrings;\n");
-
- final String sql =
- "CREATE DEFINER=CURRENT_USER PROCEDURE concatenateStrings(IN pString1 VARCHAR(50), IN pString2 VARCHAR(50), OUT pResult VARCHAR(100))\n"
- + "BEGIN\n" + "SET pResult := CONCAT(pString1, pString2);\n" + "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createDelayFunction(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP FUNCTION IF EXISTS DELAY;\n");
-
- final String sql =
- "CREATE FUNCTION DELAY(seconds INTEGER) RETURNS INTEGER DETERMINISTIC\n" + "BEGIN\n" + " DO SLEEP(seconds * 1000);\n"
- + " RETURN 1;\n" + "END;";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public MetadataType getDescriptionFieldMetaDataType() {
- return getStringType();
- }
-
- @Override
- public String getInsertLanguageSql(String name, String sampleText) {
- return "INSERT INTO LANGUAGES VALUES ('" + name + "', '" + sampleText + "')";
- }
-
- private MetadataType getStringType() {
- return typeBuilder.stringType().build();
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/model/OracleTestDatabase.java b/src/test/java/org/mule/extension/db/integration/model/OracleTestDatabase.java
deleted file mode 100644
index 93a9262f1..000000000
--- a/src/test/java/org/mule/extension/db/integration/model/OracleTestDatabase.java
+++ /dev/null
@@ -1,705 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.model;
-
-import org.mule.extension.db.integration.DbTestUtil;
-
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-import javax.xml.crypto.Data;
-
-/**
- * Defines an Oracle test database to use with ojdbc7 driver.
- */
-public class OracleTestDatabase extends AbstractTestDatabase {
-
- private static final String ORACLE_ERROR_OBJECT_ALREADY_EXISTS = "42000";
-
- @Override
- public DbTestUtil.DbType getDbType() {
- return DbTestUtil.DbType.ORACLE;
- }
-
- @Override
- public void grantUserAllAccess(DataSource dataSource) throws SQLException {
- executeDdl(dataSource,
- "GRANT ALL\n" +
- "ON INTEGRATION_TEST\n" +
- "TO dbc;\n COMMIT WORK; \n");
- }
-
- @Override
- public void createPlanetTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE PLANET(ID INTEGER NOT NULL PRIMARY KEY,POSITION SMALLINT, NAME VARCHAR(255), PICTURE BLOB, DESCRIPTION CLOB)");
-
- executeDdl(connection, "CREATE SEQUENCE PLANET_SEQ INCREMENT BY 1 START WITH 1");
-
- executeDdl(connection,
- "CREATE TRIGGER PLANET_TRIGGER\n" + "BEFORE INSERT ON PLANET\n" + "FOR EACH ROW WHEN (new.ID is null)\n"
- + "begin\n" + " select PLANET_SEQ.nextval into :new.ID from dual;\n" + "end;");
- }
-
- @Override
- public void createSpaceshipTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE SPACESHIP(ID INTEGER NOT NULL PRIMARY KEY,MODEL VARCHAR(255), MANUFACTURER VARCHAR(255))");
- }
-
- @Override
- public void createLanguagesTable(Connection connection) throws SQLException {
- executeDdl(connection, "CREATE TABLE LANGUAGES(NAME VARCHAR(128), SAMPLE_TEXT CLOB)");
- }
-
- @Override
- public void createMathFunctionSchema(Connection connection) throws SQLException {
- //TODO: Remove the following line, which is only done to be able to create a user/schema without using c## prefix
- executeDdl(connection, "alter session set \"_ORACLE_SCRIPT\"=true");
- String sql = "CREATE USER mathFunction IDENTIFIED BY pass";
- createSchema(connection, sql);
- }
-
- @Override
- protected String getInsertPlanetSql(String name, int position) {
- return "INSERT INTO PLANET(ID, POSITION, NAME) VALUES (PLANET_SEQ.NEXTVAL, " + position + ", '" + name + "')";
- }
-
- @Override
- public void createStoredProcedureGetRecords(DataSource dataSource) throws SQLException {
-
- final String sql = "CREATE OR REPLACE PROCEDURE getTestRecords ( st_cursor OUT SYS_REFCURSOR )\n" + " is\n" + " BEGIN\n"
- + " OPEN st_cursor FOR\n" + " SELECT * FROM PLANET;\n" + " end;\n";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createFunctionGetRecords(DataSource dataSource) throws SQLException {
- String query =
- "CREATE OR REPLACE FUNCTION getTestRecordsFunction\n" + "RETURN SYS_REFCURSOR\n" + "IS planet_cursor SYS_REFCURSOR;\n"
- + "BEGIN\n" + " OPEN planet_cursor FOR\n" + " SELECT * FROM planet;\n" + " RETURN planet_cursor;\n" + "END;";
-
- executeDdl(dataSource, query);
- }
-
- @Override
- public void createStoredProcedureUpdateTestType1(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updateTestType1 (p_retVal OUT INTEGER)\n" + "AS\n" + "BEGIN\n"
- + " UPDATE PLANET SET NAME='Mercury' WHERE POSITION=4;\n" + " p_retVal := SQL%ROWCOUNT;\n" + "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureGetSpanishLanguageSampleText(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE getSpanishLanguageSample(language IN OUT CLOB) IS\n" +
- "BEGIN\n" +
- " SELECT SAMPLE_TEXT\n" +
- " INTO language\n" +
- " FROM LANGUAGES\n" +
- " WHERE NAME='Spanish';\n" +
- "END getSpanishLanguageSample;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdatePlanetDescription(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updatePlanetDescription (p_name IN VARCHAR2, p_description CLOB)\n" +
- "AS\n" +
- "BEGIN\n" +
- " UPDATE PLANET SET DESCRIPTION=p_description WHERE name=p_name;\n" +
- "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdateTestType1(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updateParamTestType1 (p_name IN VARCHAR2, p_retVal OUT INTEGER)\n" + "AS\n"
- + "BEGIN\n" + " UPDATE PLANET SET NAME=p_Name WHERE POSITION=4;\n" + "\n" + " p_retVal := SQL%ROWCOUNT;\n" + "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureCountRecords(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE countTestRecords(count OUT NUMBER) IS\n" + "BEGIN\n" + " SELECT COUNT(*)\n"
- + " INTO count\n" + " FROM PLANET;\n" + "END countTestRecords;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureGetSplitRecords(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE getSplitTestRecords ( st_cursor1 OUT SYS_REFCURSOR, st_cursor2 OUT SYS_REFCURSOR )\n"
- + "is\n" + "BEGIN\n" + " OPEN st_cursor1 FOR SELECT * FROM PLANET WHERE POSITION <= 2;\n"
- + " OPEN st_cursor2 FOR SELECT * FROM PLANET WHERE POSITION > 2;\n" + "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureDoubleMyInt(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE doubleMyInt(MYINT IN OUT NUMBER) IS\n" + "BEGIN\n" + " SELECT MYINT * 2 \n"
- + " INTO MYINT\n" + " FROM DUAL;\n" + "END doubleMyInt;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureAddOne(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE mathFunction.addOne(num IN OUT INTEGER) AS\n" +
- "BEGIN\n" +
- " num := num + 1;\n" +
- "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureAddOneDefaultSchema(DataSource dataSource) throws SQLException {
- String sql = "CREATE OR REPLACE PROCEDURE addOne(num IN OUT INTEGER) AS\n" +
- "BEGIN\n" +
- " num := num - 1;\n" +
- "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureMultiplyInts(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE multiplyInts(INT1 IN NUMBER, INT2 IN NUMBER, RESULT1 OUT NUMBER, INT3 IN NUMBER, RESULT2 OUT NUMBER) IS\n"
- + "BEGIN\n" + " SELECT INT1 * INT2 \n" + " INTO RESULT1\n" + " FROM DUAL;\n"
- + " SELECT INT1 * INT2 * INT3 \n" + " INTO RESULT2\n" + " FROM DUAL;\n" + "END multiplyInts;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void returnNullValue(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE returnNullValue(STRING1 IN VARCHAR2, STRING2 IN VARCHAR2, RESULT OUT VARCHAR2) IS\n"
- + "BEGIN\n" + " SELECT null\n" + " INTO RESULT\n" + " FROM DUAL;\n"
- + "END returnNullValue;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStrings(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE concatenateStrings(STRING1 IN VARCHAR2, STRING2 IN VARCHAR2, RESULT OUT VARCHAR2) IS\n"
- + "BEGIN\n" + " SELECT STRING1 || STRING2\n" + " INTO RESULT\n" + " FROM DUAL;\n"
- + "END concatenateStrings;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createDelayFunction(DataSource dataSource) throws SQLException {
-
- final String sql = "CREATE OR REPLACE FUNCTION DELAY(seconds number) " + "RETURN number IS " + "targetDate DATE; "
- + "BEGIN SELECT sysdate + seconds * 10/864 INTO targetDate FROM DUAL; " + "LOOP EXIT WHEN SYSDATE >= targetDate; "
- + "END LOOP; " + "RETURN 1; " + "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public Class getIdFieldJavaClass() {
- return BigDecimal.class;
- }
-
- @Override
- public Class getDefaultAutoGeneratedKeyClass() {
- try {
- return org.apache.commons.lang3.ClassUtils.getClass("oracle.sql.ROWID");
- } catch (ClassNotFoundException e) {
- throw new IllegalStateException("Unable to load ROWDID class");
- }
- }
-
- @Override
- protected void createAlienTable(Connection connection) throws SQLException {
- String ddl = "CREATE TABLE ALIEN(\n" + " NAME varchar2(255),\n" + " DESCRIPTION XMLTYPE)";
- executeDdl(connection, ddl);
- }
-
- @Override
- protected String getInsertAlienSql(Alien alien) {
- String sql = "INSERT INTO Alien VALUES ('" + alien.getName() + "' , XMLType('" + alien.getXml() + "'))";
-
- return sql;
- }
-
- @Override
- public void createStoredProcedureGetAlienDescription(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE getAlienDescription(pName IN VARCHAR2, pDescription OUT XMLType)\n" + "IS\n"
- + "BEGIN\n" + " select description into pDescription from Alien where name= pName; \n" + "END;\n";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- protected boolean supportsXmlType() {
- return true;
- }
-
- @Override
- public void createStoredProcedureUpdateAlienDescription(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updateAlienDescription(pName IN VARCHAR2, pDescription in XMLType)\n" + "IS\n"
- + "BEGIN\n" + " update Alien set description = pDescription where name= pName; \n" + "END;\n";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- protected boolean supportsSimpleUdt() {
- return true;
- }
-
- @Override
- protected boolean supportsArraysUdt() {
- return true;
- }
-
- @Override
- protected void createZipArrayType(Connection connection) throws SQLException {
- final String ddl = "CREATE OR REPLACE TYPE ZIPARRAY AS VARRAY(10) OF VARCHAR2(12)";
- executeDdl(connection, ddl);
- }
-
- @Override
- protected void createContactDetailsType(Connection connection) throws SQLException {
- final String ddl = "CREATE OR REPLACE TYPE CONTACT_DETAILS AS object(" + "DESCRIPTION VARCHAR2(12),"
- + "PHONE_NUMBER VARCHAR2(12)," + "EMAIL_ADDRESS VARCHAR2(100))";
-
- try {
- executeDdl(connection, ddl);
- } catch (SQLException e) {
- // If the type already exists, ignore the error
- if (!e.getMessage().contains("ORA-02303")) {
- throw e;
- }
- }
- }
-
- @Override
- protected void createContactDetailsArrayType(Connection connection) throws SQLException {
- final String ddl = "CREATE OR REPLACE TYPE CONTACT_DETAILS_ARRAY AS VARRAY(100) OF CONTACT_DETAILS";
- executeDdl(connection, ddl);
- }
-
- @Override
- public void createStoredProcedureGetZipCodes(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE getZipCodes(pName IN VARCHAR2, pZipCodes OUT ZIPARRAY) " + "IS " + "BEGIN "
- + "select ZIPS into pZipCodes from REGIONS where REGION_NAME = pName; " + "END;";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureUpdateZipCodes(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updateZipCodes(pName IN VARCHAR2, pZipCodes IN ZIPARRAY) "
- + "IS "
- + "BEGIN "
- + "UPDATE REGIONS SET ZIPS = pZipCodes where REGION_NAME = pName; "
- + "END;";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureUpdateContactDetails(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE updateContactDetails(pName IN VARCHAR2, pDetails IN CONTACT_DETAILS_ARRAY) "
- + "IS "
- + "BEGIN "
- + "UPDATE CONTACTS SET DETAILS = pDetails where CONTACT_NAME= pName;"
- + "END;";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringDate(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE concatStringDate(PDATE IN DATE, PTEXT IN VARCHAR2, RESULT OUT VARCHAR2) " + "IS "
- + "BEGIN\n"
- + " SELECT PTEXT || TO_CHAR(PDATE, 'YYYY-MM-DD') INTO RESULT" + " FROM DUAL;\n"
- + "END;";
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringTimestamp(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE concatStringTimestamp(PTEXT IN VARCHAR2, PDATE IN TIMESTAMP, RESULT OUT VARCHAR2) " + "IS "
- + "BEGIN\n"
- + " SELECT PTEXT || TO_CHAR(PDATE, 'YYYY-MM-DD HH24:Mi:SS') INTO RESULT" + " FROM DUAL;\n"
- + "END;";
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureExtractReducedBio(DataSource dataSource) throws SQLException {
- // In Oracle DATE and TIMESTAMP are associated to the same type id, that of TIMESTAMP
- // therefore we cannot pass a date formatted as 'YYYY-MM-DD' to TIMESTAMP or DATE for this test.
- final String sql =
- "CREATE OR REPLACE PROCEDURE getReducedBiography(pName IN VARCHAR2, pBirthDate IN DATE, pPlaceBirth IN VARCHAR2, pDied IN TIMESTAMP, pPlaceDeath IN VARCHAR2, pProfession IN VARCHAR2, pAlmaMater IN VARCHAR2, pNationality IN VARCHAR2, pChildren IN INTEGER, pSpouse IN VARCHAR2, pMother IN VARCHAR2, pFather IN VARCHAR2, pBio IN VARCHAR2, pResult OUT VARCHAR2) "
- + "AS "
- + "BEGIN\n"
- + " SELECT pName || ' was born ' || TO_CHAR(pBirthDate, 'YYYY-MM-DD') || ', in ' || pPlaceBirth || ' and died in ' || pPlaceDeath INTO pResult"
- + " FROM DUAL;\n"
- + "END;";
- executeDdl(dataSource, sql);
- }
-
- public void createStoredProcedureOutputClob(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "create or replace PROCEDURE myProcClobOut(myParam OUT CLOB) AS aClob CLOB;\n" +
- "BEGIN\n" +
- "SELECT to_clob(1) into aClob FROM dual;\n" +
- "myParam := aClob;\n" +
- "END;");
- }
-
- @Override
- public void createStoredProcedureGetContactDetails(DataSource dataSource) throws SQLException {
- final String sql =
- "CREATE OR REPLACE PROCEDURE getContactDetails(pName IN VARCHAR2, pContactDetails OUT CONTACT_DETAILS_ARRAY) " + "IS "
- + "BEGIN " + "select DETAILS into pContactDetails from CONTACTS where CONTACT_NAME= pName; " + "END;";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureGetManagerDetails(DataSource dataSource) throws SQLException {
- final String sql = "CREATE OR REPLACE PROCEDURE getManagerDetails(pName IN VARCHAR2, pDetails OUT CONTACT_DETAILS) " + "IS "
- + "BEGIN " + "select DETAILS into pDetails from REGION_MANAGERS where REGION_NAME= pName; " + "END;";
-
- executeDdl(dataSource, sql);
- }
-
- @Override
- protected String getInsertContactSql(Contact contact) {
- StringBuilder builder =
- new StringBuilder("INSERT INTO CONTACTS VALUES ('").append(contact.getName()).append("', CONTACT_DETAILS_ARRAY(");
-
- boolean first = true;
- for (ContactDetails contactDetails : contact.getDetails()) {
- if (first) {
- first = false;
- } else {
- builder.append(",");
- }
- builder.append("CONTACT_DETAILS('").append(contactDetails.getDescription()).append("', '")
- .append(contactDetails.getPhoneNumber()).append("', '").append(contactDetails.getEmail()).append("')");
- }
- builder.append("))");
-
- return builder.toString();
- }
-
- @Override
- protected void createContactsTable(Connection connection) throws SQLException {
- String ddl = "create table CONTACTS " + "(CONTACT_NAME varchar(32) NOT NULL," + "DETAILS CONTACT_DETAILS_ARRAY NOT NULL,"
- + "PRIMARY KEY (CONTACT_NAME))";
-
- executeDdl(connection, ddl);
- }
-
- @Override
- protected void deleteContactsTable(Connection connection) throws SQLException {
- executeUpdate(connection, "DELETE FROM CONTACTS");
- }
-
- @Override
- protected String getInsertRegionSql(Region region) {
- StringBuilder builder =
- new StringBuilder("INSERT INTO REGIONS VALUES ('").append(region.getName()).append("', ").append(" ZIPARRAY(");
-
- boolean first = true;
- for (String zipCode : region.getZips()) {
- if (first) {
- first = false;
- } else {
- builder.append(",");
- }
- builder.append(zipCode);
- }
- builder.append("))");
-
- return builder.toString();
- }
-
- @Override
- protected void createRegionsTable(Connection connection) throws SQLException {
- String ddl =
- "create table REGIONS " + "(REGION_NAME varchar(32) NOT NULL," + "ZIPS ZIPARRAY NOT NULL," + "PRIMARY KEY (REGION_NAME))";
-
- executeDdl(connection, ddl);
- }
-
- @Override
- protected void deleteRegionsTable(Connection connection) throws SQLException {
- executeUpdate(connection, "DELETE FROM REGIONS");
- }
-
- @Override
- protected void createRegionManagersTable(Connection connection) throws SQLException {
- String ddl = "create table REGION_MANAGERS(" + "REGION_NAME varchar(32) NOT NULL," + "MANAGER_NAME varchar(32) NOT NULL,"
- + "DETAILS CONTACT_DETAILS NOT NULL," + "PRIMARY KEY (REGION_NAME))";
-
- executeDdl(connection, ddl);
- }
-
- public void dropTablesTypesProcedures(Connection connection) throws SQLException {
- executeDdlSilently(connection, "DROP PROCEDURE INSERT_FRUIT_AS_TYPE");
- executeDdlSilently(connection, "DROP PROCEDURE INSERT_FRUIT_AS_TABLE");
- executeDdlSilently(connection, "DROP PROCEDURE CREATE_FRUIT_TABLE");
- executeDdlSilently(connection, "DROP TABLE FRUITS_NESTED_TABLE");
- executeDdlSilently(connection, "DROP TABLE FRUITS_AS_TYPE");
- executeDdlSilently(connection, "DROP TABLE FRUITS_AS_TABLE");
- executeDdlSilently(connection, "DROP TYPE FRUIT_ORDER_CONTENTS_TABLE");
- executeDdlSilently(connection, "DROP TYPE FRUIT_RECORD_TYPE");
- executeDdlSilently(connection, "DROP TYPE CREATE_LIST_INPUT_OBJ");
- executeDdlSilently(connection, "DROP TYPE CREATE_LIST_INPUT");
- executeDdlSilently(connection, "DROP TYPE CREATE_LIST_OUTPUT_OBJ");
- executeDdlSilently(connection, "DROP TYPE CREATE_LIST_OUTPUT");
- executeDdlSilently(connection, "DROP TYPE OUTPUT_RESPONSE_OBJ");
- executeDdlSilently(connection, "DROP TYPE OUTPUT_RESPONSE");
- executeDdlSilently(connection, "DROP TYPE OBJECT_WITH_INNER_OBJECT_TYPE");
- executeDdlSilently(connection, "DROP TYPE OBJECTS_TABLE");
- executeDdlSilently(connection, "DROP TYPE OBJECT_TYPE");
- executeDdlSilently(connection, "DROP PROCEDURE STORE_PROCEDURE_NESTED_TYPES");
- executeDdlSilently(connection, "DROP PROCEDURE STORED_PROCEDURE_NESTED_OBJECT_TYPE");
- }
-
- public void initUdts(Connection connection) throws SQLException {
- dropTablesTypesProcedures(connection);
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE FRUIT_RECORD_TYPE AS OBJECT (\n" +
- " fruitID integer,\n" +
- " fruitName varchar2(250),\n" +
- " fruitQuantity NUMBER(10,3)\n" +
- ");");
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE FRUIT_ORDER_CONTENTS_TABLE AS TABLE OF FRUIT_RECORD_TYPE;");
-
- executeDdlSilently(connection, "CREATE TABLE \"SYSTEM\".\"FRUITS_AS_TYPE\" \n" +
- " (\t\"FRUIT\" \"SYSTEM\".\"FRUIT_RECORD_TYPE\" \n" +
- " )");
-
- executeDdlSilently(connection, "CREATE TABLE \"SYSTEM\".\"FRUITS_AS_TABLE\" \n" +
- " (\t\"FRUITID\" NUMBER(*,0), \n" +
- "\t\"FRUITNAME\" VARCHAR2(250 BYTE), \n" +
- "\t\"FRUITQUANTITY\" NUMBER(10,3)\n" +
- " )");
-
- executeDdlSilently(connection, "CREATE TABLE SYSTEM.FRUITS_NESTED_TABLE (\n" +
- " fruitId NUMBER,\n" +
- " fruits FRUIT_ORDER_CONTENTS_TABLE )\n" +
- "NESTED TABLE fruits STORE AS FRUITS_AS_NESTED");
-
- executeDdlSilently(connection, "CREATE OR REPLACE PROCEDURE INSERT_FRUIT_AS_TYPE(fruits in FRUIT_ORDER_CONTENTS_TABLE)\n" +
- "as\n" +
- "BEGIN\n" +
- "FOR i IN fruits.FIRST .. fruits.LAST\n" +
- " LOOP\n" +
- "\t INSERT INTO FRUITS_AS_TYPE VALUES (fruits(i));\n" +
- " END LOOP;\n" +
- "end;");
-
- executeDdlSilently(connection, "create or replace procedure INSERT_FRUIT_AS_TABLE(param1 in FRUIT_ORDER_CONTENTS_TABLE)\n" +
- "as\n" +
- "BEGIN\n" +
- "INSERT INTO FRUITS_AS_TABLE SELECT * FROM Table(param1);\n" +
- "end;");
-
- executeDdlSilently(connection, "create or replace procedure CREATE_FRUIT_TABLE(param1 out FRUIT_ORDER_CONTENTS_TABLE)\n" +
- "as\n" +
- "begin\n" +
- " param1 := FRUIT_ORDER_CONTENTS_TABLE(FRUIT_RECORD_TYPE(123, 'sad', 321));\n" +
- "end;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE CREATE_LIST_INPUT_OBJ FORCE AS OBJECT\n" +
- "(\n" +
- " objNumber NUMBER,\n" +
- " objName VARCHAR(10)\n" +
- ");");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE CREATE_LIST_INPUT AS TABLE OF CREATE_LIST_INPUT_OBJ;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE CREATE_LIST_OUTPUT_OBJ FORCE AS OBJECT\n" +
- "(\n" +
- " objOne VARCHAR2(10),\n" +
- " objTwo VARCHAR2(10)\n" +
- ");");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE CREATE_LIST_OUTPUT AS TABLE OF CREATE_LIST_OUTPUT_OBJ;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE OUTPUT_RESPONSE_OBJ AS OBJECT \n" +
- "( \n" +
- " CREATE_LIST_OUTPUT_V CREATE_LIST_OUTPUT,\n" +
- " CREATE_LIST_INPUT_V CREATE_LIST_INPUT\n" +
- ");");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE OUTPUT_RESPONSE AS TABLE OF OUTPUT_RESPONSE_OBJ;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE PROCEDURE STORE_PROCEDURE_NESTED_TYPES\n" +
- "(\n" +
- " IN_VALUE IN CREATE_LIST_INPUT,\n" +
- " OUT_VALUE OUT NOCOPY CREATE_LIST_OUTPUT,\n" +
- " RSL OUT NOCOPY OUTPUT_RESPONSE\n" +
- ")\n" +
- " IS\n" +
- " BEGIN\n" +
- " OUT_VALUE := CREATE_LIST_OUTPUT(CREATE_LIST_OUTPUT_OBJ('a','b'), CREATE_LIST_OUTPUT_OBJ('c','d'));\n" +
- " RSL := OUTPUT_RESPONSE(OUTPUT_RESPONSE_OBJ(CREATE_LIST_OUTPUT(CREATE_LIST_OUTPUT_OBJ('a','b')), CREATE_LIST_INPUT(CREATE_LIST_INPUT_OBJ(1, 'a'))));\n"
- +
- " END;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE OBJECT_TYPE AS OBJECT\n" +
- "(\n" +
- " aVarchar VARCHAR2(20)\n" +
- ");");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE OBJECTS_TABLE AS TABLE OF OBJECT_TYPE;");
-
- executeDdlSilently(connection, "CREATE OR REPLACE TYPE OBJECT_WITH_INNER_OBJECT_TYPE AS OBJECT\n" +
- "(\n" +
- " objectsTable OBJECTS_TABLE\n" +
- ");");
-
- executeDdlSilently(connection, "CREATE OR REPLACE PROCEDURE STORED_PROCEDURE_NESTED_OBJECT_TYPE\n" +
- "(\n" +
- " RESPONSE OUT OBJECT_WITH_INNER_OBJECT_TYPE\n" +
- ")\n" +
- "IS\n" +
- "BEGIN\n" +
- " RESPONSE := OBJECT_WITH_INNER_OBJECT_TYPE(OBJECTS_TABLE(OBJECT_TYPE('aSimpleVarchar')));\n" +
- "END;");
- }
-
- private void executeDdlSilently(Connection connection, String sql) {
- try {
- executeUpdate(connection, sql);
- } catch (SQLException e) {
- //ignore
- }
- }
-
- @Override
- protected void deleteRegionManagersTable(Connection connection) throws SQLException {
- executeUpdate(connection, "DELETE FROM REGION_MANAGERS");
- }
-
- @Override
- protected String getInsertRegionManagerSql(RegionManager regionManager) {
- StringBuilder builder = new StringBuilder("INSERT INTO REGION_MANAGERS VALUES ('").append(regionManager.getRegionName())
- .append("', '").append(regionManager.getName()).append("', CONTACT_DETAILS('")
- .append(regionManager.getContactDetails().getDescription()).append("', '")
- .append(regionManager.getContactDetails().getPhoneNumber()).append("', '")
- .append(regionManager.getContactDetails().getEmail()).append("'))");
-
- return builder.toString();
- }
-
- @Override
- public String getInsertLanguageSql(String name, String sampleText) {
- return "INSERT INTO LANGUAGES VALUES ('" + name + "', '" + sampleText + "')";
- }
-
- public void createPersonTable(Connection connection) throws SQLException {
- createPersonType(connection);
- executeDdl(connection, "create or replace type PERSON_TABLE as table of PERSON_TYPE;");
- }
-
- public void createPersonType(Connection connection) throws SQLException {
- executeDdl(connection, "create or replace type PERSON_TYPE as object ( " +
- "personId varchar2(36), " +
- "name clob, " +
- "age number(3) " +
- ");");
- }
-
- public void dropPersonTable(Connection connection) throws SQLException {
- executeDdl(connection, "DROP TYPE PERSON_TABLE");
- dropPersonType(connection);
- }
-
- public void dropPersonType(Connection connection) throws SQLException {
- executeDdl(connection, "DROP TYPE PERSON_TYPE");
- }
-
- public void createSchema(Connection connection, String sql) throws SQLException {
- try {
- executeDdl(connection, sql);
- } catch (SQLException e) {
- // Ignore exception when user already exists
- if (!ORACLE_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-
- public void createPackages(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE magicPackageVersionOne AS\n" +
- " PROCEDURE addMagicalNumber(num IN OUT NUMBER);\n" +
- "END magicPackageVersionOne;");
-
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE BODY magicPackageVersionOne AS\n" +
- " PROCEDURE addMagicalNumber(num IN OUT NUMBER) AS\n" +
- " BEGIN\n" +
- " num := num + 7;\n" +
- " END addMagicalNumber;\n" +
- "END magicPackageVersionOne;");
-
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE magicPackageVersionTwo AS\n" +
- " PROCEDURE addMagicalNumber(num IN OUT NUMBER, name OUT VARCHAR);\n" +
- " PROCEDURE addMagicalNumberAndACard(num IN OUT NUMBER, name OUT VARCHAR);" +
- "END magicPackageVersionTwo;");
-
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE BODY magicPackageVersionTwo AS\n" +
- " PROCEDURE addMagicalNumber(num IN OUT NUMBER, name OUT VARCHAR) AS\n" +
- " BEGIN\n" +
- " num := num + 9;\n" +
- " END addMagicalNumber;\n" +
- "\n" +
- " PROCEDURE addMagicalNumberAndACard(num IN OUT NUMBER, name OUT VARCHAR) AS\n" +
- " BEGIN\n" +
- " num := num + 11;\n" +
- " END addMagicalNumberAndACard;\n" +
- "END magicPackageVersionTwo;");
-
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE magicPackageVersionThree AS\n" +
- " PROCEDURE getClob ( result OUT sys_refcursor );" +
- "END magicPackageVersionThree;");
-
- executeDdl(connection,
- "CREATE OR REPLACE PACKAGE BODY magicPackageVersionThree AS\n" +
- " PROCEDURE getClob ( result OUT sys_refcursor ) AS\n" +
- " BEGIN\n" +
- " Open result for\n" +
- " select to_clob(1) from dual;\n" +
- " END getClob;" +
- "END magicPackageVersionThree;");
-
-
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/model/SqlServerTestDataBase.java b/src/test/java/org/mule/extension/db/integration/model/SqlServerTestDataBase.java
deleted file mode 100644
index 1b3d61c09..000000000
--- a/src/test/java/org/mule/extension/db/integration/model/SqlServerTestDataBase.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.model;
-
-import org.mule.extension.db.integration.DbTestUtil;
-import org.mule.metadata.api.model.MetadataType;
-
-import javax.sql.DataSource;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-public class SqlServerTestDataBase extends AbstractTestDatabase {
-
- private static final String MSSQL_ERROR_OBJECT_ALREADY_EXISTS = "S0001";
-
- @Override
- public DbTestUtil.DbType getDbType() {
- return DbTestUtil.DbType.SQLSERVER;
- }
-
- public static String SQL_CREATE_SP_UPDATE_TEST_TYPE_1 =
- "CREATE PROCEDURE updateTestType1\n" +
- "AS\n" +
- "BEGIN\n" +
- " UPDATE PLANET SET NAME='Mercury' WHERE POSITION=4;\n" +
- "END";
-
- public static String SQL_CREATE_SP_GET_RECORDS =
- "CREATE PROCEDURE getTestRecords\n" +
- "AS\n" +
- "BEGIN\n" +
- " SELECT * FROM PLANET;\n" +
- "END";
-
- public static String SQL_CREATE_SP_GET_SPLIT_RECORDS =
- "CREATE PROCEDURE getSplitTestRecords\n" +
- "AS\n" +
- "BEGIN\n" +
- " SELECT * FROM PLANET WHERE POSITION <= 2; \n" +
- " SELECT * FROM PLANET WHERE POSITION > 2;\n" +
- "END";
-
- @Override
- public void grantUserAllAccess(DataSource dataSource) throws SQLException {
- executeDdl(dataSource,
- "GRANT ALL\n" +
- "ON INTEGRATION_TEST\n" +
- "TO dbc;\n COMMIT WORK; \n");
- }
-
- @Override
- public void createPlanetTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE PLANET(\n" +
- "ID INTEGER NOT NULL IDENTITY (1,1),\n" +
- "POSITION INTEGER,\n" +
- "NAME VARCHAR(255), \n" +
- "PICTURE varbinary(8000), \n" +
- "DESCRIPTION NTEXT, \n" +
- "PRIMARY KEY (ID))");
- }
-
- @Override
- public void createSpaceshipTable(Connection connection) throws SQLException {
- executeDdl(connection,
- "CREATE TABLE SPACESHIP(\n" +
- "ID INTEGER NOT NULL IDENTITY (1,1),\n" +
- "MODEL VARCHAR(255), \n" +
- "MANUFACTURER VARCHAR(255), \n" +
- "PRIMARY KEY (ID))");
- }
-
- @Override
- public void createLanguagesTable(Connection connection) throws SQLException {
- executeDdl(connection, "CREATE TABLE LANGUAGES (NAME VARCHAR(128), SAMPLE_TEXT VARCHAR(max))");
- }
-
- @Override
- public void createMathFunctionSchema(Connection connection) throws SQLException {
- String sql = "CREATE SCHEMA mathFunction";
- createSchema(connection, sql);
- }
-
- @Override
- protected String getInsertPlanetSql(String name, int position) {
- return "INSERT INTO PLANET(POSITION, NAME) VALUES (" + position + ", '" + name + "')";
- }
-
- @Override
- public void createStoredProcedureGetRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getTestRecords;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_RECORDS);
- }
-
- @Override
- public void createStoredProcedureUpdateTestType1(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updateTestType1;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_UPDATE_TEST_TYPE_1);
- }
-
- @Override
- public void createStoredProcedureGetSpanishLanguageSampleText(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getSpanishLanguageSample;\n");
-
- final String sql =
- "CREATE PROCEDURE getSpanishLanguageSample(@language VARCHAR(max) OUTPUT) AS\n" +
- "BEGIN\n" +
- " SET @language = (SELECT SAMPLE_TEXT FROM LANGUAGES WHERE NAME='Spanish')\n" +
- "END;";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdatePlanetDescription(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updatePlanetDescription;\n");
-
- final String sql =
- "CREATE PROCEDURE updatePlanetDescription(@pName VARCHAR(50),@pDescription NTEXT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " update Planet SET DESCRIPTION=@pDescription where NAME = @pName;\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureParameterizedUpdateTestType1(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS updateParamTestType1;\n");
-
- final String sql = "CREATE PROCEDURE updateParamTestType1(@pName VARCHAR(50))\n" +
- " AS\n" +
- " BEGIN\n" +
- " DECLARE @name varchar(50);\n" +
- " SET @name = ISNULL(@pName,'NullLand') \n" +
- "\n" +
- " UPDATE PLANET SET NAME=@name WHERE POSITION=4;\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureCountRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS countTestRecords;\n");
-
- final String sql = "CREATE PROCEDURE countTestRecords(@pResult INT OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " set @pResult = (select count(*) from PLANET)\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureGetSplitRecords(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getSplitTestRecords;\n");
- createStoredProcedure(dataSource, SQL_CREATE_SP_GET_SPLIT_RECORDS);
-
- }
-
- @Override
- public void createStoredProcedureDoubleMyInt(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS doubleMyInt;\n");
-
- final String sql =
- "CREATE PROCEDURE doubleMyInt(@pInt INT OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pInt = @pInt * 2\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringDate(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatStringDate;\n");
-
- final String sql =
- "CREATE PROCEDURE concatStringDate(@pDate DATE, @pText VARCHAR(50), @pResult VARCHAR(100) OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult = CONCAT(@pText, @pDate)\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStringTimestamp(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatStringTimestamp;\n");
-
- final String sql =
- "CREATE PROCEDURE concatStringTimestamp(@pText VARCHAR(50), @pTimestamp DATETIME, @pResult VARCHAR(100) OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult = CONCAT(@pText, CONVERT(varchar, @pTimestamp, 20))\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureExtractReducedBio(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS getReducedBiography;\n");
-
- final String sql =
- "CREATE PROCEDURE getReducedBiography(@pName VARCHAR(50), @pBirthDate DATE, @pPlaceBirth VARCHAR(50), @pDied DATETIME, @pPlaceDeath VARCHAR(50), @pProfession VARCHAR(50), @pAlmaMater VARCHAR(50), @pNationality VARCHAR(50), @pChildren INT, @pSpouse VARCHAR(50), @pMother VARCHAR(50), @pFather VARCHAR(50), @pBio VARCHAR(500), @pResult VARCHAR(100) OUTPUT)\n"
- +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult = CONCAT(@pName, ' was born ', @pBirthDate, ', in ', @pPlaceBirth, ' and died in ', @pPlaceDeath)\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
-
- @Override
- public void createStoredProcedureAddOne(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS mathFunction.addOne;\n");
-
- final String sql = "CREATE PROCEDURE mathFunction.addOne(@num INT OUTPUT) AS\n" +
- "BEGIN\n" +
- " SET @num = @num + 1;\n" +
- "END";
- createStoredProcedure(dataSource, sql);
- }
-
-
- @Override
- public void createStoredProcedureAddOneDefaultSchema(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS addOne;\n");
-
- String sql = "CREATE PROCEDURE addOne(@num INT OUTPUT) AS\n" +
- "BEGIN\n" +
- " SET @num = @num - 1;\n" +
- "END";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureMultiplyInts(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS multiplyInts;\n");
-
- final String sql =
- "CREATE PROCEDURE multiplyInts(@pInt1 INT, @pInt2 INT, @pResult1 INT OUTPUT, @pInt3 INT, @pResult2 INT OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult1 = @pInt1 * @pInt2;\n" +
- " SET @pResult2 = @pInt1 * @pInt2 * @pInt3;\n" +
- "END";
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void returnNullValue(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS returnNullValue;\n");
-
- final String sql =
- "CREATE PROCEDURE returnNullValue(@pString1 VARCHAR(50), @pString2 VARCHAR(50), @pResult VARCHAR(100) OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult = null\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createStoredProcedureConcatenateStrings(DataSource dataSource) throws SQLException {
- executeDdl(dataSource, "DROP PROCEDURE IF EXISTS concatenateStrings;\n");
-
- final String sql =
- "CREATE PROCEDURE concatenateStrings(@pString1 VARCHAR(50), @pString2 VARCHAR(50), @pResult VARCHAR(100) OUTPUT)\n" +
- "AS\n" +
- "BEGIN\n" +
- " SET @pResult = CONCAT(@pString1, @pString2)\n" +
- "END";
-
- createStoredProcedure(dataSource, sql);
- }
-
- @Override
- public void createDelayFunction(DataSource dataSource) throws SQLException {
- //SQL Server doesn't support delays inside functions
- }
-
- @Override
- public MetadataType getDescriptionFieldMetaDataType() {
- return typeBuilder.stringType().build();
- }
-
- @Override
- public String getInsertLanguageSql(String name, String sampleText) {
- return "INSERT INTO LANGUAGES VALUES ('" + name + "', '" + sampleText + "')";
- }
-
- public void createStoredProcedure(DataSource dataSource, String sql) throws SQLException {
- try {
- super.createStoredProcedure(dataSource, sql);
- } catch (SQLException e) {
- // Ignore exception when stored procedure already exists
- if (!MSSQL_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-
- public void createSchema(Connection connection, String sql) throws SQLException {
- try {
- executeDdl(connection, sql);
- } catch (SQLException e) {
- // Ignore exception when user already exists
- if (!MSSQL_ERROR_OBJECT_ALREADY_EXISTS.equals(e.getSQLState())) {
- throw e;
- }
- }
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/model/derbyutil/DerbyTestStoredProcedure.java b/src/test/java/org/mule/extension/db/integration/model/derbyutil/DerbyTestStoredProcedure.java
deleted file mode 100644
index 82869cd4c..000000000
--- a/src/test/java/org/mule/extension/db/integration/model/derbyutil/DerbyTestStoredProcedure.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.model.derbyutil;
-
-import org.mule.extension.db.integration.model.ContactDetails;
-import org.mule.extension.db.integration.model.DerbyTestDatabase;
-import org.mule.runtime.core.api.util.IOUtils;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.Writer;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.sql.Date;
-
-/**
- * Defines stored procedures for testing purposes. Used by reflection from {@link DerbyTestDatabase}
- */
-@SuppressWarnings("UnusedDeclaration")
-public class DerbyTestStoredProcedure {
-
- public static final String NULL_PLANET_NAME = "NullLand";
-
- public static void selectRows(ResultSet[] data1) throws SQLException {
-
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
- try {
- PreparedStatement ps1 = conn.prepareStatement("SELECT * FROM PLANET");
- data1[0] = ps1.executeQuery();
- } finally {
- conn.close();
- }
- }
-
- public static void updateTestType1() throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- Statement ps1 = conn.createStatement();
- ps1.executeUpdate("UPDATE PLANET SET NAME='Mercury' WHERE POSITION=4");
- } finally {
- conn.close();
- }
- }
-
- public static void updateParameterizedTestType1(String name) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- if (name == null) {
- name = NULL_PLANET_NAME;
- }
-
- try {
- Statement ps1 = conn.createStatement();
- ps1.executeUpdate("UPDATE PLANET SET NAME='" + name + "' WHERE POSITION=4");
- } finally {
- conn.close();
- }
- }
-
- public static void updatePlanetDescription(String name, Clob description) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- PreparedStatement ps1 = conn.prepareStatement("UPDATE PLANET SET DESCRIPTION=? WHERE NAME=?");
- ps1.setClob(1, description);
- ps1.setString(2, name);
- ps1.execute();
- } finally {
- conn.close();
- }
- }
-
- public static void countTestRecords(int[] count) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- Statement ps1 = conn.createStatement();
- ResultSet resultSet = ps1.executeQuery("SELECT COUNT(*) FROM PLANET");
- resultSet.next();
- count[0] = resultSet.getInt(1);
- } finally {
- conn.close();
- }
- }
-
- public static void getSpanishLanguageSample(Clob[] language) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- Statement ps1 = conn.createStatement();
- ResultSet resultSet = ps1.executeQuery("SELECT SAMPLE_TEXT FROM LANGUAGES WHERE NAME='Spanish'");
- resultSet.next();
- String value = resultSet.getString(1);
- Clob clobResult = new ClobTest();
- clobResult.setString(1, value);
- language[0] = clobResult;
- } finally {
- conn.close();
- }
- }
-
- public static void getTestRecords(ResultSet[] data1) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- PreparedStatement ps1 = conn.prepareStatement("SELECT * FROM PLANET");
- data1[0] = ps1.executeQuery();
- } finally {
- conn.close();
- }
- }
-
- public static void getSplitTestRecords(ResultSet[] data1, ResultSet[] data2) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- PreparedStatement ps1 = conn.prepareStatement("SELECT * FROM PLANET WHERE POSITION <= 2");
- data1[0] = ps1.executeQuery();
-
- PreparedStatement ps2 = conn.prepareStatement("SELECT * FROM PLANET WHERE POSITION > 2");
- data2[0] = ps2.executeQuery();
- } finally {
- conn.close();
- }
- }
-
- public static void doubleMyInt(int[] i) {
- i[0] *= 2;
- }
-
- public static void multiplyInts(int int1, int int2, int[] result1, int int3, int[] result2) {
- result1[0] = int1 * int2;
- result2[0] = int1 * int2 * int3;
- }
-
- public static void returnNullValue(String string1, String string2, String[] result) {
- result[0] = null;
- }
-
- public static void concatenateStrings(String string1, String string2, String[] result) {
- result[0] = string1 + string2;
- }
-
- public static int timeDelay(int secondsDelay) {
- if (secondsDelay > 0) {
- try {
- Thread.sleep(secondsDelay * 1000);
- } catch (InterruptedException e) {
- return 0;
- }
- }
-
- return 1;
- }
-
- public static ContactDetails createContactDetails(String description, String phone, String email) {
- return new ContactDetails(description, phone, email);
- }
-
- public static void getManagerDetails(String name, ContactDetails[] result) throws SQLException {
- Connection conn = DriverManager.getConnection("jdbc:default:connection");
-
- try {
- Statement ps1 = conn.createStatement();
- ResultSet resultSet = ps1.executeQuery("SELECT DETAILS FROM REGION_MANAGERS WHERE REGION_NAME ='" + name + "'");
- resultSet.next();
- result[0] = (ContactDetails) resultSet.getObject(1);
- } finally {
- conn.close();
- }
- }
-
- public static void concatStringDate(Date date, String text, String[] result) {
- result[0] = text + date.toString();
- }
-
- public static void concatStringTimestamp(String text, Timestamp timestamp, String[] result) {
- result[0] = text + timestamp.toString();
- }
-
- public static void getReducedBiography(String name, Date birth_date, String place_birth, Timestamp died, String place_death,
- String profession, String alma_mater, String nationality, int children, String spouse,
- String mother, String father, Clob bio, String[] result)
- throws SQLException {
- result[0] = name + " was born " + birth_date.toString() + ", in " + place_birth + " and died in " + place_death;
- }
-
- public static void addOne(int[] num) {
- num[0] += 1;
- }
-
-
- public static class ClobTest implements Clob {
-
- private String str;
-
- @Override
- public long length() throws SQLException {
- return 0;
- }
-
- @Override
- public String getSubString(long pos, int length) throws SQLException {
- return null;
- }
-
- @Override
- public Reader getCharacterStream() throws SQLException {
- return new StringReader(str);
- }
-
- @Override
- public InputStream getAsciiStream() throws SQLException {
- return null;
- }
-
- @Override
- public long position(String searchstr, long start) throws SQLException {
- return 0;
- }
-
- @Override
- public long position(Clob searchstr, long start) throws SQLException {
- return 0;
- }
-
- @Override
- public int setString(long pos, String str) throws SQLException {
- this.str = str;
- return 0;
- }
-
- @Override
- public int setString(long pos, String str, int offset, int len) throws SQLException {
- this.str = str;
- return 0;
- }
-
- @Override
- public OutputStream setAsciiStream(long pos) throws SQLException {
- return null;
- }
-
- @Override
- public Writer setCharacterStream(long pos) throws SQLException {
- return null;
- }
-
- @Override
- public void truncate(long len) throws SQLException {
-
- }
-
- @Override
- public void free() throws SQLException {
-
- }
-
- @Override
- public Reader getCharacterStream(long pos, long length) throws SQLException {
- return null;
- }
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/SelectExceptionTestCase.java b/src/test/java/org/mule/extension/db/integration/select/SelectExceptionTestCase.java
index b6e29fa91..a164517f6 100644
--- a/src/test/java/org/mule/extension/db/integration/select/SelectExceptionTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/select/SelectExceptionTestCase.java
@@ -13,7 +13,6 @@
import static org.junit.Assert.fail;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.DerbyTestDatabase;
import javax.sql.DataSource;
diff --git a/src/test/java/org/mule/extension/db/integration/select/SelectJavaUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/select/SelectJavaUdtTestCase.java
index 53182e670..aac831bac 100644
--- a/src/test/java/org/mule/extension/db/integration/select/SelectJavaUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/select/SelectJavaUdtTestCase.java
@@ -8,14 +8,13 @@
package org.mule.extension.db.integration.select;
import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.TestRecordUtil.assertRecords;
import static org.mule.extension.db.integration.model.RegionManager.NORTHWEST_MANAGER;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
+
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.extension.db.integration.model.Field;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.extension.db.integration.model.Record;
import org.mule.runtime.api.message.Message;
@@ -27,27 +26,13 @@
public class SelectJavaUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- if (!getDerbyResource().isEmpty()) {
- params.add(getDerbyResource().get(0));
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/select/select-udt-config.xml"};
}
+ //TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+ @Ignore
@Test
public void returnsMappedObject() throws Exception {
Message response = flowRunner("returnsUDT").keepStreamsOpen().run().getMessage();
diff --git a/src/test/java/org/mule/extension/db/integration/select/SelectTestCase.java b/src/test/java/org/mule/extension/db/integration/select/SelectTestCase.java
index 6e869ab5b..da0b271fa 100644
--- a/src/test/java/org/mule/extension/db/integration/select/SelectTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/select/SelectTestCase.java
@@ -111,12 +111,12 @@ public void returnsAliasInResultSet() throws Exception {
@Test
public void invalidQueryType() throws Exception {
- assertErrorType(() -> flowRunner("invalidQueryType").run(), "DB", BAD_SQL_SYNTAX.name());
+ assertErrorType(() -> flowRunner("invalidQueryType").run(), "TERADATA", BAD_SQL_SYNTAX.name());
}
@Test
public void badSqlSyntax() throws Exception {
- assertErrorType(() -> flowRunner("badSqlSyntax").run(), "DB", QUERY_EXECUTION.name());
+ assertErrorType(() -> flowRunner("badSqlSyntax").run(), "TERADATA", QUERY_EXECUTION.name());
}
@Test
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/AbstractOracleUDTMetadataTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/AbstractOracleUDTMetadataTestCase.java
deleted file mode 100644
index d38c569a9..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/AbstractOracleUDTMetadataTestCase.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.select.oracle;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mule.tck.junit4.matcher.IsEmptyOptional.empty;
-
-import org.junit.After;
-import org.junit.Before;
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.metadata.api.ClassTypeLoader;
-import org.mule.metadata.api.model.ArrayType;
-import org.mule.metadata.api.model.MetadataType;
-import org.mule.metadata.api.model.ObjectFieldType;
-import org.mule.metadata.api.model.ObjectType;
-import org.mule.runtime.api.meta.model.operation.OperationModel;
-import org.mule.runtime.api.metadata.descriptor.ComponentMetadataDescriptor;
-import org.mule.runtime.api.metadata.resolving.MetadataResult;
-import org.mule.runtime.extension.api.declaration.type.ExtensionsTypeLoaderFactory;
-
-import java.sql.SQLException;
-import java.util.Optional;
-
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public abstract class AbstractOracleUDTMetadataTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameter(4)
- public String flowSuffix;
-
- ClassTypeLoader typeLoader = ExtensionsTypeLoaderFactory.getDefault().createTypeLoader();
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).initUdts(getDefaultDataSource().getConnection());
- }
-
- @After
- public void cleanUp() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).dropTablesTypesProcedures(getDefaultDataSource().getConnection());
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/storedprocedure/stored-procedure-oracle-table-config.xml"};
- }
-
- @Test
- public void selectStructType() {
- MetadataResult> metadata =
- getMetadata("selectFromFruitsTable", "SELECT * FROM FRUITS_AS_TYPE");
- assertThat("Metadata Result is not success", metadata.isSuccess(), is(true));
-
- MetadataType type = metadata.get().getModel().getOutput().getType();
- assertThat(type, is(instanceOf(ArrayType.class)));
-
- MetadataType arrayContentType = ((ArrayType) type).getType();
- Optional fruit = getFruitType(arrayContentType);
-
- validateStructType(fruit.get().getValue());
- }
-
- @Test
- public void insertStructType() {
- MetadataType insertStruct = getParameterValuesMetadata("insertStruct", "INSERT INTO FRUITS_AS_TYPE (FRUIT) VALUES (:FRUIT)");
-
- Optional fruit = getFruitType(insertStruct);
-
- validateStructType(fruit.get().getValue());
- }
-
- private Optional getFruitType(MetadataType insertStruct) {
- assertThat(insertStruct, is(instanceOf(ObjectType.class)));
- ObjectType rowType = (ObjectType) insertStruct;
- Optional fruit = rowType.getFieldByName("FRUIT");
- assertThat(fruit, is(not(empty())));
- return fruit;
- }
-
- abstract void validateStructType(MetadataType metadataType);
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectClobTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectClobTestCase.java
deleted file mode 100644
index 82557b982..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectClobTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.select.oracle;
-
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-
-public class OracleSelectClobTestCase extends AbstractDbIntegrationTestCase {
-
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/vendor/oracle/oracle-select-clob.xml"};
- }
-
- //DB Config used has a pool of 1 connection. keepStreamsOpen ensures connection is not closed.
- //If method is not used, even if there is a leak, the flow runner closes the connection as part of cleanup.
- @Test
- public void selectWith() throws Exception {
- flowRunner("select-clob").keepStreamsOpen().run();
- flowRunner("select-clob").run();
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectWithTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectWithTestCase.java
deleted file mode 100644
index f1dca5a72..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleSelectWithTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.select.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-import static org.mule.extension.db.integration.TestRecordUtil.assertMessageContains;
-import static org.mule.extension.db.integration.TestRecordUtil.getAllPlanetRecords;
-
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.runtime.api.message.Message;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class OracleSelectWithTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/vendor/oracle/oracle-select-with-config.xml"};
- }
-
- @Test
- public void selectWith() throws Exception {
- Message response = flowRunner("with").keepStreamsOpen().run().getMessage();
-
- assertMessageContains(response, getAllPlanetRecords());
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTMetadataTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTMetadataTestCase.java
deleted file mode 100644
index 7443e119b..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTMetadataTestCase.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.select.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.metadata.api.model.ArrayType;
-import org.mule.metadata.api.model.MetadataType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.runners.Parameterized;
-
-public class OracleUDTMetadataTestCase extends AbstractOracleUDTMetadataTestCase {
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "With-Out-Mapping"});
- }
- return configs;
- }
-
- @Override
- void validateStructType(MetadataType metadataType) {
- assertThat(metadataType, instanceOf(ArrayType.class));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTWithMappingMetadataTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTWithMappingMetadataTestCase.java
deleted file mode 100644
index 22d6702f6..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/OracleUDTWithMappingMetadataTestCase.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.select.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.select.Fruit;
-import org.mule.metadata.api.model.MetadataType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.runners.Parameterized;
-
-public class OracleUDTWithMappingMetadataTestCase extends AbstractOracleUDTMetadataTestCase {
-
-
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-with-column-types-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "With-Mapping"});
- }
- return configs;
- }
-
- @Override
- void validateStructType(MetadataType metadataType) {
- assertThat(typeLoader.load(Fruit.class), equalTo(metadataType));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/select/oracle/SelectJavaArrayUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/select/oracle/SelectJavaArrayUdtTestCase.java
deleted file mode 100644
index e310c7c7a..000000000
--- a/src/test/java/org/mule/extension/db/integration/select/oracle/SelectJavaArrayUdtTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.select.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-import static org.mule.extension.db.integration.TestRecordUtil.assertRecords;
-import static org.mule.extension.db.integration.model.Contact.CONTACT1;
-import static org.mule.extension.db.integration.model.Contact.CONTACT2;
-import static org.mule.extension.db.integration.model.Region.NORTHWEST;
-import static org.mule.extension.db.integration.model.Region.SOUTHWEST;
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.Field;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.model.Record;
-import org.mule.runtime.api.message.Message;
-import org.mule.runtime.api.streaming.object.CursorIteratorProvider;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import com.google.common.collect.ImmutableCollection;
-import com.google.common.collect.ImmutableList;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class SelectJavaArrayUdtTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/select/oracle/select-udt-array-config.xml"};
- }
-
- @Test
- public void returnsDefaultArray() throws Exception {
- Message response = flowRunner("returnsDefaultArray").keepStreamsOpen().run().getMessage();
- ImmutableList immutableList = ImmutableList.copyOf(((CursorIteratorProvider) response.getPayload().getValue()).openCursor());
- assertRecords(immutableList,
- new Record(new Field("REGION_NAME", NORTHWEST.getName()), new Field("ZIPS", NORTHWEST.getZips())),
- new Record(new Field("REGION_NAME", SOUTHWEST.getName()), new Field("ZIPS", SOUTHWEST.getZips())));
- }
-
- @Test
- public void returnsMappedObjectArray() throws Exception {
- Message response = flowRunner("returnsCustomArray").keepStreamsOpen().run().getMessage();
-
- ImmutableList immutableList = ImmutableList.copyOf(((CursorIteratorProvider) response.getPayload().getValue()).openCursor());
- assertRecords(immutableList,
- new Record(new Field("CONTACT_NAME", CONTACT1.getName()), new Field("DETAILS", CONTACT1.getDetails())),
- new Record(new Field("CONTACT_NAME", CONTACT2.getName()), new Field("DETAILS", CONTACT2.getDetails())));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/AbstractStoredProcedureReturningResultsetTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/AbstractStoredProcedureReturningResultsetTestCase.java
index e80132a79..6d7fb3059 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/AbstractStoredProcedureReturningResultsetTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/AbstractStoredProcedureReturningResultsetTestCase.java
@@ -12,7 +12,6 @@
import static org.mule.extension.db.integration.TestRecordUtil.assertRecords;
import static org.mule.extension.db.integration.TestRecordUtil.getAllPlanetRecords;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.MySqlTestDatabase;
import java.util.Map;
@@ -24,13 +23,7 @@ public abstract class AbstractStoredProcedureReturningResultsetTestCase extends
@Test
public void testRequestResponse() throws Exception {
Map payload = runProcedure("getResultSet");
- if (testDatabase instanceof MySqlTestDatabase) {
- assertThat(payload.size(), equalTo(2));
- assertThat(payload.get("updateCount1"), equalTo(0));
- } else {
- assertThat(payload.size(), equalTo(1));
- }
-
+ assertThat(payload.size(), equalTo(1));
assertRecords(payload.get("resultSet1"), getAllPlanetRecords());
}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaArrayUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaArrayUdtTestCase.java
index 03ac4a743..c7e90fbff 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaArrayUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaArrayUdtTestCase.java
@@ -11,14 +11,13 @@
import static java.util.Collections.emptyList;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.Contact.CONTACT1;
import static org.mule.extension.db.integration.model.Region.SOUTHWEST;
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.extension.db.integration.DbTestUtil;
import org.mule.extension.db.integration.model.ContactDetails;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.ArrayList;
@@ -32,20 +31,10 @@
import org.junit.Test;
import org.junit.runners.Parameterized;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
public class StoredProcedureJavaArrayUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", new OracleTestDatabase(),
- DbTestUtil.DbType.ORACLE, emptyList()});
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/storedprocedure/stored-procedure-udt-array-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaUdtTestCase.java
index b74e5831e..eb8f06d01 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureJavaUdtTestCase.java
@@ -10,11 +10,10 @@
import static java.util.Collections.emptyList;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
+
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.LinkedList;
@@ -24,24 +23,10 @@
import org.junit.Test;
import org.junit.runners.Parameterized;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
public class StoredProcedureJavaUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- if (!getDerbyResource().isEmpty()) {
- params.add(getDerbyResource().get(0));
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/storedprocedure/stored-procedure-udt-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureParameterizedUpdateTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureParameterizedUpdateTestCase.java
index b2283b3a5..1333c5796 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureParameterizedUpdateTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureParameterizedUpdateTestCase.java
@@ -12,10 +12,8 @@
import static org.junit.Assume.assumeThat;
import static org.mule.extension.db.integration.DbTestUtil.selectData;
import static org.mule.extension.db.integration.TestRecordUtil.assertRecords;
-import static org.mule.extension.db.integration.model.derbyutil.DerbyTestStoredProcedure.NULL_PLANET_NAME;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.extension.db.integration.matcher.SupportsReturningStoredProcedureResultsWithoutParameters;
-import org.mule.extension.db.integration.model.DerbyTestDatabase;
import org.mule.extension.db.integration.model.Field;
import org.mule.extension.db.integration.model.Record;
@@ -47,12 +45,12 @@ public void update() throws Exception {
@Test
public void storedProcedureWithNullArgument() throws Exception {
Map payload = runProcedure("update", null);
- assertPlanetUpdated(payload, NULL_PLANET_NAME);
+ assertPlanetUpdated(payload, "NullLand");
}
private void assertPlanetUpdated(Map payload, String expectedPlanetName) throws java.sql.SQLException {
assertThat(payload.size(), is(1));
- int expectedUpdateCount = testDatabase instanceof DerbyTestDatabase ? 0 : 1;
+ int expectedUpdateCount = 1;
assertThat(payload.get("updateCount1"), equalTo(expectedUpdateCount));
List> result = selectData("select * from PLANET where PLANET_POS=4", getDefaultDataSource());
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureReturningResultsetsTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureReturningResultsetsTestCase.java
index 7799b7a02..3315f0832 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureReturningResultsetsTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureReturningResultsetsTestCase.java
@@ -15,7 +15,6 @@
import static org.mule.extension.db.integration.TestRecordUtil.getMarsRecord;
import static org.mule.extension.db.integration.TestRecordUtil.getVenusRecord;
import org.mule.extension.db.integration.matcher.SupportsReturningStoredProcedureResultsWithoutParameters;
-import org.mule.extension.db.integration.model.MySqlTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.Map;
@@ -31,12 +30,7 @@ protected String[] getFlowConfigurationResources() {
protected void assertResponse(Message response) {
Map payload = (Map) response.getPayload().getValue();
- if (testDatabase instanceof MySqlTestDatabase) {
- assertThat(payload.size(), equalTo(3));
- assertThat(payload.get("updateCount1"), equalTo(0));
- } else {
- assertThat(payload.size(), equalTo(2));
- }
+ assertThat(payload.size(), equalTo(2));
assertRecords(payload.get("resultSet1"), getVenusRecord());
assertRecords(payload.get("resultSet2"), getEarthRecord(), getMarsRecord());
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureSelectUDTTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureSelectUDTTestCase.java
index 689a71975..651803799 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureSelectUDTTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureSelectUDTTestCase.java
@@ -9,12 +9,10 @@
import static java.util.Collections.emptyList;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.LinkedList;
@@ -24,24 +22,10 @@
import org.junit.Test;
import org.junit.runners.Parameterized;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
public class StoredProcedureSelectUDTTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- if (!getDerbyResource().isEmpty()) {
- params.add(getDerbyResource().get(0));
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/storedprocedure/stored-procedure-udt-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureTestCase.java
index de151d0e2..14ff34c38 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureTestCase.java
@@ -118,7 +118,7 @@ public void outParam() throws Exception {
@Test
public void runStoredProcedureWithArgumentThatDoesNotExists() throws Exception {
- expectedError.expectErrorType("DB", "QUERY_EXECUTION");
+ expectedError.expectErrorType("TERADATA", "QUERY_EXECUTION");
runProcedure("callNotExistingStoredProcedureWithAnArgument");
}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureUDTParamTypeResolutionTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureUDTParamTypeResolutionTestCase.java
index 16791b7a0..eda52d8d7 100644
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureUDTParamTypeResolutionTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/storedprocedure/StoredProcedureUDTParamTypeResolutionTestCase.java
@@ -12,13 +12,11 @@
import static java.util.Collections.emptyList;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mule.extension.db.integration.TestDbConfig.getDerbyResource;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
import static org.mule.db.commons.internal.resolver.param.StoredProcedureParamTypeResolver.FORCE_SP_PARAM_TYPES;
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.LinkedList;
@@ -29,25 +27,10 @@
import org.junit.Test;
import org.junit.runners.Parameterized;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
public class StoredProcedureUDTParamTypeResolutionTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- if (!getDerbyResource().isEmpty()) {
- params.add(getDerbyResource().get(0));
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/storedprocedure/stored-procedure-udt-config.xml"};
@@ -84,6 +67,4 @@ public void runStoredProcedureThatReturnsCustomObjectResolvingParamNotUsingDBMet
Message response = flowRunner("returnsObjectWitSomeParameterTypesConfigured").run().getMessage();
assertThat(response.getPayload().getValue(), equalTo(SOUTHWEST_MANAGER.getContactDetails()));
}
-
-
}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/AbstractStoredProcedureTableTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/AbstractStoredProcedureTableTestCase.java
deleted file mode 100644
index cf8e7356d..000000000
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/AbstractStoredProcedureTableTestCase.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.storedprocedure.oracle;
-
-import static com.google.common.collect.ImmutableList.copyOf;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.junit.rules.ExpectedException.none;
-
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.select.Fruit;
-import org.mule.functional.api.exception.ExpectedError;
-import org.mule.runtime.api.streaming.object.CursorIteratorProvider;
-
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import org.hamcrest.Matcher;
-import org.hamcrest.core.AllOf;
-import org.hamcrest.core.IsCollectionContaining;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runners.Parameterized;
-
-public abstract class AbstractStoredProcedureTableTestCase extends AbstractDbIntegrationTestCase {
-
- @Rule
- public ExpectedException expectedException = none();
-
- @Rule
- public ExpectedError expectedError = ExpectedError.none();
-
- @Parameterized.Parameter(4)
- public String flowSuffix;
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).initUdts(getDefaultDataSource().getConnection());
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/storedprocedure/stored-procedure-oracle-table-config.xml"};
- }
-
- @Test
- public void insertTableTypeUsingParameters() throws Exception {
- Fruit[] fruits = getTestFruits();
- runProcedure("insertTableType" + flowSuffix, Arrays.asList(fruits));
- Iterator> selectFromFruitsTable =
- ((CursorIteratorProvider) flowRunner("selectFromFruitsTable").keepStreamsOpen()
- .withPayload(Arrays.stream(fruits).mapToLong(Fruit::getFruitID).toArray()).run().getMessage().getPayload().getValue())
- .openCursor();
- validateInsertedData(copyOf(selectFromFruitsTable), fruits);
- }
-
- @Test
- public void insertTableTypeUsingStoredProcedure() throws Exception {
- Fruit[] fruits = getTestFruits();
- runProcedure("insertTableType2" + flowSuffix, Arrays.asList(fruits));
- runProcedure("insertTableType2" + flowSuffix, Arrays.asList(fruits));
- runProcedure("insertTableType2" + flowSuffix, Arrays.asList(fruits));
- runProcedure("insertTableType2" + flowSuffix, Arrays.asList(fruits));
- validateStructData(getFruitsFromDBLike(fruits), fruits);
- }
-
- @Test
- public void getTableTypeUsingStoredProcedure() throws Exception {
- Map struct = runProcedure("returnTableType" + flowSuffix);
- validateTable(struct);
- }
-
- @Test
- public void insertAndSelectStruct() throws Exception {
- Fruit fruit = getTestFruits()[0];
- flowRunner("insertStruct" + flowSuffix).withPayload(fruit).run();
- validateStructData(getFruitsFromDBLike(fruit), fruit);
- }
-
- protected abstract void validateStructData(List retrievedFruits, Fruit... fruits);
-
- protected abstract void validateTable(Map storeProcedureReturn);
-
- private List getFruitsFromDBLike(Fruit... fruits) throws Exception {
- return copyOf(((CursorIteratorProvider) flowRunner("selectFromFruitsTable2").keepStreamsOpen()
- .withPayload(Arrays.stream(fruits).mapToLong(Fruit::getFruitID).toArray())
- .run()
- .getMessage().getPayload().getValue()).openCursor());
- }
-
- public void validateInsertedData(List> storeProcedureReturn, Fruit... fruits) {
- for (Fruit fruit : fruits) {
- Matcher idMatcher = hasEntry("FRUITID", new BigDecimal(fruit.getFruitID()));
- Matcher nameMatcher = hasEntry("FRUITNAME", fruit.getFruitName());
- Matcher quantityMatcher = hasEntry("FRUITQUANTITY", new BigDecimal(fruit.getFruitQuantity()));
- Matcher> fruitid = AllOf.allOf(idMatcher, nameMatcher, quantityMatcher);
- assertThat(storeProcedureReturn, IsCollectionContaining.hasItem(fruitid));
- }
- }
-
- public Fruit[] getTestFruits() {
- Random random = new Random();
- return new Fruit[] {
- new Fruit(random.nextInt() * 10000 + 1, "Apple", 123),
- new Fruit(random.nextInt() * 10000 + 1, "Banana", 123),
- new Fruit(random.nextInt() * 10000 + 1, "Orange", 123)
- };
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureMappedTableTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureMappedTableTestCase.java
deleted file mode 100644
index 5110f519b..000000000
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureMappedTableTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.storedprocedure.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.select.Fruit;
-import org.mule.runtime.api.message.Message;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class StoredProcedureMappedTableTestCase extends AbstractStoredProcedureTableTestCase {
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-with-column-types-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), "WithMapping"});
- }
- return configs;
- }
-
- @Override
- protected void validateStructData(List retrievedFruits, Fruit[] fruits) {
- List> receivedFruits = (List>) retrievedFruits;
- for (Fruit fruit : fruits) {
- assertThat(receivedFruits, hasItem(hasEntry(is("FRUIT"), is(fruit))));
- }
- }
-
- @Override
- public void validateTable(Map storeProcedureReturn) {
- Object value = ((Object[]) storeProcedureReturn.get("out"))[0];
- assertThat(value, is(instanceOf(Fruit.class)));
- }
-
- @Test
- public void processNestedTypeOutputParam() throws Exception {
- flowRunner("storedProcedureWithNestedArrayTypeOutputParamSerialized").run();
- }
-
- @Test
- public void processNestedObjectTypeOutputParam() throws Exception {
- flowRunner("storedProcedureWithNestedObjectTypeOutputParamSerialized").run();
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureReturningOutputClobTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureReturningOutputClobTestCase.java
deleted file mode 100644
index 11cea3b72..000000000
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureReturningOutputClobTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.storedprocedure.oracle;
-
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-import static java.util.Collections.emptyList;
-
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class StoredProcedureReturningOutputClobTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/storedprocedure/stored-procedure-oracle-with-clob-output.xml"};
- }
-
- @Test
- public void verifyConnectionIsReleasedOutputClob() throws Exception {
- flowRunner("getClobOutputFromStoredProcedurePackage").run();
- flowRunner("getClobOutputFromStoredProcedurePackage").run();
- }
-
- @Before
- public void setupStoredProcedure() throws Exception {
- testDatabase.createStoredProcedureOutputClob(getDefaultDataSource());
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureTableTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureTableTestCase.java
deleted file mode 100644
index 64198bc1c..000000000
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureTableTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.integration.storedprocedure.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.collection.IsArrayContainingInOrder.arrayContaining;
-import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.rules.ExpectedException.none;
-
-import org.mule.extension.db.integration.TestDbConfig;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-import org.mule.extension.db.integration.select.Fruit;
-import org.mule.functional.api.exception.ExpectedError;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.hamcrest.Matcher;
-import org.junit.Rule;
-import org.junit.rules.ExpectedException;
-import org.junit.runners.Parameterized;
-
-public class StoredProcedureTableTestCase extends AbstractStoredProcedureTableTestCase {
-
- @Rule
- public ExpectedException expectedException = none();
-
- @Rule
- public ExpectedError expectedError = ExpectedError.none();
-
- @Parameterized.Parameters(name = "{2}-{4}")
- public static List parameters() {
- List oracleResource = TestDbConfig.getOracleResource();
- ArrayList configs = new ArrayList<>();
- if (!oracleResource.isEmpty()) {
- OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- configs.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList(), ""});
- }
- return configs;
- }
-
- @Override
- protected void validateStructData(List retrievedFruits, Fruit[] fruits) {
-
- List> receivedFruits = (List>) retrievedFruits;
- for (Fruit fruit : fruits) {
- Matcher fruitIDMatcher = is(new BigDecimal(fruit.getFruitID()));
- Matcher nameMatcher = is(fruit.getFruitName());
- Matcher quantityMatcher = is(new BigDecimal(fruit.getFruitQuantity()));
- Matcher fruitMatcher = hasEntry(is("FRUIT"), arrayContaining(fruitIDMatcher, nameMatcher, quantityMatcher));
- assertThat(receivedFruits, hasItem(fruitMatcher));
- }
- }
-
- @Override
- public void validateTable(Map storeProcedureReturn) {
- assertThat(storeProcedureReturn, hasEntry(is("out"), instanceOf(Object[].class)));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureWithinPackageTestCase.java b/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureWithinPackageTestCase.java
deleted file mode 100644
index e20ea04fb..000000000
--- a/src/test/java/org/mule/extension/db/integration/storedprocedure/oracle/StoredProcedureWithinPackageTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.integration.storedprocedure.oracle;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
-
-import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
-
-import java.sql.SQLException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runners.Parameterized;
-
-public class StoredProcedureWithinPackageTestCase extends AbstractDbIntegrationTestCase {
-
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
- @Override
- protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/storedprocedure/stored-procedure-oracle-within-package.xml"};
- }
-
- @Before
- public void init() throws SQLException {
- ((OracleTestDatabase) this.testDatabase).createPackages(getDefaultDataSource().getConnection());
- }
-
- @Test
- public void callStoredProceduresWithTheSameNameOnDifferentPackages() throws Exception {
- Map payloadSP1 = runProcedure("magicPackageVersionOneAddMagicalNumber7");
- Map payloadSP2 = runProcedure("magicPackageVersionTwoAddMagicalNumber9");
- assertThat(payloadSP1.get("num").toString(), equalTo("17"));
- assertThat(payloadSP2.get("num").toString(), equalTo("19"));
- }
-
- @Test
- public void callStoredProcedureWithAUniqueIdentifier() throws Exception {
- Map payloadSP = runProcedure("addMagicalNumberAndACardNumber11WithStoredProcedurePackage");
- assertThat(payloadSP.get("num").toString(), equalTo("21"));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/integration/update/UpdateJavaArrayUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/update/UpdateJavaArrayUdtTestCase.java
index 5c0e99f79..fb8a9bbef 100644
--- a/src/test/java/org/mule/extension/db/integration/update/UpdateJavaArrayUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/update/UpdateJavaArrayUdtTestCase.java
@@ -7,16 +7,15 @@
package org.mule.extension.db.integration.update;
import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.AllureConstants.DbFeature.DB_EXTENSION;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.extension.db.integration.model.ContactDetails;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.LinkedList;
@@ -28,23 +27,12 @@
import io.qameta.allure.Feature;
import io.qameta.allure.Story;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
@Feature(DB_EXTENSION)
@Story("Update Statement")
public class UpdateJavaArrayUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
-
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/update/update-udt-array-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/integration/update/UpdateJavaUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/update/UpdateJavaUdtTestCase.java
index 047ffed59..5e3c353d7 100644
--- a/src/test/java/org/mule/extension/db/integration/update/UpdateJavaUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/update/UpdateJavaUdtTestCase.java
@@ -10,10 +10,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.mule.extension.db.AllureConstants.DbFeature.DB_EXTENSION;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
+
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.sql.Struct;
@@ -25,22 +25,12 @@
import io.qameta.allure.Feature;
import io.qameta.allure.Story;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
@Feature(DB_EXTENSION)
@Story("Update Statement")
public class UpdateJavaUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-unmapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/update/update-udt-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/integration/update/UpdateStoredProcedure.java b/src/test/java/org/mule/extension/db/integration/update/UpdateStoredProcedure.java
index 751b36332..3289bb2fb 100644
--- a/src/test/java/org/mule/extension/db/integration/update/UpdateStoredProcedure.java
+++ b/src/test/java/org/mule/extension/db/integration/update/UpdateStoredProcedure.java
@@ -14,7 +14,6 @@
import org.mule.extension.db.api.StatementResult;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
import org.mule.extension.db.integration.matcher.SupportsReturningStoredProcedureResultsWithoutParameters;
-import org.mule.extension.db.integration.model.DerbyTestDatabase;
import org.mule.extension.db.integration.model.Field;
import org.mule.extension.db.integration.model.Record;
import org.mule.runtime.api.message.Message;
@@ -46,7 +45,7 @@ public void setupStoredProcedure() throws Exception {
public void testRequestResponse() throws Exception {
Message response = flowRunner("updateStoredProcedure").run().getMessage();
- assertAffectedRows((StatementResult) response.getPayload().getValue(), testDatabase instanceof DerbyTestDatabase ? 0 : 1);
+ assertAffectedRows((StatementResult) response.getPayload().getValue(), 1);
List> result = selectData("select * from PLANET where PLANET_POS=4", getDefaultDataSource());
assertRecords(result, new Record(new Field("NAME", "Mercury"), new Field("PLANET_POS", 4)));
}
diff --git a/src/test/java/org/mule/extension/db/integration/update/UpdateStructUdtTestCase.java b/src/test/java/org/mule/extension/db/integration/update/UpdateStructUdtTestCase.java
index d8fa0642b..32a54bccb 100644
--- a/src/test/java/org/mule/extension/db/integration/update/UpdateStructUdtTestCase.java
+++ b/src/test/java/org/mule/extension/db/integration/update/UpdateStructUdtTestCase.java
@@ -8,14 +8,13 @@
package org.mule.extension.db.integration.update;
import static java.util.Collections.emptyList;
-import static org.mule.extension.db.integration.TestDbConfig.getOracleResource;
import static org.mule.extension.db.integration.model.RegionManager.SOUTHWEST_MANAGER;
import static org.mule.extension.db.AllureConstants.DbFeature.DB_EXTENSION;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
+import org.junit.Ignore;
import org.mule.extension.db.integration.AbstractDbIntegrationTestCase;
-import org.mule.extension.db.integration.model.OracleTestDatabase;
import org.mule.runtime.api.message.Message;
import java.util.LinkedList;
@@ -26,22 +25,12 @@
import io.qameta.allure.Feature;
import io.qameta.allure.Story;
+//TODO: Original test for Derby DB only. Re-added test if Teradata supports UDT.
+@Ignore
@Feature(DB_EXTENSION)
@Story("Update Statement")
public class UpdateStructUdtTestCase extends AbstractDbIntegrationTestCase {
- @Parameterized.Parameters(name = "{2}")
- public static List parameters() {
- List params = new LinkedList<>();
- if (!getOracleResource().isEmpty()) {
- final OracleTestDatabase oracleTestDatabase = new OracleTestDatabase();
- params.add(new Object[] {"integration/config/oracle-mapped-udt-db-config.xml", oracleTestDatabase,
- oracleTestDatabase.getDbType(), emptyList()});
- }
-
- return params;
- }
-
@Override
protected String[] getFlowConfigurationResources() {
return new String[] {"integration/update/update-udt-config.xml"};
diff --git a/src/test/java/org/mule/extension/db/internal/OracleCreateArrayTestCase.java b/src/test/java/org/mule/extension/db/internal/OracleCreateArrayTestCase.java
deleted file mode 100644
index a0323c4ac..000000000
--- a/src/test/java/org/mule/extension/db/internal/OracleCreateArrayTestCase.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.internal;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mule.db.commons.api.param.JdbcType.BLOB;
-import static org.mule.db.commons.api.param.JdbcType.CLOB;
-import static org.mule.extension.db.internal.domain.connection.oracle.OracleConnectionUtils.getOwnerFrom;
-import static org.mule.extension.db.internal.domain.connection.oracle.OracleConnectionUtils.getTypeSimpleName;
-
-import oracle.jdbc.OracleConnection;
-import oracle.sql.ARRAY;
-import org.mule.extension.db.internal.domain.connection.oracle.OracleDbConnection;
-
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import org.junit.Test;
-
-
-public class OracleCreateArrayTestCase extends AbstractDbFunctionTestCase {
-
- private static final String QUERY_ALL_COLL_TYPES = "SELECT * FROM SYS.ALL_COLL_TYPES WHERE TYPE_NAME = ?";
-
- @Test
- public void createsDbArrayResolvingBlobWithOracleConnectionUsingSimpleName() throws Exception {
- createsDbArrayResolvingBlobWithOracleConnection(TYPE_NAME);
- }
-
- @Test
- public void createsDbArrayResolvingBlobWithOracleConnectionUsingFullName() throws Exception {
- createsDbArrayResolvingBlobWithOracleConnection(TYPE_NAME_WITH_OWNER);
- }
-
- @SuppressWarnings("deprecation")
- private void createsDbArrayResolvingBlobWithOracleConnection(String typeName) throws Exception {
- Object[] structValues = {"blob", "foo"};
- Object[] structValues1 = {"blob1", "foo1"};
- Object[] params = {structValues, structValues1};
-
- OracleConnection connection = mock(OracleConnection.class);
- when(connection.unwrap(OracleConnection.class)).thenReturn(connection);
- Blob blob = mock(Blob.class);
- when(connection.createBlob()).thenReturn(blob);
-
- ARRAY array = mock(ARRAY.class);
- when(connection.createARRAY(typeName, params)).thenReturn(array);
- when(connection.createArrayOf(any(), any()))
- .thenThrow(new UnsupportedOperationException("Oracle doesn't support createArrayOf"));
-
- testThroughOracleQuery(connection, params, BLOB.getDbType().getName(), typeName);
-
- verify(connection).createARRAY(typeName, params);
- assertThat(((Object[]) params[0])[0], equalTo(blob));
- assertThat(((Object[]) params[1])[0], equalTo(blob));
- }
-
- @Test
- public void createsDbArrayResolvingClobWithOracleConnectionUsingSimpleName() throws Exception {
- createsDbArrayResolvingClobWithOracleConnection(TYPE_NAME);
- }
-
- @Test
- public void createsDbArrayResolvingClobWithOracleConnectionUsingFullName() throws Exception {
- createsDbArrayResolvingClobWithOracleConnection(TYPE_NAME_WITH_OWNER);
- }
-
- @SuppressWarnings("deprecation")
- private void createsDbArrayResolvingClobWithOracleConnection(String typeName) throws Exception {
- Object[] structValues = {"clob", "foo"};
- Object[] structValues1 = {"clob1", "foo1"};
- Object[] params = {structValues, structValues1};
-
- OracleConnection connection = mock(OracleConnection.class);
- when(connection.unwrap(OracleConnection.class)).thenReturn(connection);
- Clob clob = mock(Clob.class);
- when(connection.createClob()).thenReturn(clob);
-
- ARRAY array = mock(ARRAY.class);
- when(connection.createARRAY(typeName, params)).thenReturn(array);
- when(connection.createArrayOf(any(), any()))
- .thenThrow(new UnsupportedOperationException("Oracle doesn't support createArrayOf"));
-
- testThroughOracleQuery(connection, params, CLOB.getDbType().getName(), typeName);
-
- verify(connection).createARRAY(typeName, params);
- assertThat(((Object[]) params[0])[0], equalTo(clob));
- assertThat(((Object[]) params[1])[0], equalTo(clob));
- }
-
- private void testThroughOracleQuery(Connection delegate, Object[] values, String dataTypeName, String udtName)
- throws Exception {
- Optional owner = getOwnerFrom(udtName);
- String typeSimpleName = getTypeSimpleName(udtName);
- PreparedStatement preparedStatement = mock(PreparedStatement.class);
- ResultSet resultSet = mock(ResultSet.class);
-
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
-
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
- if (owner.isPresent()) {
- when(delegate.prepareStatement(QUERY_TYPE_ATTRS + QUERY_OWNER_CONDITION)).thenReturn(preparedStatement);
- when(delegate.prepareStatement(QUERY_ALL_COLL_TYPES + QUERY_OWNER_CONDITION)).thenReturn(preparedStatement);
- } else {
- when(delegate.prepareStatement(QUERY_TYPE_ATTRS)).thenReturn(preparedStatement);
- when(delegate.prepareStatement(QUERY_ALL_COLL_TYPES)).thenReturn(preparedStatement);
- }
-
- when(resultSet.next()).thenReturn(true).thenReturn(false).thenReturn(true).thenReturn(false);
- when(resultSet.getInt(ATTR_NO_PARAM)).thenReturn(1);
- when(resultSet.getString(ATTR_TYPE_NAME_PARAM)).thenReturn(dataTypeName);
-
- OracleDbConnection oracleConnection = new OracleDbConnection(delegate, new ArrayList<>(), new ConcurrentHashMap<>());
-
- oracleConnection.createArray(udtName, values);
-
- verify(preparedStatement, times(2)).setString(1, typeSimpleName);
- if (owner.isPresent()) {
- verify(preparedStatement, times(2)).setString(2, owner.get());
- }
- }
-}
diff --git a/src/test/java/org/mule/extension/db/internal/OracleCreateStructTestCase.java b/src/test/java/org/mule/extension/db/internal/OracleCreateStructTestCase.java
deleted file mode 100644
index 302d5fed7..000000000
--- a/src/test/java/org/mule/extension/db/internal/OracleCreateStructTestCase.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.internal;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mule.db.commons.api.param.JdbcType.BLOB;
-import static org.mule.db.commons.api.param.JdbcType.CLOB;
-import static org.mule.extension.db.internal.domain.connection.oracle.OracleConnectionUtils.getOwnerFrom;
-import static org.mule.extension.db.internal.domain.connection.oracle.OracleConnectionUtils.getTypeSimpleName;
-
-import org.mule.extension.db.internal.domain.connection.oracle.OracleDbConnection;
-
-import java.sql.Blob;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.junit.Test;
-
-public class OracleCreateStructTestCase extends AbstractDbFunctionTestCase {
-
- @Test
- public void createStructResolvingBlobInOracleDbUsingUDTSimpleName() throws Exception {
- createStructResolvingBlobInOracleDb(TYPE_NAME);
- }
-
- @Test
- public void createStructResolvingBlobInOracleDbUsingUDTFullName() throws Exception {
- createStructResolvingBlobInOracleDb(TYPE_NAME_WITH_OWNER);
- }
-
- @Test
- public void createStructResolvingClobInOracleDbUsingUDTSimpleName() throws Exception {
- createStructResolvingClobAndClobInOracleDb(TYPE_NAME);
- }
-
- @Test
- public void createStructResolvingClobInOracleDbUsingUDTFullName() throws Exception {
- createStructResolvingClobAndClobInOracleDb(TYPE_NAME_WITH_OWNER);
- }
-
- private void createStructResolvingBlobInOracleDb(String typeName) throws Exception {
- Object[] structValues = {"foo", "bar"};
- Connection delegate = mock(Connection.class);
- Blob blob = mock(Blob.class);
- when(delegate.createBlob()).thenReturn(blob);
- testThroughOracleQuery(delegate, structValues, BLOB.getDbType().getName(), typeName);
- verify(delegate).createStruct(typeName, structValues);
- assertThat(structValues[0], equalTo(blob));
- }
-
- private void createStructResolvingClobAndClobInOracleDb(String typeName) throws Exception {
- Object[] structValues = {"foo", "bar"};
- Connection delegate = mock(Connection.class);
- Clob clob = mock(Clob.class);
- when(delegate.createClob()).thenReturn(clob);
- testThroughOracleQuery(delegate, structValues, CLOB.getDbType().getName(), typeName);
- verify(delegate).createStruct(typeName, structValues);
- assertThat(structValues[0], equalTo(clob));
- }
-
- private void testThroughOracleQuery(Connection delegate, Object[] structValues, String dataTypeName, String udtName)
- throws Exception {
- Optional owner = getOwnerFrom(udtName);
- String typeSimpleName = getTypeSimpleName(udtName);
- PreparedStatement preparedStatement = mock(PreparedStatement.class);
- ResultSet resultSet = mock(ResultSet.class);
-
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
- if (owner.isPresent()) {
- when(delegate.prepareStatement(QUERY_TYPE_ATTRS + QUERY_OWNER_CONDITION)).thenReturn(preparedStatement);
- } else {
- when(delegate.prepareStatement(QUERY_TYPE_ATTRS)).thenReturn(preparedStatement);
- }
-
- when(resultSet.next()).thenReturn(true).thenReturn(false);
- when(resultSet.getInt(ATTR_NO_PARAM)).thenReturn(1);
- when(resultSet.getString(ATTR_TYPE_NAME_PARAM)).thenReturn(dataTypeName);
-
- OracleDbConnection oracleConnection = new OracleDbConnection(delegate, new ArrayList<>(), new ConcurrentHashMap<>());
-
- oracleConnection.createStruct(udtName, structValues);
-
- verify(preparedStatement).setString(1, typeSimpleName);
-
- if (owner.isPresent()) {
- verify(preparedStatement).setString(2, owner.get());
- }
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/internal/domain/connection/OracleDbConnectionTestCase.java b/src/test/java/org/mule/extension/db/internal/domain/connection/OracleDbConnectionTestCase.java
deleted file mode 100644
index 838d7f40e..000000000
--- a/src/test/java/org/mule/extension/db/internal/domain/connection/OracleDbConnectionTestCase.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-
-package org.mule.extension.db.internal.domain.connection;
-
-import oracle.jdbc.OracleConnection;
-import org.junit.Test;
-import org.mule.extension.db.internal.domain.connection.oracle.OracleDbConnection;
-import org.mule.db.commons.internal.domain.type.ResolvedDbType;
-import org.mule.tck.junit4.AbstractMuleTestCase;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mule.extension.db.internal.domain.connection.oracle.OracleDbConnection.ATTR_TYPE_NAME_PARAM;
-import static org.mule.db.commons.internal.domain.connection.type.resolver.ArrayTypeResolver.QUERY_ALL_COLL_TYPES;
-
-public class OracleDbConnectionTestCase extends AbstractMuleTestCase {
-
- private final String TYPE_NAME = "TYPE_NAME";
- private final String OTHER_TYPE_NAME = "OTHER_TYPE";
-
-
- @Test
- public void lobResolutionPerformance() throws Exception {
-
-
- /*
- The main goal of this test is to assert that lob resolution is performed using
- database query only once for every type.
-
- Assertions required:
- * Assert that the query is executed only once for
- every Type.
- * Assert that the right value is present in the cache.
- * Assert that on the following calls for lob resolution
- the value comes from the cache.
- * The mock must be reset for every call.
-
- Important Note. Fixing DBCON-179 will change the statements executed
- on every call.
- */
-
- Map> dbTypeCache = new ConcurrentHashMap<>();
- Object[] structValues = {"clob", "foo"};
- Object[] structValues1 = {"clob1", "foo1"};
- Object[] params = {structValues, structValues1};
- Object[] params2 = {structValues, structValues1};
- final String USER_TYPE_NAME = "FOO";
- final String USER_TYPE_DBNAME = "BAR";
- final String USER_TYPE_NAME_B = "ICECREAM";
- final String USER_TYPE_DBNAME_B = "SANDWICH";
-
- //First call.
- OracleConnection delegate = mock(OracleConnection.class);
- when(delegate.unwrap(OracleConnection.class)).thenReturn(delegate);
- PreparedStatement preparedStatement = mock(PreparedStatement.class);
- ResultSet resultSet = mock(ResultSet.class);
-
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
- when(delegate.prepareStatement(OracleDbConnection.QUERY_TYPE_ATTRS)).thenReturn(preparedStatement);
- when(delegate.prepareStatement(QUERY_ALL_COLL_TYPES)).thenReturn(preparedStatement);
- when(resultSet.next()).thenReturn(true).thenReturn(false).thenReturn(true).thenReturn(false);
- when(resultSet.getString(ATTR_TYPE_NAME_PARAM)).thenReturn(USER_TYPE_DBNAME);
-
- OracleDbConnection cnx = new OracleDbConnection(delegate, Collections.emptyList(), dbTypeCache);
- cnx.createArray(USER_TYPE_NAME, params);
- assertThat(dbTypeCache.containsKey(USER_TYPE_NAME), is(true));
- assertThat(dbTypeCache.get(USER_TYPE_NAME).get(0).getName(), is(USER_TYPE_DBNAME));
- verify(preparedStatement, times(2)).executeQuery();
-
- //Second Call
- delegate = mock(OracleConnection.class);
- when(delegate.unwrap(OracleConnection.class)).thenReturn(delegate);
- preparedStatement = mock(PreparedStatement.class);
- resultSet = mock(ResultSet.class);
-
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
- when(delegate.prepareStatement(OracleDbConnection.QUERY_TYPE_ATTRS)).thenReturn(preparedStatement);
- when(delegate.prepareStatement(QUERY_ALL_COLL_TYPES)).thenReturn(preparedStatement);
- when(resultSet.next()).thenReturn(true).thenReturn(false).thenReturn(true).thenReturn(false);
- when(resultSet.getString(ATTR_TYPE_NAME_PARAM)).thenReturn(USER_TYPE_DBNAME);
-
- cnx = new OracleDbConnection(delegate, Collections.emptyList(), dbTypeCache);
- cnx.createArray(USER_TYPE_NAME, params);
-
- assertThat(dbTypeCache.containsKey(USER_TYPE_NAME), is(true));
- assertThat(dbTypeCache.get(USER_TYPE_NAME).get(0).getName(), is(USER_TYPE_DBNAME));
- assertThat(dbTypeCache.keySet().size(), is(1));
- //Fixing DBCON-179 will result in 0 times.
- verify(preparedStatement, times(1)).executeQuery();
-
- //Third Call
- delegate = mock(OracleConnection.class);
- when(delegate.unwrap(OracleConnection.class)).thenReturn(delegate);
- preparedStatement = mock(PreparedStatement.class);
- resultSet = mock(ResultSet.class);
- when(preparedStatement.executeQuery()).thenReturn(resultSet);
- when(delegate.prepareStatement(OracleDbConnection.QUERY_TYPE_ATTRS)).thenReturn(preparedStatement);
- when(delegate.prepareStatement(QUERY_ALL_COLL_TYPES)).thenReturn(preparedStatement);
-
- when(resultSet.next()).thenReturn(true).thenReturn(false).thenReturn(true).thenReturn(false);
- when(resultSet.getString(ATTR_TYPE_NAME_PARAM)).thenReturn(USER_TYPE_DBNAME_B);
-
- cnx = new OracleDbConnection(delegate, Collections.emptyList(), dbTypeCache);
- cnx.createArray(USER_TYPE_NAME_B, params);
-
- assertThat(dbTypeCache.containsKey(USER_TYPE_NAME_B), is(true));
- assertThat(dbTypeCache.get(USER_TYPE_NAME_B).get(0).getName(), is(USER_TYPE_DBNAME_B));
- assertThat(dbTypeCache.keySet().size(), is(2));
- verify(preparedStatement, times(2)).executeQuery();
- }
-
- @Test
- public void getTablesClosesTheStatement() throws SQLException {
- OracleConnection delegate = mock(OracleConnection.class);
- when(delegate.unwrap(OracleConnection.class)).thenReturn(delegate);
- Statement statement = mock(Statement.class);
- ResultSet resultSet = mock(ResultSet.class);
-
- when(delegate.createStatement()).thenReturn(statement);
- when(statement.getResultSet()).thenReturn(resultSet);
- when(resultSet.next()).thenReturn(false);
-
- Map> dbTypeCache = new ConcurrentHashMap<>();
- OracleDbConnection cnx = new OracleDbConnection(delegate, Collections.emptyList(), dbTypeCache);
-
- cnx.getTables();
-
- verify(statement).close();
- }
-}
diff --git a/src/test/java/org/mule/extension/db/tooling/valueprovider/ColumnValueProviderTestCase.java b/src/test/java/org/mule/extension/db/tooling/valueprovider/ColumnValueProviderTestCase.java
index 39cf4a8f5..527a6069f 100644
--- a/src/test/java/org/mule/extension/db/tooling/valueprovider/ColumnValueProviderTestCase.java
+++ b/src/test/java/org/mule/extension/db/tooling/valueprovider/ColumnValueProviderTestCase.java
@@ -29,7 +29,7 @@ public class ColumnValueProviderTestCase extends AbstractDbIntegrationTestCase
@Override
protected String[] getFlowConfigurationResources() {
- return new String[] {"integration/valueprovider/derby-on-table-row-config.xml"};
+ return new String[] {"integration/valueprovider/teradata-on-table-row-config.xml"};
}
@Test
diff --git a/src/test/java/org/mule/extension/db/unit/MuleMySqlLoggerEnhancerFactoryTestCase.java b/src/test/java/org/mule/extension/db/unit/MuleMySqlLoggerEnhancerFactoryTestCase.java
deleted file mode 100644
index 0c65c4135..000000000
--- a/src/test/java/org/mule/extension/db/unit/MuleMySqlLoggerEnhancerFactoryTestCase.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.unit;
-
-import org.junit.Test;
-import org.mule.extension.db.api.logger.MuleMySqlLogger;
-import org.mule.extension.db.internal.domain.connection.mysql.MySqlConnectionParameters;
-import org.mule.extension.db.internal.domain.logger.MuleMySqlLoggerEnhancerFactory;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-public class MuleMySqlLoggerEnhancerFactoryTestCase {
-
- @Test
- public void verifyMuleMySqlLoggerClassIsCalled() {
- String TESTING_ENHANCER = "Testing Enhancer";
- MuleMySqlLogger delegate = mock(MuleMySqlLogger.class);
- MuleMySqlLogger logger =
- new MuleMySqlLoggerEnhancerFactory(Thread.currentThread().getContextClassLoader(), delegate).create();
-
- logger.logInfo(TESTING_ENHANCER);
- verify(delegate).logInfo(TESTING_ENHANCER);
- }
-
- @Test
- public void verifyMuleMySqlLoggerIsPlacedAsConnectionProperty() {
- MySqlConnectionParameters mySqlConnectionParameters = new MySqlConnectionParameters();
-
- assertThat(mySqlConnectionParameters.getConnectionProperties().get("logger"), containsString("MuleMySqlLogger"));
- }
-}
diff --git a/src/test/java/org/mule/extension/db/unit/SqlServerConnectionParametersUnitTestCase.java b/src/test/java/org/mule/extension/db/unit/SqlServerConnectionParametersUnitTestCase.java
deleted file mode 100644
index 36075d2a2..000000000
--- a/src/test/java/org/mule/extension/db/unit/SqlServerConnectionParametersUnitTestCase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) MuleSoft, Inc. All rights reserved. http://www.mulesoft.com
- * The software in this package is published under the terms of the CPAL v1.0
- * license, a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- */
-package org.mule.extension.db.unit;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.mule.extension.db.internal.domain.connection.sqlserver.SqlServerConnectionParameters;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class SqlServerConnectionParametersUnitTestCase {
-
- private SqlServerConnectionParameters sqlServerConnectionParameters;
-
- @Before
- public void setUpSqlServerConnectionParameters() {
- sqlServerConnectionParameters = new SqlServerConnectionParameters();
- sqlServerConnectionParameters.setHost("HOST");
- sqlServerConnectionParameters.setInstanceName(null);
- sqlServerConnectionParameters.setPort(1443);
- sqlServerConnectionParameters.setUser("max");
- sqlServerConnectionParameters.setPassword("secretWord");
- sqlServerConnectionParameters.setDatabaseName(null);
- sqlServerConnectionParameters.setConnectionProperties(Collections.emptyMap());
- }
-
- @Test
- public void defaultUrl() {
- validate("jdbc:sqlserver://HOST:1443");
- }
-
- @Test
- public void implicitPortUrl() {
- sqlServerConnectionParameters.setPort(null);
- validate("jdbc:sqlserver://HOST");
- }
-
- @Test
- public void instanceNameNoPortUrl() {
- sqlServerConnectionParameters.setInstanceName("INSTANCE");
- sqlServerConnectionParameters.setPort(null);
- validate("jdbc:sqlserver://HOST\\INSTANCE");
- }
-
- @Test
- public void instanceNameAndPortUrl() {
- sqlServerConnectionParameters.setInstanceName("INSTANCE");
- validate("jdbc:sqlserver://HOST\\INSTANCE:1443");
- }
-
- @Test
- public void dDbNameUrl() {
- sqlServerConnectionParameters.setDatabaseName("databaseName");
- validate("jdbc:sqlserver://HOST:1443;databaseName=databaseName");
- }
-
- @Test
- public void withExplicitConnectionPropertiesAndDbName() {
- Map connectionProperties = new HashMap<>();
- connectionProperties.put("integratedSecurity", "true");
- sqlServerConnectionParameters.setPort(3789);
- sqlServerConnectionParameters.setDatabaseName("databseName");
- sqlServerConnectionParameters.setConnectionProperties(connectionProperties);
- validate("jdbc:sqlserver://HOST:3789;databaseName=databseName;integratedSecurity=true");
- }
-
- public void validate(String expectedUrl) {
- assertThat(sqlServerConnectionParameters.getUrl(), is(expectedUrl));
- }
-
-}
diff --git a/src/test/java/org/mule/extension/db/unit/TeradataConnectionParametersUnitTestCase.java b/src/test/java/org/mule/extension/db/unit/TeradataConnectionParametersUnitTestCase.java
index 503816f38..745725fbe 100644
--- a/src/test/java/org/mule/extension/db/unit/TeradataConnectionParametersUnitTestCase.java
+++ b/src/test/java/org/mule/extension/db/unit/TeradataConnectionParametersUnitTestCase.java
@@ -8,7 +8,6 @@
import org.junit.Before;
import org.junit.Test;
-import org.mule.extension.db.internal.domain.connection.sqlserver.SqlServerConnectionParameters;
import org.mule.extension.db.internal.domain.connection.teradata.TeradataConnectionParameters;
import java.util.Collections;
diff --git a/src/test/munit/mysql/config.xml b/src/test/munit/mysql/config.xml
deleted file mode 100644
index 91dd449b8..000000000
--- a/src/test/munit/mysql/config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/munit/mysql/delete-journey-test-case.xml b/src/test/munit/mysql/delete-journey-test-case.xml
deleted file mode 100644
index 07d026258..000000000
--- a/src/test/munit/mysql/delete-journey-test-case.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/mysql/execute-ddl-journey-test-case.xml b/src/test/munit/mysql/execute-ddl-journey-test-case.xml
deleted file mode 100644
index a2d4de236..000000000
--- a/src/test/munit/mysql/execute-ddl-journey-test-case.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/mysql/execute-script-journey-test-case.xml b/src/test/munit/mysql/execute-script-journey-test-case.xml
deleted file mode 100644
index f59dad6ad..000000000
--- a/src/test/munit/mysql/execute-script-journey-test-case.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/mysql/mysql-connector-flows.xml b/src/test/munit/mysql/mysql-connector-flows.xml
deleted file mode 100644
index 6df0ccf1a..000000000
--- a/src/test/munit/mysql/mysql-connector-flows.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/mysql/select-journey-test-case.xml b/src/test/munit/mysql/select-journey-test-case.xml
deleted file mode 100644
index 153a184d1..000000000
--- a/src/test/munit/mysql/select-journey-test-case.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1) GROUP BY id;]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/mysql/update-journey-test-case.xml b/src/test/munit/mysql/update-journey-test-case.xml
deleted file mode 100644
index f14536b72..000000000
--- a/src/test/munit/mysql/update-journey-test-case.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/oracle/arrays-and-structs-oracle-test-case.xml b/src/test/munit/oracle/arrays-and-structs-oracle-test-case.xml
deleted file mode 100644
index 39247761e..000000000
--- a/src/test/munit/oracle/arrays-and-structs-oracle-test-case.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- create or replace type TEST_STRUCT as object (field1 varchar2(3), field2 number(2), field3 varchar2(60))
-
-
- create or replace type TEST_STRUCT_COLLECTION as table of TEST_STRUCT
-
-
- 1 then
- z := TEST_STRUCT_COLLECTION(z(1));
- end if;
-end;
-]]>
-
-
-
-
-
-
-
-
- call retain_first_struct(:list)
-
-
-
-
-
-
-
-
-
-
-
-
-
- call retain_first_struct(:list)
-
-
-
-
-
-
-
-
-
-
-
-
- drop procedure retain_first_struct;
- drop type TEST_STRUCT_COLLECTION;
- drop type TEST_STRUCT;
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/oracle/config.xml b/src/test/munit/oracle/config.xml
deleted file mode 100644
index 34b36b1da..000000000
--- a/src/test/munit/oracle/config.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/munit/oracle/insert-n-clob-oracle-test-case.xml b/src/test/munit/oracle/insert-n-clob-oracle-test-case.xml
deleted file mode 100644
index 676df40fa..000000000
--- a/src/test/munit/oracle/insert-n-clob-oracle-test-case.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- INSERT INTO NCLOBTest(COL1) VALUES (:description)
-
-
- #[
- {'description' : "Some test NClob text"}
- ]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/oracle/select-oracle-test-case.xml b/src/test/munit/oracle/select-oracle-test-case.xml
deleted file mode 100644
index 601983878..000000000
--- a/src/test/munit/oracle/select-oracle-test-case.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SELECT * FROM LOBTEST
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/oracle/stored-procedure-clob-output-oracle-test-case.xml b/src/test/munit/oracle/stored-procedure-clob-output-oracle-test-case.xml
deleted file mode 100644
index e168186e7..000000000
--- a/src/test/munit/oracle/stored-procedure-clob-output-oracle-test-case.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- { call magicPackageVersionThree.getClob(:sys_refcursor) }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/munit/teradata/config.xml b/src/test/munit/teradata/config.xml
index 6ec9ed1a6..30eea56cc 100644
--- a/src/test/munit/teradata/config.xml
+++ b/src/test/munit/teradata/config.xml
@@ -1,30 +1,30 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/test/munit/teradata/select-journey-test-case.xml b/src/test/munit/teradata/select-journey-test-case.xml
index 40a864add..65f3d89f2 100644
--- a/src/test/munit/teradata/select-journey-test-case.xml
+++ b/src/test/munit/teradata/select-journey-test-case.xml
@@ -1,13 +1,13 @@
@@ -19,9 +19,9 @@ http://www.mulesoft.org/schema/mule/ee/core http://www.mulesoft.org/schema/mule/
-
-
-
+
+
+
-
-
-
+
+
+
-
- 1) GROUP BY id;]]>
-
-
+
+ 1) GROUP BY id;]]>
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -114,9 +114,9 @@ payload]]>
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -161,12 +161,12 @@ payload]]>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -187,9 +187,9 @@ payload]]>
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
+
-
+);]]>
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/src/test/resources/docker/oracle-mtls/Dockerfile b/src/test/resources/docker/oracle-mtls/Dockerfile
deleted file mode 100644
index 98c3d8521..000000000
--- a/src/test/resources/docker/oracle-mtls/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM kyleaure/oracle-18.4.0-expanded:1.0.full.ssl
-
-COPY setup/ /tmp/setup/
-COPY startup/ /opt/oracle/scripts/startup
-
-USER root
-RUN chmod 777 /tmp/setup/enable_ssl.sh
-RUN /tmp/setup/enable_ssl.sh
-RUN rm -rf /tmp/setup
-
-EXPOSE 1521 1522
-
-USER oracle
-CMD ["/bin/sh","-c", "exec $ORACLE_BASE/$RUN_FILE"]
-
-# Currently tagged in DockerHub as: kyleaure/oracle-ssl-18.4.0-xe-prebuilt:2.0
\ No newline at end of file
diff --git a/src/test/resources/docker/oracle-mtls/setup/enable_ssl.sh b/src/test/resources/docker/oracle-mtls/setup/enable_ssl.sh
deleted file mode 100644
index 3a0cc1166..000000000
--- a/src/test/resources/docker/oracle-mtls/setup/enable_ssl.sh
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-
-# This is an enablement script we want to run during image creation
-
-echoDebug() {
- local GREEN="\033[32m"
- local NOCOLOR="\033[0m"
- echo
- echo -e $GREEN$1$NOCOLOR
- echo
-}
-
-#These steps follow this guide:
-# https://docs.oracle.com/en-us/iaas/data-safe/doc/create-jks-wallets-tls-connection-db-system-that-has-client-authentication-enabled.html
-
-if [ -z ${ORACLE_HOME} ]; then
- echoDebug "No ORACLE_HOME variable. Exiting..."
- exit 1
-fi
-
-WALLET_PWD="WalletPasswd123"
-DN="CN=localhost"
-
-#PART 1: Creating server wallet and cert
-SERVER_WALLET="/u01/app/oracle/wallet"
-SERVER_CERT="/tmp/oracle-server-certificate.crt"
-echoDebug "START >>> Creating server wallet and cert"
-mkdir -p /u01/app/oracle/wallet
-orapki wallet create -wallet $SERVER_WALLET -pwd $WALLET_PWD -auto_login
-orapki wallet add -wallet $SERVER_WALLET -pwd $WALLET_PWD -dn $DN -keysize 1024 -self_signed -validity 36500
-orapki wallet display -wallet $SERVER_WALLET -pwd $WALLET_PWD
-orapki wallet export -wallet $SERVER_WALLET -pwd $WALLET_PWD -dn $DN -cert $SERVER_CERT
-orapki cert display -cert $SERVER_CERT -complete
-echoDebug "DONE >>> Creating server wallet and cert"
-
-#PART 2: Create a Client Wallet and Certificate
-CLIENT_WALLET="/client/oracle/wallet"
-CLIENT_CERT="/tmp/oracle-client-certificate.crt"
-echoDebug "START >>> Create client wallet and cert"
-mkdir -p /client/oracle/wallet
-orapki wallet create -wallet $CLIENT_WALLET -pwd $WALLET_PWD -auto_login
-orapki wallet add -wallet $CLIENT_WALLET -pwd $WALLET_PWD -dn $DN -keysize 1024 -self_signed -validity 36500
-orapki wallet display -wallet $CLIENT_WALLET -pwd $WALLET_PWD
-orapki wallet export -wallet $CLIENT_WALLET -pwd $WALLET_PWD -dn $DN -cert $CLIENT_CERT
-orapki cert display -cert $CLIENT_CERT -complete
-echoDebug "DONE >>> Create client wallet and cert"
-
-# PART 3: Exchange Client and Server Certificates
-echoDebug "START >>> Exchange certs"
-orapki wallet add -wallet $CLIENT_WALLET -pwd $WALLET_PWD -trusted_cert -cert $SERVER_CERT -validity 36500
-orapki wallet display -wallet $CLIENT_WALLET -pwd $WALLET_PWD
-orapki wallet add -wallet $SERVER_WALLET -pwd $WALLET_PWD -trusted_cert -cert $CLIENT_CERT -validity 36500
-orapki wallet display -wallet $SERVER_WALLET -pwd $WALLET_PWD
-echoDebug "DONE >>> Exchanging certs"
-
-# PART 3.1: Modify owner of server wallet
-chown -R oracle:oinstall $SERVER_WALLET
-chown -R oracle:oinstall $CLIENT_WALLET
-
-# PART 4: Create JKS wallet from oracle wallet
-echoDebug "START >>> Create JKS wallet"
-CLIENT_KEYSTORE="/client/oracle/store/client-keystore.jks"
-CLIENT_TRUSTSTORE="/client/oracle/store/client-truststore.jks"
-mkdir -p /client/oracle/store
-orapki wallet pkcs12_to_jks \
- -wallet $CLIENT_WALLET/ewallet.p12 -pwd $WALLET_PWD \
- -jksKeyStoreLoc $CLIENT_KEYSTORE -jksKeyStorepwd $WALLET_PWD \
- -jksTrustStoreLoc $CLIENT_TRUSTSTORE -jksTrustStorepwd $WALLET_PWD
-echoDebug "DONE >>> Create JKS wallet"
-
-# PART 5: Configure server network
-## Overwrite to sqlnet.ora
-SQLNET=/opt/oracle/oradata/dbconfig/XE/sqlnet.ora
-SQLNET_BACKUP=/opt/oracle/oradata/dbconfig/XE/sqlnet.backup
-touch $SQLNET_BACKUP && cat $SQLNET > $SQLNET_BACKUP
-cat < $SQLNET
-# Generated by Oracle configuration tools.
-
-NAMES.DIRECTORY_PATH= (TNSNAMES, EZCONNECT)
-
-WALLET_LOCATION =
- (SOURCE =
- (METHOD = FILE)
- (METHOD_DATA =
- (DIRECTORY = $SERVER_WALLET)
- )
- )
-
-# General Settings
-SSL_CLIENT_AUTHENTICATION = TRUE
-
-# SQLNET Settings
-SQLNET.AUTHENTICATION_SERVICES = (TCPS, BEQ, NONE)
-EOF
-
-echoDebug "DIFF: $SQLNET_BACKUP >>> $SQLNET"
-diff -w $SQLNET_BACKUP $SQLNET
-
-## Overwrite to listener.ora
-LISTENER=/opt/oracle/oradata/dbconfig/XE/listener.ora
-LISTENER_BACKUP=/opt/oracle/oradata/dbconfig/XE/listener.backup
-touch $LISTENER_BACKUP && cat $LISTENER > $LISTENER_BACKUP
-cat < $LISTENER
-# listener.ora Network Configuration File:
-
-SID_LIST_LISTENER =
- (SID_LIST =
- (SID_DESC =
- (SID_NAME = PLSExtProc)
- (ORACLE_HOME = /opt/oracle/product/18c/dbhomeXE)
- (PROGRAM = extproc)
- )
- )
-
-LISTENER =
- (DESCRIPTION_LIST =
- (DESCRIPTION =
- (ADDRESS = (PROTOCOL = TCP)(HOST = 0.0.0.0)(PORT = 1521))
- )
- (DESCRIPTION =
- (ADDRESS = (PROTOCOL = TCPS)(HOST = 0.0.0.0)(PORT = 1522))
- )
- )
-
-DEFAULT_SERVICE_LISTENER = (XE)
-
-WALLET_LOCATION =
- (SOURCE =
- (METHOD = FILE)
- (METHOD_DATA =
- (DIRECTORY = $SERVER_WALLET)
- )
- )
-
-SSL_CLIENT_AUTHENTICATION = TRUE
-EOF
-
-echoDebug "DIFF: $SQLNET_BACKUP >>> $SQLNET"
-diff -w $LISTENER_BACKUP $LISTENER
-
-#Overwrite to tnsnames.ora
-TNSNAMES=/opt/oracle/oradata/dbconfig/XE/tnsnames.ora
-TNSNAMES_BACKUP=/opt/oracle/oradata/dbconfig/XE/tnsnames.backup
-touch $TNSNAMES_BACKUP && cat $TNSNAMES > $TNSNAMES_BACKUP
-cat < $TNSNAMES
-XE =
- (DESCRIPTION =
- (ADDRESS_LIST =
- (ADDRESS = (PROTOCOL = TCP )(HOST = 0.0.0.0)(PORT = 1521))
- (ADDRESS = (PROTOCOL = TCPS)(HOST = 0.0.0.0)(PORT = 1522))
- )
- (CONNECT_DATA =
- (SERVER = DEDICATED)
- (SERVICE_NAME = XE)
- )
- )
-
-LISTENER_XE =
- (ADDRESS_LIST =
- (ADDRESS = (PROTOCOL = TCP )(HOST = 0.0.0.0)(PORT = 1521))
- (ADDRESS = (PROTOCOL = TCPS)(HOST = 0.0.0.0)(PORT = 1522))
- )
-
-XEPDB1 =
- (DESCRIPTION_LIST =
- (DESCRIPTION =
- (ADDRESS_LIST =
- (ADDRESS = (PROTOCOL = TCP )(HOST = 0.0.0.0)(PORT = 1521))
- (ADDRESS = (PROTOCOL = TCPS)(HOST = 0.0.0.0)(PORT = 1522))
- )
- (CONNECT_DATA =
- (SERVER = DEDICATED)
- (SERVICE_NAME = XEPDB1)
- )
- )
- )
-
-EXTPROC_CONNECTION_DATA =
- (DESCRIPTION =
- (ADDRESS_LIST =
- (ADDRESS = (PROTOCOL = IPC)(KEY = EXTPROC_FOR_XE))
- )
- (CONNECT_DATA =
- (SID = PLSExtProc)
- (PRESENTATION = RO)
- )
- )
-EOF
-
-echoDebug "DIFF: $TNSNAMES_BACKUP >>> $TNSNAMES"
-diff -w $TNSNAMES_BACKUP $TNSNAMES
-
-# For some reason this oracle image does not allow user 'oracle' to run the oracle process *sigh*
-chmod 6751 $ORACLE_HOME/bin/oracle
\ No newline at end of file
diff --git a/src/test/resources/docker/oracle-mtls/startup/startup.sql b/src/test/resources/docker/oracle-mtls/startup/startup.sql
deleted file mode 100644
index 02a70a939..000000000
--- a/src/test/resources/docker/oracle-mtls/startup/startup.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- Ignore pluggable databases
-alter session set "_ORACLE_SCRIPT"=true;
-
--- Add authenticated user
-create user sslclient identified externally as'CN=localhost';
-grant all privileges to sslclient;
\ No newline at end of file
diff --git a/src/test/resources/integration/complextypes/large-object-round-trip.xml b/src/test/resources/integration/complextypes/large-object-round-trip.xml
index 42bcd2ad3..486e82888 100644
--- a/src/test/resources/integration/complextypes/large-object-round-trip.xml
+++ b/src/test/resources/integration/complextypes/large-object-round-trip.xml
@@ -1,74 +1,74 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, DESCRIPTION) VALUES (:id, :description)
-
+
+ INSERT INTO PLANET(PLANET_POS, DESCRIPTION) VALUES (:id, :description)
+
#[
{
'id' : vars.id,
'description' : payload
}]
-
-
+
+
-
- SELECT DESCRIPTION from PLANET where PLANET_POS = :planet_pos
-
+
+ SELECT DESCRIPTION from PLANET where PLANET_POS = :planet_pos
+
#[
{
'planet_pos' : vars.planet_pos,
}]
-
-
+
+
-
- INSERT INTO PLANET(PLANET_POS, PICTURE) VALUES (:id, :picture)
-
+
+ INSERT INTO PLANET(PLANET_POS, PICTURE) VALUES (:id, :picture)
+
#[
{
'id' : vars.id,
'picture' : payload
}]
-
-
+
+
-
- SELECT PICTURE from PLANET where PLANET_POS = :planet_pos
-
+
+ SELECT PICTURE from PLANET where PLANET_POS = :planet_pos
+
#[
{
'planet_pos' : vars.planet_pos,
}]
-
-
+
+
-
- select SAMPLE_TEXT from LANGUAGES where NAME = :language
-
+
+ select SAMPLE_TEXT from LANGUAGES where NAME = :language
+
#[
{
'language' : vars.languageName,
}
]
-
-
+
+
diff --git a/src/test/resources/integration/config/db-negative-connectivity-testing-config.xml b/src/test/resources/integration/config/db-negative-connectivity-testing-config.xml
index 872eabf84..04d509d8a 100644
--- a/src/test/resources/integration/config/db-negative-connectivity-testing-config.xml
+++ b/src/test/resources/integration/config/db-negative-connectivity-testing-config.xml
@@ -1,95 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/test/resources/integration/config/derby-datasource.xml b/src/test/resources/integration/config/derby-datasource.xml
deleted file mode 100644
index d77b4f35f..000000000
--- a/src/test/resources/integration/config/derby-datasource.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/derby-dynamic-minimum-pooling-db-config.xml b/src/test/resources/integration/config/derby-dynamic-minimum-pooling-db-config.xml
deleted file mode 100644
index d2cc228cf..000000000
--- a/src/test/resources/integration/config/derby-dynamic-minimum-pooling-db-config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/derby-minimum-pooling-db-config.xml b/src/test/resources/integration/config/derby-minimum-pooling-db-config.xml
deleted file mode 100644
index cd7863cf8..000000000
--- a/src/test/resources/integration/config/derby-minimum-pooling-db-config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/config/derby-pooling-db-config.xml b/src/test/resources/integration/config/derby-pooling-db-config.xml
deleted file mode 100644
index cbcd37d87..000000000
--- a/src/test/resources/integration/config/derby-pooling-db-config.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/derby-xa-pooling-db-config.xml b/src/test/resources/integration/config/derby-xa-pooling-db-config.xml
deleted file mode 100644
index f1c4bce2d..000000000
--- a/src/test/resources/integration/config/derby-xa-pooling-db-config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/config/dynamic-derby-xa-pooling-db-config.xml b/src/test/resources/integration/config/dynamic-derby-xa-pooling-db-config.xml
deleted file mode 100644
index 3e0f6658c..000000000
--- a/src/test/resources/integration/config/dynamic-derby-xa-pooling-db-config.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/mssql-db-config.xml b/src/test/resources/integration/config/mssql-db-config.xml
deleted file mode 100644
index f514786b6..000000000
--- a/src/test/resources/integration/config/mssql-db-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/mysql-db-config.xml b/src/test/resources/integration/config/mysql-db-config.xml
deleted file mode 100644
index 61cfed164..000000000
--- a/src/test/resources/integration/config/mysql-db-config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/oracle-db-config.xml b/src/test/resources/integration/config/oracle-db-config.xml
deleted file mode 100644
index 6fa6852c9..000000000
--- a/src/test/resources/integration/config/oracle-db-config.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/oracle-mapped-udt-db-config.xml b/src/test/resources/integration/config/oracle-mapped-udt-db-config.xml
deleted file mode 100644
index c9511d6f9..000000000
--- a/src/test/resources/integration/config/oracle-mapped-udt-db-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/oracle-unmapped-udt-db-config.xml b/src/test/resources/integration/config/oracle-unmapped-udt-db-config.xml
deleted file mode 100644
index 2adaa3005..000000000
--- a/src/test/resources/integration/config/oracle-unmapped-udt-db-config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/oracle-with-column-types-config.xml b/src/test/resources/integration/config/oracle-with-column-types-config.xml
deleted file mode 100644
index 6fda42f46..000000000
--- a/src/test/resources/integration/config/oracle-with-column-types-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/config/teradata-db-config.xml b/src/test/resources/integration/config/teradata-db-config.xml
index d5efe9a04..2d074946d 100644
--- a/src/test/resources/integration/config/teradata-db-config.xml
+++ b/src/test/resources/integration/config/teradata-db-config.xml
@@ -1,29 +1,28 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/test/resources/integration/connectivity/connection-pooling-config.xml b/src/test/resources/integration/connectivity/connection-pooling-config.xml
index f4ce9d5b4..83a5e5d38 100644
--- a/src/test/resources/integration/connectivity/connection-pooling-config.xml
+++ b/src/test/resources/integration/connectivity/connection-pooling-config.xml
@@ -1,17 +1,17 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- delete from PLANET
-
+
+ delete from PLANET
+
@@ -29,9 +29,9 @@
-
- select * from PLANET
-
+
+ select * from PLANET
+
@@ -50,9 +50,9 @@
-
- select * from PLANET
-
+
+ select * from PLANET
+
@@ -71,9 +71,9 @@
-
- select * from PLANET
-
+
+ select * from PLANET
+
@@ -91,9 +91,9 @@
-
- delete from PLANET
-
+
+ delete from PLANET
+
@@ -111,9 +111,9 @@
-
- delete from PLANET
-
+
+ delete from PLANET
+
diff --git a/src/test/resources/integration/connectivity/derby-db-pool-reset-config.xml b/src/test/resources/integration/connectivity/derby-db-pool-reset-config.xml
deleted file mode 100644
index 9a219e62e..000000000
--- a/src/test/resources/integration/connectivity/derby-db-pool-reset-config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- select * from PLANET order by ID
-
-
-
diff --git a/src/test/resources/integration/connectivity/mysql-db-pooling-config.xml b/src/test/resources/integration/connectivity/mysql-db-pooling-config.xml
deleted file mode 100644
index 9ef76c7b7..000000000
--- a/src/test/resources/integration/connectivity/mysql-db-pooling-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/connectivity/oracle-db-pooling-config.xml b/src/test/resources/integration/connectivity/oracle-db-pooling-config.xml
deleted file mode 100644
index e6c9ccafc..000000000
--- a/src/test/resources/integration/connectivity/oracle-db-pooling-config.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/connectivity/sqlserver-db-pooling-config.xml b/src/test/resources/integration/connectivity/sqlserver-db-pooling-config.xml
deleted file mode 100644
index aedcc96f8..000000000
--- a/src/test/resources/integration/connectivity/sqlserver-db-pooling-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/connectivity/teradata-db-pooling-config.xml b/src/test/resources/integration/connectivity/teradata-db-pooling-config.xml
index 4fd141e74..90a90232c 100644
--- a/src/test/resources/integration/connectivity/teradata-db-pooling-config.xml
+++ b/src/test/resources/integration/connectivity/teradata-db-pooling-config.xml
@@ -1,63 +1,63 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/integration/ddl/execute-ddl-config.xml b/src/test/resources/integration/ddl/execute-ddl-config.xml
index 19a60631c..09354d454 100644
--- a/src/test/resources/integration/ddl/execute-ddl-config.xml
+++ b/src/test/resources/integration/ddl/execute-ddl-config.xml
@@ -1,14 +1,14 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- CREATE TABLE TestDdl(NAME VARCHAR(255))
-
+
+ CREATE TABLE TestDdl(NAME VARCHAR(255))
+
diff --git a/src/test/resources/integration/delete/bulk-delete-config.xml b/src/test/resources/integration/delete/bulk-delete-config.xml
index a9c492d24..f4a11c73f 100644
--- a/src/test/resources/integration/delete/bulk-delete-config.xml
+++ b/src/test/resources/integration/delete/bulk-delete-config.xml
@@ -1,32 +1,32 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- DELETE FROM PLANET WHERE name = :name
-
+
+ DELETE FROM PLANET WHERE name = :name
+
-
- DELETE FROM PLANET WHERE name = :name
-
-
-
-
+
+ DELETE FROM PLANET WHERE name = :name
+
+
+
+
-
- select * from PLANET
-
+
+ select * from PLANET
+
-
- update PLANET set NAME='Mercury' where PLANET_POS=:planet_pos
-
+
+ update PLANET set NAME='Mercury' where PLANET_POS=:planet_pos
+
diff --git a/src/test/resources/integration/delete/delete-config.xml b/src/test/resources/integration/delete/delete-config.xml
index 8676ba272..c2c08d6ff 100644
--- a/src/test/resources/integration/delete/delete-config.xml
+++ b/src/test/resources/integration/delete/delete-config.xml
@@ -1,33 +1,33 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- #["DELETE FROM PLANET WHERE name = '$(payload)'"]
-
+
+ #["DELETE FROM PLANET WHERE name = '$(payload)'"]
+
-
- #["DELETE FROM PLANET WHERE name = '$(payload)'"]
-
+
+ #["DELETE FROM PLANET WHERE name = '$(payload)'"]
+
#[null]
-
-
+
+
-
- DELETE FROM PLANET WHERE name = :name
-
+
+ DELETE FROM PLANET WHERE name = :name
+
#[{
'name' : payload
}]
-
-
+
+
diff --git a/src/test/resources/integration/delete/delete-metadata-config.xml b/src/test/resources/integration/delete/delete-metadata-config.xml
index e62f06324..6e3cf552f 100644
--- a/src/test/resources/integration/delete/delete-metadata-config.xml
+++ b/src/test/resources/integration/delete/delete-metadata-config.xml
@@ -1,20 +1,20 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- DELETE FROM PLANET WHERE name = :name
-
+
+ DELETE FROM PLANET WHERE name = :name
+
-
- DELETE FROM PLANET WHERE name = :name
-
+
+ DELETE FROM PLANET WHERE name = :name
+
diff --git a/src/test/resources/integration/domain/db-client-app.xml b/src/test/resources/integration/domain/db-client-app.xml
index 2790b6416..ff421e461 100644
--- a/src/test/resources/integration/domain/db-client-app.xml
+++ b/src/test/resources/integration/domain/db-client-app.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
diff --git a/src/test/resources/integration/domain/db-derby-shared-connnector-beans.xml b/src/test/resources/integration/domain/db-derby-shared-connnector-beans.xml
deleted file mode 100644
index 5ac7ca29d..000000000
--- a/src/test/resources/integration/domain/db-derby-shared-connnector-beans.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/domain/db-derby-shared-connnector.xml b/src/test/resources/integration/domain/db-derby-shared-connnector.xml
deleted file mode 100644
index 95baf8f0a..000000000
--- a/src/test/resources/integration/domain/db-derby-shared-connnector.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/domain/db-server-app.xml b/src/test/resources/integration/domain/db-server-app.xml
index ddfeae692..97cc1a36b 100644
--- a/src/test/resources/integration/domain/db-server-app.xml
+++ b/src/test/resources/integration/domain/db-server-app.xml
@@ -1,10 +1,10 @@
@@ -14,9 +14,9 @@
-
- select * from Planet
-
+
+ select * from Planet
+
diff --git a/src/test/resources/integration/domain/db-shared-connnector.xml b/src/test/resources/integration/domain/db-shared-connnector.xml
index c4b1600f0..ac36097c0 100644
--- a/src/test/resources/integration/domain/db-shared-connnector.xml
+++ b/src/test/resources/integration/domain/db-shared-connnector.xml
@@ -1,11 +1,11 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
+
diff --git a/src/test/resources/integration/executescript/execute-script-config.xml b/src/test/resources/integration/executescript/execute-script-config.xml
index 51f2e9bb4..75d373fe2 100644
--- a/src/test/resources/integration/executescript/execute-script-config.xml
+++ b/src/test/resources/integration/executescript/execute-script-config.xml
@@ -1,21 +1,21 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
update PLANET set NAME='Mercury' where PLANET_POS=0;
update PLANET set NAME='Mercury' where PLANET_POS=4
-
-
+
+
-
+
diff --git a/src/test/resources/integration/executescript/execute-script-file-and-text-config.xml b/src/test/resources/integration/executescript/execute-script-file-and-text-config.xml
index 494120a79..e5a90f135 100644
--- a/src/test/resources/integration/executescript/execute-script-file-and-text-config.xml
+++ b/src/test/resources/integration/executescript/execute-script-file-and-text-config.xml
@@ -1,17 +1,17 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
update PLANET set NAME='Mercury' where PLANET_POS=0;
update PLANET set NAME='Mercury' where PLANET_POS=4
-
-
+
+
diff --git a/src/test/resources/integration/executescript/execute-script-timeout-config.xml b/src/test/resources/integration/executescript/execute-script-timeout-config.xml
index 41277cbe8..83bc2a3a5 100644
--- a/src/test/resources/integration/executescript/execute-script-timeout-config.xml
+++ b/src/test/resources/integration/executescript/execute-script-timeout-config.xml
@@ -1,15 +1,15 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
#["update PLANET set NAME='Mercury' where DELAY($(payload)) = 1"]
-
-
+
+
diff --git a/src/test/resources/integration/function/oracle/create-array.xml b/src/test/resources/integration/function/oracle/create-array.xml
deleted file mode 100644
index 8c2b2c9fe..000000000
--- a/src/test/resources/integration/function/oracle/create-array.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/function/oracle/create-struct.xml b/src/test/resources/integration/function/oracle/create-struct.xml
deleted file mode 100644
index fc9253e7b..000000000
--- a/src/test/resources/integration/function/oracle/create-struct.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/test/resources/integration/insert/bulk-insert-config.xml b/src/test/resources/integration/insert/bulk-insert-config.xml
index ea8e53321..92d0499c4 100644
--- a/src/test/resources/integration/insert/bulk-insert-config.xml
+++ b/src/test/resources/integration/insert/bulk-insert-config.xml
@@ -1,53 +1,53 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
+
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
-
-
-
-
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
+
+
+
+
+
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
-
-
-
-
-
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
+
+
+
+
+
+
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
-
-
-
-
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:planet_pos, :name)
+
+
+
+
+
-
- #["SELECT NAME from PLANET WHERE PLANET_POS >= :pos ORDER BY PLANET_POS"]
-
+
+ #["SELECT NAME from PLANET WHERE PLANET_POS >= :pos ORDER BY PLANET_POS"]
+
#[{'pos' : vars.positionOffset}]
-
-
+
+
diff --git a/src/test/resources/integration/insert/insert-auto-generated-key-column-index-config.xml b/src/test/resources/integration/insert/insert-auto-generated-key-column-index-config.xml
index 1df76e12b..83750d594 100644
--- a/src/test/resources/integration/insert/insert-auto-generated-key-column-index-config.xml
+++ b/src/test/resources/integration/insert/insert-auto-generated-key-column-index-config.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
-
-
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
+
+
+
diff --git a/src/test/resources/integration/insert/insert-auto-generated-key-column-name-config.xml b/src/test/resources/integration/insert/insert-auto-generated-key-column-name-config.xml
index f0a0a4675..0db918006 100644
--- a/src/test/resources/integration/insert/insert-auto-generated-key-column-name-config.xml
+++ b/src/test/resources/integration/insert/insert-auto-generated-key-column-name-config.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
-
-
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
+
+
+
diff --git a/src/test/resources/integration/insert/insert-auto-generated-key-default-config.xml b/src/test/resources/integration/insert/insert-auto-generated-key-default-config.xml
index f9fd05ded..a2a4fbc3c 100644
--- a/src/test/resources/integration/insert/insert-auto-generated-key-default-config.xml
+++ b/src/test/resources/integration/insert/insert-auto-generated-key-default-config.xml
@@ -1,13 +1,13 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
diff --git a/src/test/resources/integration/insert/insert-clob-input-param-config.xml b/src/test/resources/integration/insert/insert-clob-input-param-config.xml
index c09c28ac1..69e56e38c 100644
--- a/src/test/resources/integration/insert/insert-clob-input-param-config.xml
+++ b/src/test/resources/integration/insert/insert-clob-input-param-config.xml
@@ -1,48 +1,48 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
INSERT INTO PLANET(PLANET_POS, NAME, DESCRIPTION) VALUES (777, 'Pluto', :description)
-
-
+
+
#[
{'description' : payload}
]
-
-
+
+
-
-
+
+
INSERT INTO PLANET(PLANET_POS, NAME, DESCRIPTION) VALUES (777, 'Pluto', :description)
-
-
-
-
-
+
+
+
+
+
#[
{'description' : payload}
]
-
-
+
+
-
- select description from PLANET where name = 'Pluto'
-
+
+ select description from PLANET where name = 'Pluto'
+
diff --git a/src/test/resources/integration/insert/insert-default-config.xml b/src/test/resources/integration/insert/insert-default-config.xml
index f4a624b04..1f7603c51 100644
--- a/src/test/resources/integration/insert/insert-default-config.xml
+++ b/src/test/resources/integration/insert/insert-default-config.xml
@@ -1,34 +1,34 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
-
- #["INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, $(payload))"]
-
+
+ #["INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, $(payload))"]
+
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:id, :name)
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (:id, :name)
+
#[
{
'id' : vars.id,
'name' : payload
}]
-
-
+
+
diff --git a/src/test/resources/integration/insert/insert-metadata-config.xml b/src/test/resources/integration/insert/insert-metadata-config.xml
index 6bbf03c71..2ebe6e167 100644
--- a/src/test/resources/integration/insert/insert-metadata-config.xml
+++ b/src/test/resources/integration/insert/insert-metadata-config.xml
@@ -1,20 +1,20 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, 'Mercury')
+
-
- INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, :name)
-
+
+ INSERT INTO PLANET(PLANET_POS, NAME) VALUES (777, :name)
+
diff --git a/src/test/resources/integration/insert/oracle/insert-nested-tables.xml b/src/test/resources/integration/insert/oracle/insert-nested-tables.xml
deleted file mode 100644
index 0b119dc14..000000000
--- a/src/test/resources/integration/insert/oracle/insert-nested-tables.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
- INSERT INTO SYSTEM.FRUITS_NESTED_TABLE (fruitId, fruits) VALUES (:id, :fruits)
-
-
-
-
-
-
- SELECT * FROM SYSTEM.FRUITS_NESTED_TABLE
-
-
-
diff --git a/src/test/resources/integration/metadata/polling-source-key-resolver.xml b/src/test/resources/integration/metadata/polling-source-key-resolver.xml
index 36fab1f1c..c953ad4f8 100644
--- a/src/test/resources/integration/metadata/polling-source-key-resolver.xml
+++ b/src/test/resources/integration/metadata/polling-source-key-resolver.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
+
-
+
diff --git a/src/test/resources/integration/select/oracle/select-udt-array-config.xml b/src/test/resources/integration/select/oracle/select-udt-array-config.xml
deleted file mode 100644
index 6ec70ba8b..000000000
--- a/src/test/resources/integration/select/oracle/select-udt-array-config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- select * from regions
-
-
-
-
-
- select * from contacts
-
-
-
diff --git a/src/test/resources/integration/select/pending/select/select-error-debug-info-config.xml b/src/test/resources/integration/select/pending/select/select-error-debug-info-config.xml
index 44e1da29b..83e42d490 100644
--- a/src/test/resources/integration/select/pending/select/select-error-debug-info-config.xml
+++ b/src/test/resources/integration/select/pending/select/select-error-debug-info-config.xml
@@ -1,13 +1,13 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- SELECT * FROM PLANET WHERE PLANET_POS = 4
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = 4
+
diff --git a/src/test/resources/integration/select/pending/select/select-source-config.xml b/src/test/resources/integration/select/pending/select/select-source-config.xml
index 74aa3b51c..beeb12748 100644
--- a/src/test/resources/integration/select/pending/select/select-source-config.xml
+++ b/src/test/resources/integration/select/pending/select/select-source-config.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- SELECT * FROM PLANET WHERE name = #[payload]
-
+
+ SELECT * FROM PLANET WHERE name = #[payload]
+
diff --git a/src/test/resources/integration/select/pending/select/select-stored-procedure-metadata-config.xml b/src/test/resources/integration/select/pending/select/select-stored-procedure-metadata-config.xml
index 2fa8a2d33..c3418bb4d 100644
--- a/src/test/resources/integration/select/pending/select/select-stored-procedure-metadata-config.xml
+++ b/src/test/resources/integration/select/pending/select/select-stored-procedure-metadata-config.xml
@@ -1,19 +1,19 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getTestRecords() }
-
+
+ { call getTestRecords() }
+
-
- { call getTestRecords() }
-
+
+ { call getTestRecords() }
+
diff --git a/src/test/resources/integration/select/select-config.xml b/src/test/resources/integration/select/select-config.xml
index 1b9cc3e8a..ac56fe3ca 100644
--- a/src/test/resources/integration/select/select-config.xml
+++ b/src/test/resources/integration/select/select-config.xml
@@ -1,118 +1,118 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- select * from PLANET order by ID
-
+
+ select * from PLANET order by ID
+
-
- select * from PLANET order by ID
-
+
+ select * from PLANET order by ID
+
#[null]
-
-
+
+
-
- SELECT * FROM PLANET WHERE PLANET_POS = 4
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = 4
+
-
- #["SELECT * FROM PLANET WHERE PLANET_POS = $(vars.planet_pos) AND NAME = 'Earth'"]
-
+
+ #["SELECT * FROM PLANET WHERE PLANET_POS = $(vars.planet_pos) AND NAME = 'Earth'"]
+
-
- #["select * from $(vars.tableName) order by ID"]
-
+
+ #["select * from $(vars.tableName) order by ID"]
+
-
- select * from PLANET order by ID
-
+
+ select * from PLANET order by ID
+
-
- select * from SPACESHIP order by ID
-
+
+ select * from SPACESHIP order by ID
+
-
- select * from PLANET where name = :name
-
+
+ select * from PLANET where name = :name
+
#[{'name' : payload}]
-
-
+
+
-
- SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID))
-
+
+ SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID))
+
-
- SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID)) AND (EXISTS (SELECT NAME FROM PLANET WHERE PLANET.ID > 0))
-
+
+ SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID)) AND (EXISTS (SELECT NAME FROM PLANET WHERE PLANET.ID > 0))
+
-
- SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE PLANET.NAME = :planetName AND (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID))
-
+
+ SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE PLANET.NAME = :planetName AND (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID))
+
#[{'planetName' : 'Venus'}]
-
-
+
+
-
- SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID)) AND PLANET.NAME = :planetName
-
+
+ SELECT COUNT(PLANET.ID) AS TOTAL FROM PLANET WHERE (NOT EXISTS (SELECT ID FROM PLANET WHERE 0 > PLANET.ID)) AND PLANET.NAME = :planetName
+
#[{'planetName' : payload}]
-
-
+
+
-
- select name as planetName from PLANET order by ID
-
+
+ select name as planetName from PLANET order by ID
+
-
- I dunno SQL
-
+
+ I dunno SQL
+
-
- SELECT FROM PLANETS col1, col2
-
+
+ SELECT FROM PLANETS col1, col2
+
diff --git a/src/test/resources/integration/select/select-exception-config.xml b/src/test/resources/integration/select/select-exception-config.xml
index 1006528fb..ebeefb49f 100644
--- a/src/test/resources/integration/select/select-exception-config.xml
+++ b/src/test/resources/integration/select/select-exception-config.xml
@@ -1,25 +1,25 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- select * from NOT_EXISTS order by ID
-
+
+ select * from NOT_EXISTS order by ID
+
-
- select * from PLANET order by ID
-
+
+ select * from PLANET order by ID
+
-
- select * from NOT_EXISTS order by ID
-
+
+ select * from NOT_EXISTS order by ID
+
diff --git a/src/test/resources/integration/select/select-metadata-config.xml b/src/test/resources/integration/select/select-metadata-config.xml
index bb4537465..611ae8b86 100644
--- a/src/test/resources/integration/select/select-metadata-config.xml
+++ b/src/test/resources/integration/select/select-metadata-config.xml
@@ -1,25 +1,25 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- SELECT * FROM TABLE2
-
+
+ SELECT * FROM TABLE2
+
-
- INSERT INTO TABLE2 (FRUIT) VALUES (:fruit)
-
+ INSERT INTO TABLE2 (FRUIT) VALUES (:fruit)
+
-
+}]]]>
+
diff --git a/src/test/resources/integration/select/select-single-query.xml b/src/test/resources/integration/select/select-single-query.xml
index b74241ded..c4f7d5bf0 100644
--- a/src/test/resources/integration/select/select-single-query.xml
+++ b/src/test/resources/integration/select/select-single-query.xml
@@ -1,25 +1,25 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- SELECT ID, NAME, PLANET_POS from PLANET WHERE NAME = :name
- #[{name: vars.name}]
-
+
+ SELECT ID, NAME, PLANET_POS from PLANET WHERE NAME = :name
+ #[{name: vars.name}]
+
-
- #["SELECT ID, NAME, PLANET_POS FROM PLANET WHERE NAME = :name"]
- #[{name: vars.name}]
-
+
+ #["SELECT ID, NAME, PLANET_POS FROM PLANET WHERE NAME = :name"]
+ #[{name: vars.name}]
+
@@ -28,50 +28,50 @@
-
- #["SELECT ID, NAME, PLANET_POS FROM PLANET WHERE NAME = :name"]
- #[{name: 'ALPHA CENTAURI'}]
-
+
+ #["SELECT ID, NAME, PLANET_POS FROM PLANET WHERE NAME = :name"]
+ #[{name: 'ALPHA CENTAURI'}]
+
-
- #["SELECT NAME FROM PLANET"]
-
+
+ #["SELECT NAME FROM PLANET"]
+
-
- { call updatePlanetDescription(:name, :description) }
-
-
-
-
+
+ { call updatePlanetDescription(:name, :description) }
+
+
+
+
#[{'name' : vars.name, 'description' : payload}]
-
-
+
+
-
- #["SELECT DESCRIPTION FROM PLANET WHERE NAME = :name"]
-
+
+ #["SELECT DESCRIPTION FROM PLANET WHERE NAME = :name"]
+
#[{'name' : vars.name }]
-
-
+
+
-
- #["UPDATE PLANET SET PICTURE = :picture WHERE NAME = :name"]
-
+
+ #["UPDATE PLANET SET PICTURE = :picture WHERE NAME = :name"]
+
#[{'picture' : payload, 'name' : vars.name }]
-
-
+
+
-
- SELECT PICTURE FROM PLANET WHERE NAME = :name
-
+
+ SELECT PICTURE FROM PLANET WHERE NAME = :name
+
#[{'name' : vars.name }]
-
-
+
+
\ No newline at end of file
diff --git a/src/test/resources/integration/select/select-stored-procedure-config.xml b/src/test/resources/integration/select/select-stored-procedure-config.xml
index 2c5f35006..2122ca3e4 100644
--- a/src/test/resources/integration/select/select-stored-procedure-config.xml
+++ b/src/test/resources/integration/select/select-stored-procedure-config.xml
@@ -1,13 +1,13 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getTestRecords() }
-
+
+ { call getTestRecords() }
+
diff --git a/src/test/resources/integration/select/select-timeout-config.xml b/src/test/resources/integration/select/select-timeout-config.xml
index 8fcb0e931..08c533bfb 100644
--- a/src/test/resources/integration/select/select-timeout-config.xml
+++ b/src/test/resources/integration/select/select-timeout-config.xml
@@ -1,14 +1,14 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- #["select * from PLANET where DELAY($(payload)) = 1 order by ID"]
-
+
+ #["select * from PLANET where DELAY($(payload)) = 1 order by ID"]
+
diff --git a/src/test/resources/integration/select/select-udt-config.xml b/src/test/resources/integration/select/select-udt-config.xml
index f1cb8762b..630feb585 100644
--- a/src/test/resources/integration/select/select-udt-config.xml
+++ b/src/test/resources/integration/select/select-udt-config.xml
@@ -1,13 +1,13 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- select * from REGION_MANAGERS
-
+
+ select * from REGION_MANAGERS
+
diff --git a/src/test/resources/integration/source/row-listener-config.xml b/src/test/resources/integration/source/row-listener-config.xml
index 1f1f29112..ec8fac807 100644
--- a/src/test/resources/integration/source/row-listener-config.xml
+++ b/src/test/resources/integration/source/row-listener-config.xml
@@ -1,58 +1,58 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
+
-
+
-
+
-
+
-
+
-
+
-
- { call updatePlanetDescription('Venus', :description) }
-
-
-
-
+
+ { call updatePlanetDescription('Venus', :description) }
+
+
+
+
#[{'description' : payload}]
-
-
+
+
-
+
-
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-clob-inout-param-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-clob-inout-param-config.xml
index 1500d2691..61ff256a8 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-clob-inout-param-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-clob-inout-param-config.xml
@@ -1,17 +1,17 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getSpanishLanguageSample(:languageSample) }
-
-
-
-
+
+ { call getSpanishLanguageSample(:languageSample) }
+
+
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-clob-input-param-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-clob-input-param-config.xml
index 922276b85..a6393bc95 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-clob-input-param-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-clob-input-param-config.xml
@@ -1,25 +1,25 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call updatePlanetDescription('Venus', :description) }
-
-
-
-
+
+ { call updatePlanetDescription('Venus', :description) }
+
+
+
+
#[{'description' : payload}]
-
-
+
+
-
- select description from PLANET where name = 'Venus'
-
+
+ select description from PLANET where name = 'Venus'
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-config.xml
index f148cb032..74bffc54f 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-config.xml
@@ -1,140 +1,140 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- {call doubleMyInt(:myInt) }
-
-
-
-
+
+ {call doubleMyInt(:myInt) }
+
+
+
+
-
- { call doubleMyInt(:myInt) }
-
-
-
-
+
+ { call doubleMyInt(:myInt) }
+
+
+
+
-
- { CALL countTestRecords(:count) }
-
-
-
-
+
+ { CALL countTestRecords(:count) }
+
+
+
+
-
- { call multiplyInts(:int1, :int2, :result1, :int3, :result2) }
-
+
+ { call multiplyInts(:int1, :int2, :result1, :int3, :result2) }
+
#[{
'int1' : 3,
'int2' : 4,
'int3' : 5
}]
-
-
-
-
-
-
+
+
+
+
+
+
-
- { call returnNullValue(:s1, :s2, :result) }
-
+
+ { call returnNullValue(:s1, :s2, :result) }
+
#[{
's1' : 'foo',
's2' : 'bar'
}]
-
-
-
-
-
+
+
+
+
+
-
- { call concatenateStrings(:s1, :s2, :result) }
-
+
+ { call concatenateStrings(:s1, :s2, :result) }
+
#[{
's1' : 'foo',
's2' : 'bar'
}]
-
-
-
-
-
+
+
+
+
+
-
- { CALL doyouexists(:name) }
-
+
+ { CALL doyouexists(:name) }
+
#[{ 'name' : 'mrstoredprocedure' }]
-
-
+
+
-
- { call mathFunction.addOne(:num) }
-
-
-
-
+
+ { call mathFunction.addOne(:num) }
+
+
+
+
-
- { call concatStringDate(:date, :text, :result) }
-
+
+ { call concatStringDate(:date, :text, :result) }
+
-
-
-
-
-
+
+
+
+
+
-
- { call concatStringTimestamp(:text, :timestamp, :result) }
-
+
+ { call concatStringTimestamp(:text, :timestamp, :result) }
+
-
-
-
-
-
+
+
+
+
+
-
- { call getReducedBiography(:name, :birth_date, :place_birth, :died, :place_death, :profession, :alma_mater, :nationality, :children, :spouse, :mother, :father, :bio, :result) }
-
+
+ { call getReducedBiography(:name, :birth_date, :place_birth, :died, :place_death, :profession, :alma_mater, :nationality, :children, :spouse, :mother, :father, :bio, :result) }
+
-
-
-
-
-
+
+
+
+
+
-
- { call mathFunction.addOne(:num) }
-
-
-
-
-
-
-
+
+ { call mathFunction.addOne(:num) }
+
+
+
+
+
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-metadata-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-metadata-config.xml
index 5cee18d67..38b159c8c 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-metadata-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-metadata-config.xml
@@ -1,45 +1,45 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { CALL countTestRecords(:count) }
-
-
-
-
+
+ { CALL countTestRecords(:count) }
+
+
+
+
-
- { call updatePlanetDescription('hardcoded', :description) }
-
+
+ { call updatePlanetDescription('hardcoded', :description) }
+
#[{
'description' : 'descriptionParamValue',
}]
-
-
+
+
-
- { call multiplyInts(:int1, :int2, :result1, :int3, :result2) }
-
+
+ { call multiplyInts(:int1, :int2, :result1, :int3, :result2) }
+
#[{
'int1' : 3,
'int2' : 4,
'int3' : 5
}]
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-table-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-oracle-table-config.xml
deleted file mode 100644
index 7efef231d..000000000
--- a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-table-config.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
- { call INSERT_FRUIT_AS_TABLE(:in) }
- #[{
- in : payload map ({
- fruitID: $.fruitID,
- fruitName: $.fruitName,
- fruitQuantity: $.fruitQuantity
- } as Object {class : "org.mule.extension.db.integration.select.Fruit"}) }]
-
-
-
-
-
-
- { call INSERT_FRUIT_AS_TYPE(:in) }
- #[{
- in : payload map ({
- fruitID: $.fruitID,
- fruitName: $.fruitName,
- fruitQuantity: $.fruitQuantity
- } as Object {class : "org.mule.extension.db.integration.select.Fruit"}) }]
-
-
-
-
-
-
- { call CREATE_FRUIT_TABLE(:out) }
-
-
-
-
-
-
-
-
- { call INSERT_FRUIT_AS_TABLE(:in) }
- #[{
- in : payload map [$.fruitID, $.fruitName, $.fruitQuantity]
- }]
-
-
-
-
-
-
- { call INSERT_FRUIT_AS_TYPE(:in) }
- #[{
- in : payload map [$.fruitID, $.fruitName, $.fruitQuantity]
- }]
-
-
-
-
-
-
- { call CREATE_FRUIT_TABLE(:out) }
-
-
-
-
-
-
-
-
- { call SYSTEM.STORE_PROCEDURE_NESTED_TYPES(:IN_VALUE, :OUT_VALUE, :RSL) }
- #[%dw 2.0
- output application/java
- ---
- {
- IN_VALUE: Db::createArray("dbConfig","CREATE_LIST_INPUT",
- [Db::createStruct("dbConfig","CREATE_LIST_INPUT_OBJ", [vars.number, vars.varchar])])
- }]
-
-
-
-
-
-
-
-
-
-
-
- { call SYSTEM.STORED_PROCEDURE_NESTED_OBJECT_TYPE(:RESPONSE) }
-
-
-
-
-
-
-
-
-
- #["SELECT * FROM FRUITS_AS_TABLE WHERE" + (payload map $$) reduce ((item, accumulator) -> accumulator ++ "$(if (item == 0) '' else ' OR') (fruitID = :id$(item))")]
-
- #[payload map ((item, index) -> {pos : index, val : item})
- reduce ((item, accumulator = {}) -> accumulator ++ {"id$(item.pos)" : item.val})]
-
-
-
-
-
-
- #["SELECT * FROM FRUITS_AS_TYPE F WHERE" + (payload map $$) reduce ((item, accumulator) -> accumulator ++ "$(if (item == 0) '' else ' OR') (F.FRUIT.FRUITID = :id$(item))")]
-
- #[payload map ((item, index) -> {pos : index, val : item})
- reduce ((item, accumulator = {}) -> accumulator ++ {"id$(item.pos)" : item.val})]
-
-
-
-
-
-
- INSERT INTO FRUITS_AS_TYPE (fruit) VALUES (:fruit)
-
- #[{
- fruit : [payload.fruitID, payload.fruitName, payload.fruitQuantity]
- }]
-
-
-
-
-
-
- INSERT INTO FRUITS_AS_TYPE (fruit) VALUES (:fruit)
-
- #[{
- fruit : {
- fruitID: payload.fruitID,
- fruitName: payload.fruitName,
- fruitQuantity: payload.fruitQuantity
- } as Object {class : "org.mule.extension.db.integration.select.Fruit"}
- }]
-
-
-
-
-
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-with-clob-output.xml b/src/test/resources/integration/storedprocedure/stored-procedure-oracle-with-clob-output.xml
deleted file mode 100644
index 4350240db..000000000
--- a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-with-clob-output.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-within-package.xml b/src/test/resources/integration/storedprocedure/stored-procedure-oracle-within-package.xml
deleted file mode 100644
index 2538dcf0c..000000000
--- a/src/test/resources/integration/storedprocedure/stored-procedure-oracle-within-package.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
- { call system.magicPackageVersionOne.addMagicalNumber(:num) }
-
-
-
-
-
-
-
-
- { call system.magicPackageVersionTwo.addMagicalNumber(:num, :name) }
-
- #[{'name' : 'hearts'}]
-
-
-
-
-
-
-
-
-
- { call magicPackageVersionTwo.addMagicalNumberAndACard(:num, :name) }
-
- #[{'name' : 'hearts'}]
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-parameterized-update-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-parameterized-update-config.xml
index db8e8364b..d4427e1fb 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-parameterized-update-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-parameterized-update-config.xml
@@ -1,16 +1,16 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call updateParamTestType1 (:type) }
-
+
+ { call updateParamTestType1 (:type) }
+
#[{'type' : payload}]
-
-
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-returning-connections.xml b/src/test/resources/integration/storedprocedure/stored-procedure-returning-connections.xml
index 8e38a8464..ac426fe6b 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-returning-connections.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-returning-connections.xml
@@ -1,26 +1,26 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call updatePlanetDescription('Venus', :description) }
-
-
-
-
+
+ { call updatePlanetDescription('Venus', :description) }
+
+
+
+
#[{'description' : vars.rootMessage.payload}]
-
-
+
+
-
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultset-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultset-config.xml
index 6a589a172..5f39178bb 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultset-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultset-config.xml
@@ -1,14 +1,14 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getTestRecords() }
-
+
+ { call getTestRecords() }
+
@@ -16,9 +16,9 @@
-
- { call getSplitTestRecords() }
-
+
+ { call getSplitTestRecords() }
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultsets-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultsets-config.xml
index 88255a7bf..e68c39b57 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultsets-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-returning-resultsets-config.xml
@@ -1,14 +1,14 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getSplitTestRecords() }
-
+
+ { call getSplitTestRecords() }
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-streaming-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-streaming-config.xml
index 77aa2dc51..b659fbb5d 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-streaming-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-streaming-config.xml
@@ -1,17 +1,17 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call doubleMyInt(:myInt) }
-
-
-
-
+
+ { call doubleMyInt(:myInt) }
+
+
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-streaming-returning-resultsets-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-streaming-returning-resultsets-config.xml
index de43af1e9..b2b04a26d 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-streaming-returning-resultsets-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-streaming-returning-resultsets-config.xml
@@ -1,14 +1,14 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { call getSplitTestRecords() }
-
+
+ { call getSplitTestRecords() }
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-udt-array-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-udt-array-config.xml
index 55ba4c56f..2fbbb355f 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-udt-array-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-udt-array-config.xml
@@ -1,28 +1,28 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { CALL getZipCodes('Southwest', :out) }
-
-
-
-
+
+ { CALL getZipCodes('Southwest', :out) }
+
+
+
+
-
- { CALL getContactDetails('Contact1', :out) }
-
-
-
-
+
+ { CALL getContactDetails('Contact1', :out) }
+
+
+
+
diff --git a/src/test/resources/integration/storedprocedure/stored-procedure-udt-config.xml b/src/test/resources/integration/storedprocedure/stored-procedure-udt-config.xml
index 22e0baa96..efac95d52 100644
--- a/src/test/resources/integration/storedprocedure/stored-procedure-udt-config.xml
+++ b/src/test/resources/integration/storedprocedure/stored-procedure-udt-config.xml
@@ -1,54 +1,54 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- { CALL getManagerDetails('Southwest', :out) }
-
-
-
-
+
+ { CALL getManagerDetails('Southwest', :out) }
+
+
+
+
-
- { CALL getManagerDetails(:region, :out) }
-
-
-
-
-
+
+ { CALL getManagerDetails(:region, :out) }
+
+
+
+
+
#[ { 'region' : 'Southwest' }]
-
-
-
-
-
+
+
+
+
+
-
- { CALL getManagerDetails(:region, :out) }
-
-
-
-
+
+ { CALL getManagerDetails(:region, :out) }
+
+
+
+
#[ { 'region' : 'Southwest' }]
-
-
-
-
-
+
+
+
+
+
diff --git a/src/test/resources/integration/streaming/streaming-config.xml b/src/test/resources/integration/streaming/streaming-config.xml
index 64f2d9691..93bf6d327 100644
--- a/src/test/resources/integration/streaming/streaming-config.xml
+++ b/src/test/resources/integration/streaming/streaming-config.xml
@@ -1,39 +1,39 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- INSERT INTO PLANET (NAME, PICTURE) VALUES (:name, :data)
-
+
+ INSERT INTO PLANET (NAME, PICTURE) VALUES (:name, :data)
+
#[{
data : payload,
name : 88
}]
-
-
+
+
-
- SELECT * FROM PLANET WHERE NAME = '88'
-
+
+ SELECT * FROM PLANET WHERE NAME = '88'
+
-
- SELECT * FROM PLANET
-
+
+ SELECT * FROM PLANET
+
-
- SELECT * FROM PLANET
-
+
+ SELECT * FROM PLANET
+
diff --git a/src/test/resources/integration/template/cdata-parameterized-query-template-config.xml b/src/test/resources/integration/template/cdata-parameterized-query-template-config.xml
index cb076070c..f4d508b24 100644
--- a/src/test/resources/integration/template/cdata-parameterized-query-template-config.xml
+++ b/src/test/resources/integration/template/cdata-parameterized-query-template-config.xml
@@ -1,15 +1,15 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
-
-
+
+
diff --git a/src/test/resources/integration/template/incomplete-template-query-config.xml b/src/test/resources/integration/template/incomplete-template-query-config.xml
index 81b4306e2..abcc2058e 100644
--- a/src/test/resources/integration/template/incomplete-template-query-config.xml
+++ b/src/test/resources/integration/template/incomplete-template-query-config.xml
@@ -1,10 +1,10 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
+
diff --git a/src/test/resources/integration/template/template-config.xml b/src/test/resources/integration/template/template-config.xml
index eb98a4e30..3303c3bce 100644
--- a/src/test/resources/integration/template/template-config.xml
+++ b/src/test/resources/integration/template/template-config.xml
@@ -1,68 +1,68 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
- SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
-
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
+
+
-
- update PLANET set NAME='Mercury' where ID=:id
-
-
+
+ update PLANET set NAME='Mercury' where ID=:id
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
- ${query}
-
-
+
+ ${query}
+
+
-
- SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
-
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
+
+
-
-
+
+
-
-
-
+
+
+
-
- SELECT * FROM PLANET WHERE PLANET_POS = #[planet_pos]
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = #[planet_pos]
+
-
- ${dynamicQuery}
-
+
+ ${dynamicQuery}
+
-
- SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos
+
-
- SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos AND NAME = :name
-
-
-
+
+ SELECT * FROM PLANET WHERE PLANET_POS = :planet_pos AND NAME = :name
+
+
+
diff --git a/src/test/resources/integration/template/template-query-file-and-text-config.xml b/src/test/resources/integration/template/template-query-file-and-text-config.xml
index e88f0924a..1b41403ae 100644
--- a/src/test/resources/integration/template/template-query-file-and-text-config.xml
+++ b/src/test/resources/integration/template/template-query-file-and-text-config.xml
@@ -1,13 +1,13 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
SELECT * FROM PLANET
-
-
+
+
diff --git a/src/test/resources/integration/transaction/transactional-config.xml b/src/test/resources/integration/transaction/transactional-config.xml
index 20214746a..dadff0052 100644
--- a/src/test/resources/integration/transaction/transactional-config.xml
+++ b/src/test/resources/integration/transaction/transactional-config.xml
@@ -1,39 +1,39 @@
+ http://www.mulesoft.org/schema/mule/teradata http://www.mulesoft.org/schema/mule/teradata/current/mule-teradata.xsd">
-
-
+
+
update PLANET set NAME='Mercury' where PLANET_POS=4
-
-
+
+
-
-
+
+
update PLANET set NAME='Mercury' where PLANET_POS=4
-
-
+
+
-
-
+
+
update PLANET set NAME='Mercury' where PLANET_POS=4
-
-
+
+
@@ -41,22 +41,22 @@
-
-
+
+