Fix connect merge problems

* CMakeLists.txt erroneous duplicated lines.
* Unneded differences in tabjson.cpp
* Unneded space differences in jdbconn.{cpp|h}

storage/connect/CMakeLists.txt

@@ -370,34 +370,3 @@ IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
     ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
     DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
 ENDIF()
-
-
-
-IF(NOT TARGET connect)
-  RETURN()
-ENDIF()
-
-# Install some extra files that belong to connect engine
-IF(WIN32)
-  # install ha_connect.lib
-  GET_TARGET_PROPERTY(CONNECT_LOCATION connect LOCATION)
-  STRING(REPLACE "dll" "lib" CONNECT_LIB ${CONNECT_LOCATION})
-  IF(CMAKE_CONFIGURATION_TYPES)
-    STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
-      CONNECT_LIB ${CONNECT_LIB})
-  ENDIF()
-  INSTALL(FILES ${CONNECT_LIB}
-    DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-ENDIF(WIN32)
-
-IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
-  # TODO: Find how to compile and install the java wrapper classes
-  # Find required libraries and include directories
-  SET (JAVA_SOURCES JdbcInterface.java)
-  add_jar(JdbcInterface ${JAVA_SOURCES})
-  INSTALL(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar
-    ${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
-    DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
-ENDIF()
-

storage/connect/jdbconn.cpp

@@ -154,13 +154,13 @@ int TranslateJDBCType(int stp, char *tn, int prec, int& len, char& v)
 	case 91:   // DATE, YEAR
 		type = TYPE_DATE;
 
-			if (!tn || toupper(tn[0]) != 'Y') {
-				len = 10;
-				v = 'D';
-			} else {
-				len = 4;
-				v = 'Y';
-			}	// endif len
+		if (!tn || toupper(tn[0]) != 'Y') {
+			len = 10;
+			v = 'D';
+		} else {
+			len = 4;
+			v = 'Y';
+		}	// endif len
 
 		break;
 	case 92:   // TIME

storage/connect/jdbconn.h

@@ -31,16 +31,6 @@ class JDBConn : public JAVAConn {
 	char   *GetQuoteChar(void) { return m_IDQuoteChar; }
 	virtual int  GetMaxValue(int infotype);
 
-public:
-	// Operations
-	virtual bool Connect(PJPARM sop);
-	virtual bool MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options,
-
-	// Attributes
-public:
-	char   *GetQuoteChar(void) { return m_IDQuoteChar; }
-	virtual int  GetMaxValue(int infotype);
-
 public:
 	// Operations
 	virtual bool Connect(PJPARM sop);
@@ -55,6 +45,7 @@ class JDBConn : public JAVAConn {
 
 	// Jdbc operations
 	bool    PrepareSQL(PCSZ sql);
+	int     ExecuteSQL(void);					 // Prepared statement
 	bool    SetParam(JDBCCOL *colp);
 	int     GetCatInfo(JCATPARM *cap);
 	bool    GetDrivers(PQRYRES qrp);

storage/connect/tabjson.cpp

+/************* tabjson C++ Program Source Code File (.CPP) *************/
 /* PROGRAM NAME: tabjson     Version 1.5                               */
 /*  (C) Copyright to the author Olivier BERTRAND          2014 - 2017  */
 /*  This program are the JSON class DB execution routines.             */
@@ -861,9 +862,6 @@ bool TDBJSN::OpenDB(PGLOBAL g)
           return true;
         } // endswitch Jmode
 
-		if (Xcol && Txfp->GetAmType() != TYPE_AM_MGO)
-			To_Filter = NULL;							 // Imcompatible
-
 	} // endif Use
 
 	if (TDBDOS::OpenDB(g))