Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Array in passthrough #101

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 2.5.8 (April 19, 2024)
* Updated Sailor to 4.0.2

## 2.5.7 (July 07, 2023)
* Bumped Sailor to 4.0.1

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (hasProperty('runWithDependencyCheck')) {

dependencyCheck {
format = 'HTML'
failBuildOnCVSS = 8
failBuildOnCVSS = 9
suppressionFile='./dependencyCheck-suppression.xml'
}
}
Expand Down Expand Up @@ -74,9 +74,9 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
compile 'com.google.code.gson:gson:2.10'
compile 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
compile 'io.elastic:sailor-jvm:4.0.1'
compile 'io.elastic:sailor-jvm:4.0.2-SNAPSHOT'
compile 'mysql:mysql-connector-java:8.0.29'
compile 'org.postgresql:postgresql:42.5.0'
compile 'org.postgresql:postgresql:42.5.6'

testCompile 'io.github.cdimascio:java-dotenv:5.1.0'
testCompile 'org.hsqldb:hsqldb:2.0.0'
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Database",
"description": "Database JDBC connector",
"version": "2.5.7",
"version": "2.5.8-dev.2",
"credentials": {
"verifier": "io.elastic.jdbc.JdbcCredentialsVerifier",
"fields": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import io.elastic.api.EventEmitter
import io.elastic.api.ExecutionParameters
import io.elastic.api.Message
import io.elastic.jdbc.TestUtils
import io.elastic.jdbc.actions.SelectAction
import spock.lang.Ignore
import io.elastic.jdbc.actions.NewSelectAction
import spock.lang.Shared
import spock.lang.Specification

Expand Down Expand Up @@ -47,7 +46,7 @@ class SelectMySQLSpec extends Specification {
@Shared
EventEmitter emitter
@Shared
SelectAction action
NewSelectAction action

def setupSpec() {
connection = DriverManager.getConnection(connectionString, user, password)
Expand All @@ -58,30 +57,32 @@ class SelectMySQLSpec extends Specification {
}

def createAction() {
action = new SelectAction()
action = new NewSelectAction()
}

def runAction(JsonObject config, JsonObject body, JsonObject snapshot) {
Message msg = new Message.Builder().body(body).build()
Message msg = new Message.Builder()
.body(body)
.build()
errorCallback = Mock(EventEmitter.Callback)
snapshotCallback = Mock(EventEmitter.Callback)
dataCallback = Mock(EventEmitter.Callback)
reboundCallback = Mock(EventEmitter.Callback)
onHttpReplyCallback = Mock(EventEmitter.Callback)
emitter = new EventEmitter.Builder()
.onData(dataCallback)
.onSnapshot(snapshotCallback)
.onError(errorCallback)
.onRebound(reboundCallback)
.onHttpReplyCallback(onHttpReplyCallback).build()
.onData(dataCallback)
.onSnapshot(snapshotCallback)
.onError(errorCallback)
.onRebound(reboundCallback)
.onHttpReplyCallback(onHttpReplyCallback).build()
ExecutionParameters params = new ExecutionParameters(msg, emitter, config, snapshot)
action.execute(params);
}

def getStarsConfig() {
JsonObject config = TestUtils.getMysqlConfigurationBuilder()
.add("sqlQuery", "SELECT * from stars where @id:number =id AND name=@name")
.build()
.build()
return config;
}

Expand Down