Skip to content

Revert "Backported Catch the exception thrown by the synchronization to 3.6" #159

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 7, 2019
Merged

Revert "Backported Catch the exception thrown by the synchronization to 3.6" #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 2 additions & 69 deletions ...postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/AsyncSQLClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@
package io.vertx.ext.asyncsql.impl;

import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.json.JsonArray;
import io.vertx.core.json.JsonObject;
import io.vertx.ext.asyncsql.AsyncSQLClient;
import io.vertx.ext.sql.*;

import java.util.function.Function;
import io.vertx.ext.sql.SQLClient;
import io.vertx.ext.sql.SQLConnection;

/**
* @author <a href="http://www.campudus.com">Joern Bernhardt</a>.
Expand Down Expand Up @@ -58,68 +55,4 @@ public SQLClient getConnection(Handler<AsyncResult<SQLConnection>> handler) {
return this;
}

@Override
public SQLClient query(String sql, Handler<AsyncResult<ResultSet>> handler) {
executeDirect(conn -> Future.future(f -> conn.query(sql, f)), handler);
return this;
}

@Override
public SQLClient queryStream(String sql, Handler<AsyncResult<SQLRowStream>> handler) {
executeDirect(conn -> Future.future(f -> conn.queryStream(sql, f)), handler);
return this;
}

@Override
public SQLClient queryStreamWithParams(String sql, JsonArray params, Handler<AsyncResult<SQLRowStream>> handler) {
executeDirect(conn -> Future.future(f -> conn.queryStreamWithParams(sql, params, f)), handler);
return this;
}

@Override
public SQLClient queryWithParams(String sql, JsonArray params, Handler<AsyncResult<ResultSet>> handler) {
executeDirect(conn -> Future.future(f -> conn.queryWithParams(sql, params, f)), handler);
return this;
}

@Override
public SQLClient update(String sql, Handler<AsyncResult<UpdateResult>> handler) {
executeDirect(conn -> Future.future(f -> conn.update(sql, f)), handler);
return this;
}

@Override
public SQLClient updateWithParams(String sql, JsonArray params, Handler<AsyncResult<UpdateResult>> handler) {
executeDirect(conn -> Future.future(f -> conn.updateWithParams(sql, params, f)), handler);
return this;
}

@Override
public SQLClient call(String sql, Handler<AsyncResult<ResultSet>> handler) {
executeDirect(conn -> Future.future(f -> conn.call(sql, f)), handler);
return this;
}

@Override
public SQLClient callWithParams(String sql, JsonArray params, JsonArray outputs, Handler<AsyncResult<ResultSet>> handler) {
executeDirect(conn -> Future.future(f -> conn.callWithParams(sql, params, outputs, f)), handler);
return this;
}

private <T> void executeDirect(Function<SQLConnection, Future<T>> action, Handler<AsyncResult<T>> handler) {
getConnection(getConnection -> {
if (getConnection.failed()) {
handler.handle(Future.failedFuture(getConnection.cause()));
} else {
final SQLConnection conn = getConnection.result();
Future<T> future;
try {
future = action.apply(conn);
} catch (Throwable e) {
future = Future.failedFuture(e);
}
future.setHandler(handler);
}
});
}
}
52 changes: 2 additions & 50 deletions ...ysql-postgresql-client-jasync/src/main/java/io/vertx/ext/asyncsql/impl/ClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import io.vertx.core.AsyncResult;
import io.vertx.core.Handler;
import io.vertx.core.json.JsonArray;
import io.vertx.ext.asyncsql.AsyncSQLClient;
import io.vertx.ext.sql.*;
import io.vertx.ext.sql.SQLClient;
import io.vertx.ext.sql.SQLConnection;

/**
* Wraps a client with the {@link ClientHolder} in order to keep track of the references.
Expand Down Expand Up @@ -51,52 +51,4 @@ public void close() {
public SQLClient getConnection(Handler<AsyncResult<SQLConnection>> handler) {
return client.getConnection(handler);
}

@Override
public SQLClient query(String sql, Handler<AsyncResult<ResultSet>> handler) {
client.query(sql, handler);
return this;
}

@Override
public SQLClient queryStream(String sql, Handler<AsyncResult<SQLRowStream>> handler) {
client.queryStream(sql, handler);
return this;
}

@Override
public SQLClient queryStreamWithParams(String sql, JsonArray params, Handler<AsyncResult<SQLRowStream>> handler) {
client.queryStreamWithParams(sql, params, handler);
return this;
}

@Override
public SQLClient queryWithParams(String sql, JsonArray params, Handler<AsyncResult<ResultSet>> handler) {
client.queryWithParams(sql, params, handler);
return this;
}

@Override
public SQLClient update(String sql, Handler<AsyncResult<UpdateResult>> handler) {
client.update(sql, handler);
return this;
}

@Override
public SQLClient updateWithParams(String sql, JsonArray params, Handler<AsyncResult<UpdateResult>> handler) {
client.updateWithParams(sql, params, handler);
return this;
}

@Override
public SQLClient call(String sql, Handler<AsyncResult<ResultSet>> handler) {
client.call(sql, handler);
return this;
}

@Override
public SQLClient callWithParams(String sql, JsonArray params, JsonArray outputs, Handler<AsyncResult<ResultSet>> handler) {
client.callWithParams(sql, params, outputs, handler);
return this;
}
}
13 changes: 0 additions & 13 deletions ...x-mysql-postgresql-client-jasync/src/test/java/io/vertx/ext/asyncsql/MySQLClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package io.vertx.ext.asyncsql;

import com.github.jasync.sql.db.exceptions.InsufficientParametersException;
import io.vertx.ext.asyncsql.category.NeedsDocker;
import org.junit.*;

Expand Down Expand Up @@ -117,18 +116,6 @@ public void testInsertedIds(TestContext context) {
});
}

@Test
public void test(TestContext context){
JsonArray arr = new JsonArray().add(1).add(2);
Async async = context.async();
// a exception will throw. @see https://github.com/jasync-sql/jasync-sql/blob/master/mysql-async/src/main/java/com/github/jasync/sql/db/mysql/MySQLConnection.kt#L288-L301
client.queryWithParams("?", arr, r -> {
context.assertTrue(r.failed());
context.assertTrue(r.cause() instanceof InsufficientParametersException);
async.complete();
});
}

@Override
protected void compareInstantStrings(TestContext context, String result, String expected) {
// mysql will perform some rounding since it does not have the precision to store the full TS
Expand Down