Update changelog

Fix tests

Author: shulkaolka

README.md

@@ -123,7 +123,7 @@ Internally we use prepared statements, so all incoming data is
 validated against SQL injection, however we had to build a connection from JavaScript types to the SQL data types
 therefore when doing a prepared statements, you would need to add ``:type`` to **each prepared statement variable**.
 
-**Note:** prepared statement variables name could contain: any word character, a digit and a character `_`. 
+**Note:** prepared statement variables name could contain: any characters between a-z or A-Z, a digit and a character `_` (`[a-zA-Z0-9_]`). 
 
 For example if you have a following SQL statement:
 

changelog.md

@@ -9,7 +9,12 @@
 ### Fixed 
 ### Security 
 
-## [V2.0] 2018-09-19 elastic.io 
+## [V2.0.1] 2019-06-24 elastic.io 
+
+### Fixed 
+- Improvement error logging for generating metadata of `Select` action
+
+## [V2.0.0] 2018-09-19 elastic.io 
 
 ### Added 
 

src/test/groovy/io/elastic/jdbc/actions/SelectMSSQLSpec.groovy

@@ -8,13 +8,9 @@ import javax.json.Json
 import javax.json.JsonObject
 import java.sql.Connection
 import java.sql.DriverManager
-import java.sql.ResultSet
 
 @Ignore
 class SelectMSSQLSpec extends Specification {
-
-  @Shared
-  def connectionString = System.getenv("CONN_URI_MSSQL")
   @Shared
   def user = System.getenv("CONN_USER_MSSQL")
   @Shared
@@ -23,7 +19,10 @@ class SelectMSSQLSpec extends Specification {
   def databaseName = System.getenv("CONN_DBNAME_MSSQL")
   @Shared
   def host = System.getenv("CONN_HOST_MSSQL")
-
+  @Shared
+  def port = System.getenv("CONN_PORT_MSSQL")
+  @Shared
+  def connectionString = "jdbc:sqlserver://" + host + ":" + port + ";database=" + databaseName
   @Shared
   Connection connection
 
@@ -36,6 +35,8 @@ class SelectMSSQLSpec extends Specification {
   @Shared
   EventEmitter.Callback reboundCallback
   @Shared
+  EventEmitter.Callback onHttpReplyCallback
+  @Shared
   EventEmitter emitter
   @Shared
   SelectAction action
@@ -45,34 +46,36 @@ class SelectMSSQLSpec extends Specification {
   }
 
   def setup() {
-    createAction()
+    action = new SelectAction()
   }
 
-  def createAction() {
+  def runAction(JsonObject config, JsonObject body, JsonObject snapshot) {
+    Message msg = new Message.Builder().body(body).build()
     errorCallback = Mock(EventEmitter.Callback)
     snapshotCallback = Mock(EventEmitter.Callback)
     dataCallback = Mock(EventEmitter.Callback)
     reboundCallback = Mock(EventEmitter.Callback)
-    emitter = new EventEmitter.Builder().onData(dataCallback).onSnapshot(snapshotCallback).onError(errorCallback).onRebound(reboundCallback).build()
-    action = new SelectAction(emitter)
-  }
-
-  def runAction(JsonObject config, JsonObject body, JsonObject snapshot) {
-    Message msg = new Message.Builder().body(body).build()
-    ExecutionParameters params = new ExecutionParameters(msg, config, snapshot)
+    onHttpReplyCallback = Mock(EventEmitter.Callback)
+    emitter = new EventEmitter.Builder()
+        .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 = Json.createObjectBuilder().build();
-
-    config.addProperty("idColumn", "id")
-    config.addProperty("tableName", "stars")
-    config.addProperty("user", user)
-    config.addProperty("password", password)
-    config.addProperty("dbEngine", "mssql")
-    config.addProperty("host", host)
-    config.addProperty("databaseName", databaseName)
+    JsonObject config = Json.createObjectBuilder()
+        .add("user", user)
+        .add("password", password)
+        .add("dbEngine", "mssql")
+        .add("host", host)
+        .add("port", port)
+        .add("databaseName", databaseName)
+        .add("sqlQuery", "SELECT * from stars")
+        .build();
     return config;
   }
 
@@ -81,198 +84,25 @@ class SelectMSSQLSpec extends Specification {
         "  DROP TABLE stars;"
     connection.createStatement().execute(sql);
     connection.createStatement().execute("CREATE TABLE stars (id int, name varchar(255) NOT NULL, date datetime, radius int, destination int)");
-  }
-
-  def getRecords(tableName) {
-    ArrayList<String> records = new ArrayList<String>();
-    String sql = "SELECT * FROM " + tableName;
-    ResultSet rs = connection.createStatement().executeQuery(sql);
-    while (rs.next()) {
-      records.add(rs.toRowResult().toString());
-    }
-    rs.close();
-    return records;
+    connection.createStatement().execute("INSERT INTO stars (id, name) VALUES (1,'Hello')");
   }
 
   def cleanupSpec() {
-    String sql = "IF OBJECT_ID('persons', 'U') IS NOT NULL\n" +
-        "  DROP TABLE persons;"
-
-    connection.createStatement().execute(sql)
-    sql = "IF OBJECT_ID('stars', 'U') IS NOT NULL\n" +
+    String sql = "IF OBJECT_ID('stars', 'U') IS NOT NULL\n" +
         "  DROP TABLE stars;"
     connection.createStatement().execute(sql)
     connection.close()
   }
 
-  def "one insert"() {
+  def "one select"() {
 
     prepareStarsTable();
-
     JsonObject snapshot = Json.createObjectBuilder().build();
+    JsonObject body = Json.createObjectBuilder().build()
 
-    JsonObject body = Json.createObjectBuilder().build();
-    body.addProperty("id", "1")
-    body.addProperty("name", "Taurus")
-    body.addProperty("date", "2015-02-19 10:10:10.0")
-    body.addProperty("radius", "123")
-
+    when:
     runAction(getStarsConfig(), body, snapshot)
-
-    ArrayList<String> records = getRecords("stars")
-
-    expect:
-    records.size() == 1
-    records.get(0) == '{id=1, name=Taurus, date=2015-02-19 10:10:10.0, radius=123, destination=null}'
-  }
-
-  def "one insert, incorrect value: string in integer field"() {
-
-    prepareStarsTable();
-
-    JsonObject snapshot = Json.createObjectBuilder().build();
-
-    JsonObject body = Json.createObjectBuilder().build();
-    body.addProperty("id", "1")
-    body.addProperty("name", "Taurus")
-    body.addProperty("radius", "test")
-
-    String exceptionClass = "";
-
-    try {
-      runAction(getStarsConfig(), body, snapshot)
-    } catch (Exception e) {
-      exceptionClass = e.getClass().getName();
-    }
-
-    expect:
-    exceptionClass.contains("Exception")
+    then:
+    0 * errorCallback.receive(_)
   }
-
-  def "two inserts"() {
-
-    prepareStarsTable();
-
-    JsonObject snapshot = Json.createObjectBuilder().build()
-
-    JsonObject body1 = Json.createObjectBuilder().build()
-    body1.addProperty("id", "1")
-    body1.addProperty("name", "Taurus")
-    body1.addProperty("radius", "123")
-
-    runAction(getStarsConfig(), body1, snapshot)
-
-    JsonObject body2 = Json.createObjectBuilder().build()
-    body2.addProperty("id", "2")
-    body2.addProperty("name", "Eridanus")
-    body2.addProperty("radius", "456")
-
-    runAction(getStarsConfig(), body2, snapshot)
-
-    ArrayList<String> records = getRecords("stars")
-
-    expect:
-    records.size() == 2
-    records.get(0) == '{id=1, name=Taurus, date=null, radius=123, destination=null}'
-    records.get(1) == '{id=2, name=Eridanus, date=null, radius=456, destination=null}'
-  }
-
-  def "one insert, one update by ID"() {
-
-    prepareStarsTable();
-
-    JsonObject snapshot = Json.createObjectBuilder().build()
-
-    JsonObject body1 = Json.createObjectBuilder().build()
-    body1.addProperty("id", "1")
-    body1.addProperty("name", "Taurus")
-    body1.addProperty("radius", "123")
-
-    runAction(getStarsConfig(), body1, snapshot)
-
-    JsonObject body2 = Json.createObjectBuilder().build()
-    body2.addProperty("id", "1")
-    body2.addProperty("name", "Eridanus")
-
-    runAction(getStarsConfig(), body2, snapshot)
-
-    ArrayList<String> records = getRecords("stars")
-
-    expect:
-    records.size() == 1
-    records.get(0) == '{id=1, name=Eridanus, date=null, radius=123, destination=null}'
-  }
-
-
-  def getPersonsConfig() {
-    JsonObject config = Json.createObjectBuilder().build()
-    config.addProperty("idColumn", "email")
-    config.addProperty("tableName", "persons")
-    config.addProperty("user", user)
-    config.addProperty("password", password)
-    config.addProperty("dbEngine", "mssql")
-    config.addProperty("host", host)
-    config.addProperty("databaseName", databaseName)
-    return config;
-  }
-
-  def preparePersonsTable() {
-    String sql = "IF OBJECT_ID('persons', 'U') IS NOT NULL\n" +
-        "  DROP TABLE persons;"
-    connection.createStatement().execute(sql);
-    connection.createStatement().execute("CREATE TABLE persons (id int, name varchar(255) NOT NULL, email varchar(255) NOT NULL)");
-  }
-
-  def "one insert, name with quote"() {
-
-    preparePersonsTable();
-
-    JsonObject snapshot = Json.createObjectBuilder().build()
-
-    JsonObject body1 = Json.createObjectBuilder().build()
-    body1.addProperty("id", "1")
-    body1.addProperty("name", "O'Henry")
-    body1.addProperty("email", "[email protected]")
-    runAction(getPersonsConfig(), body1, snapshot)
-
-    ArrayList<String> records = getRecords("persons")
-
-    expect:
-    records.size() == 1
-    records.get(0) == '{id=1, name=O\'Henry, [email protected]}'
-  }
-
-  def "two inserts, one update by email"() {
-
-    preparePersonsTable();
-
-    JsonObject snapshot = Json.createObjectBuilder().build()
-
-    JsonObject body1 = Json.createObjectBuilder().build()
-    body1.addProperty("id", "1")
-    body1.addProperty("name", "User1")
-    body1.addProperty("email", "[email protected]")
-    runAction(getPersonsConfig(), body1, snapshot)
-
-    JsonObject body2 = Json.createObjectBuilder().build()
-    body2.addProperty("id", "2")
-    body2.addProperty("name", "User2")
-    body2.addProperty("email", "[email protected]")
-    runAction(getPersonsConfig(), body2, snapshot)
-
-    JsonObject body3 = Json.createObjectBuilder().build()
-    body3.addProperty("id", "3")
-    body3.addProperty("name", "User3")
-    body3.addProperty("email", "[email protected]")
-    runAction(getPersonsConfig(), body3, snapshot)
-
-    ArrayList<String> records = getRecords("persons")
-
-    expect:
-    records.size() == 2
-    records.get(0) == '{id=1, name=User1, [email protected]}'
-    records.get(1) == '{id=3, name=User3, [email protected]}'
-  }
-
-
 }