JDBC Integration with idea database tool

Author: dmitriy.grytsovets

README.md

@@ -12,10 +12,10 @@ First you should add snaphost repository and  dependency to your pom file
 ## Spring NamedParameterJdbcTemplate usage example.
 
 To configure sockets you should implements SQLSocketProvider and add socketProvider=abc.xyz.MySocketProvider to connect url. 
-For example tarantool://localhost:3301?username=test&password=test&socketProvider=abc.xyz.MySocketProvider
+For example tarantool://localhost:3301?user=test&password=test&socketProvider=abc.xyz.MySocketProvider
 
 ```java
-NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(new DriverManagerDataSource("tarantool://localhost:3301?username=test&password=test"));
+NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(new DriverManagerDataSource("tarantool://localhost:3301?user=test&password=test"));
 
 RowMapper<Object> rowMapper = new RowMapper<Object>() {
     @Override

src/main/java/org/tarantool/JDBCBridge.java

@@ -1,11 +1,17 @@
 package org.tarantool;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
+import org.tarantool.jdbc.SQLResultSet;
+
 public class JDBCBridge {
+    public static final JDBCBridge EMPTY = new JDBCBridge(Collections.<TarantoolBase.SQLMetaData>emptyList(), Collections.<List<Object>>emptyList());
+
     final List<TarantoolBase.SQLMetaData> sqlMetadata;
     final Map<String,Integer> columnsByName;
     final List<List<Object>> rows;
@@ -19,7 +25,7 @@ protected JDBCBridge(List<TarantoolBase.SQLMetaData> sqlMetadata, List<List<Obje
         this.rows = rows;
         columnsByName = new LinkedHashMap<String, Integer>((int) Math.ceil(sqlMetadata.size() / 0.75), 0.75f);
         for (int i = 0; i < sqlMetadata.size(); i++) {
-            columnsByName.put(sqlMetadata.get(i).getName(), i);
+            columnsByName.put(sqlMetadata.get(i).getName(), i + 1);
         }
     }
 
@@ -32,26 +38,34 @@ public static int update(TarantoolConnection connection, String sql, Object ...
         return connection.update(sql, params).intValue();
     }
 
+    public static JDBCBridge mock(List<String> fields, List<List<Object>> values)  {
+        List<TarantoolBase.SQLMetaData> meta = new ArrayList<TarantoolBase.SQLMetaData>(fields.size());
+        for(String field:fields) {
+           meta.add(new TarantoolBase.SQLMetaData(field));
+        }
+        return new JDBCBridge(meta, values);
+    }
+
     public static Object execute(TarantoolConnection connection, String sql, Object ... params) {
         connection.sql(sql, params);
         Long rowCount = connection.getSqlRowCount();
         if(rowCount == null) {
-            return new JDBCBridge(connection);
+            return new SQLResultSet(new JDBCBridge(connection));
         }
         return rowCount.intValue();
     }
 
 
     public String getColumnName(int columnIndex) {
-       return sqlMetadata.get(columnIndex).getName();
+        return columnIndex > sqlMetadata.size() ? null : sqlMetadata.get(columnIndex - 1).getName();
     }
 
     public Integer getColumnIndex(String columnName) {
         return columnsByName.get(columnName);
     }
 
     public int getColumnCount() {
-        return sqlMetadata.size();
+        return columnsByName.size();
     }
 
     public ListIterator<List<Object>> iterator() {

src/main/java/org/tarantool/TarantoolBase.java

@@ -17,6 +17,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 public abstract class TarantoolBase<Result> extends AbstractTarantoolOps<Integer, List<?>, Object, Result> {
+    protected static final String WELCOME = "Tarantool ";
+    protected String serverVersion;
     /**
      * Connection state
      */
@@ -42,10 +44,11 @@ public TarantoolBase(String username, String password, Socket socket) {
             byte[] bytes = new byte[64];
             is.readFully(bytes);
             String firstLine = new String(bytes);
-            if (!firstLine.startsWith("Tarantool")) {
+            if (!firstLine.startsWith(WELCOME)) {
                 close();
                 throw new CommunicationException("Welcome message should starts with tarantool but starts with '" + firstLine + "'", new IllegalStateException("Invalid welcome packet"));
             }
+            serverVersion = firstLine.substring(WELCOME.length());
             is.readFully(bytes);
             this.salt = new String(bytes);
             if (username != null && password != null) {
@@ -230,4 +233,8 @@ protected void validateArgs(Object[] args) {
     public void setInitialRequestSize(int initialRequestSize) {
         this.initialRequestSize = initialRequestSize;
     }
+
+    public String getServerVersion() {
+        return serverVersion;
+    }
 }

src/main/java/org/tarantool/jdbc/SqlConnection.java renamed to src/main/java/org/tarantool/jdbc/SQLConnection.java

@@ -23,11 +23,15 @@
 import org.tarantool.TarantoolConnection;
 
 @SuppressWarnings("Since15")
-public class SqlConnection implements Connection {
+public class SQLConnection implements Connection {
     final TarantoolConnection connection;
+    final String url;
+    final Properties properties;
 
-    public SqlConnection(TarantoolConnection connection) {
+    public SQLConnection(TarantoolConnection connection, String url, Properties properties) {
         this.connection = connection;
+        this.url = url;
+        this.properties = properties;
     }
 
     @Override
@@ -85,12 +89,12 @@ public boolean isClosed() throws SQLException {
 
     @Override
     public DatabaseMetaData getMetaData() throws SQLException {
-        throw new SQLFeatureNotSupportedException();
+        return new SQLDatabaseMetadata(this);
     }
 
     @Override
     public void setReadOnly(boolean readOnly) throws SQLException {
-        throw new SQLFeatureNotSupportedException();
+
     }
 
     @Override
@@ -100,12 +104,11 @@ public boolean isReadOnly() throws SQLException {
 
     @Override
     public void setCatalog(String catalog) throws SQLException {
-        throw new SQLFeatureNotSupportedException();
     }
 
     @Override
     public String getCatalog() throws SQLException {
-        throw new SQLFeatureNotSupportedException();
+        return null;
     }
 
     @Override
@@ -276,12 +279,11 @@ public Struct createStruct(String typeName, Object[] attributes) throws SQLExcep
 
     @Override
     public void setSchema(String schema) throws SQLException {
-        throw new SQLFeatureNotSupportedException();
     }
 
     @Override
     public String getSchema() throws SQLException {
-        throw new SQLFeatureNotSupportedException();
+        return null;
     }
 
     @Override