- add the test on REST

4 files changed, 66 insertions, 7 deletions

diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index e8ffeebafcc..c83cc584e9d 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -88,7 +88,7 @@ ENDIF(UNIX)
 OPTION(CONNECT_WITH_BSON "Compile CONNECT storage engine with BSON support" ON)
 
 IF(CONNECT_WITH_BSON)
-  SET(CONNECT_SOURCES ${CONNECT_SOURCES} 
+  SET(CONNECT_SOURCES ${CONNECT_SOURCES}
   bson.cpp tabbson.cpp bsonudf.cpp bson.h tabbson.h bsonudf.h)
   add_definitions(-DBSON_SUPPORT)
 ENDIF(CONNECT_WITH_BSON)
@@ -335,25 +335,31 @@ IF(CONNECT_WITH_REST)
   SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabrest.cpp tabrest.h)
   add_definitions(-DREST_SUPPORT)
   FIND_PACKAGE(cpprestsdk QUIET)
-  IF (cpprestsdk_FOUND)
-	IF(UNIX)
+  IF (UNIX)
+    execute_process(COMMAND lsb_release -is
+    OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    MESSAGE (STATUS ${LSB_RELEASE_ID_SHORT})
+  ENDIF(UNIX)
+  IF (cpprestsdk_FOUND OR ("${LSB_RELEASE_ID_SHORT}" STREQUAL "Ubuntu"))
+  IF(UNIX)
 #     INCLUDE_DIRECTORIES(${CPPRESTSDK_INCLUDE_DIR})
 #     If needed edit next line to set the path to libcpprest.so
       SET(REST_LIBRARY -lcpprest)
       MESSAGE (STATUS ${REST_LIBRARY})
-	ELSE(NOT UNIX)
+  ELSE(NOT UNIX)
 #     Next line sets debug compile mode matching cpprest_2_10d.dll
 #     when it was binary installed (can be change later in Visual Studio)
 #     Comment it out if not needed depending on your cpprestsdk installation.
-	  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-	ENDIF(UNIX)
+    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+  ENDIF(UNIX)
 #   IF(REST_LIBRARY)     why this? how about Windows
     SET(CONNECT_SOURCES ${CONNECT_SOURCES} restget.cpp)
     add_definitions(-DREST_SOURCE)
 #   ENDIF()
 # ELSE(NOT cpprestsdk_FOUND)
 #   MESSAGE(STATUS "=====> cpprestsdk package not found")
-  ENDIF (cpprestsdk_FOUND)
+  ENDIF (cpprestsdk_FOUND OR ("${LSB_RELEASE_ID_SHORT}" STREQUAL "Ubuntu"))
 ENDIF(CONNECT_WITH_REST)
 
 #
diff --git a/storage/connect/mysql-test/connect/r/rest.result b/storage/connect/mysql-test/connect/r/rest.result
new file mode 100644
index 00000000000..3c4ec80ce71
--- /dev/null
+++ b/storage/connect/mysql-test/connect/r/rest.result
@@ -0,0 +1,19 @@
+#
+# Testing REST query
+#
+CREATE TABLE t1
+ENGINE=CONNECT DATA_CHARSET=utf8 TABLE_TYPE=JSON FILE_NAME='users.json'
+HTTP='http://jsonplaceholder.typicode.com/users';
+SELECT * FROM t1;
+id	name	username	email	address_street	address_suite	address_city	address_zipcode	address_geo_lat	address_geo_lng	phone	website	company_name	company_catchPhrase	company_bs
+1	Leanne Graham	Bret	Sincere@april.biz	Kulas Light	Apt. 556	Gwenborough	92998-3874	-37.3159	81.1496	1-770-736-8031 x56442	hildegard.org	Romaguera-Crona	Multi-layered client-server neural-net	harness real-time e-markets
+2	Ervin Howell	Antonette	Shanna@melissa.tv	Victor Plains	Suite 879	Wisokyburgh	90566-7771	-43.9509	-34.4618	010-692-6593 x09125	anastasia.net	Deckow-Crist	Proactive didactic contingency	synergize scalable supply-chains
+3	Clementine Bauch	Samantha	Nathan@yesenia.net	Douglas Extension	Suite 847	McKenziehaven	59590-4157	-68.6102	-47.0653	1-463-123-4447	ramiro.info	Romaguera-Jacobson	Face to face bifurcated interface	e-enable strategic applications
+4	Patricia Lebsack	Karianne	Julianne.OConner@kory.org	Hoeger Mall	Apt. 692	South Elvis	53919-4257	29.4572	-164.2990	493-170-9623 x156	kale.biz	Robel-Corkery	Multi-tiered zero tolerance productivity	transition cutting-edge web services
+5	Chelsey Dietrich	Kamren	Lucio_Hettinger@annie.ca	Skiles Walks	Suite 351	Roscoeview	33263	-31.8129	62.5342	(254)954-1289	demarco.info	Keebler LLC	User-centric fault-tolerant solution	revolutionize end-to-end systems
+6	Mrs. Dennis Schulist	Leopoldo_Corkery	Karley_Dach@jasper.info	Norberto Crossing	Apt. 950	South Christy	23505-1337	-71.4197	71.7478	1-477-935-8478 x6430	ola.org	Considine-Lockman	Synchronised bottom-line interface	e-enable innovative applications
+7	Kurtis Weissnat	Elwyn.Skiles	Telly.Hoeger@billy.biz	Rex Trail	Suite 280	Howemouth	58804-1099	24.8918	21.8984	210.067.6132	elvis.io	Johns Group	Configurable multimedia task-force	generate enterprise e-tailers
+8	Nicholas Runolfsdottir V	Maxime_Nienow	Sherwood@rosamond.me	Ellsworth Summit	Suite 729	Aliyaview	45169	-14.3990	-120.7677	586.493.6943 x140	jacynthe.com	Abernathy Group	Implemented secondary concept	e-enable extensible e-tailers
+9	Glenna Reichert	Delphine	Chaim_McDermott@dana.io	Dayna Park	Suite 449	Bartholomebury	76495-3109	24.6463	-168.8889	(775)976-6794 x41206	conrad.com	Yost and Sons	Switchable contextually-based project	aggregate real-time technologies
+10	Clementina DuBuque	Moriah.Stanton	Rey.Padberg@karina.biz	Kattie Turnpike	Suite 198	Lebsackbury	31428-2261	-38.2386	57.2232	024-648-3804	ambrose.net	Hoeger LLC	Centralized empowering task-force	target end-to-end models
+DROP TABLE t1;
diff --git a/storage/connect/mysql-test/connect/t/rest.inc b/storage/connect/mysql-test/connect/t/rest.inc
new file mode 100644
index 00000000000..6848e4b6965
--- /dev/null
+++ b/storage/connect/mysql-test/connect/t/rest.inc
@@ -0,0 +1,17 @@
+--disable_query_log
+--error 0,ER_UNKNOWN_ERROR
+CREATE TABLE t1
+ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='users.json'
+HTTP='http://jsonplaceholder.typicode.com/users';
+
+if (!`SELECT count(*) FROM INFORMATION_SCHEMA.TABLES
+     WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1'
+     AND ENGINE='CONNECT'
+     AND CREATE_OPTIONS LIKE "%`table_type`='JSON'%"`)
+{
+  DROP TABLE IF EXISTS t1;
+  Skip Need Curl or Casablanca;
+}
+DROP TABLE t1;
+--enable_query_log
+
diff --git a/storage/connect/mysql-test/connect/t/rest.test b/storage/connect/mysql-test/connect/t/rest.test
new file mode 100644
index 00000000000..67066ed4639
--- /dev/null
+++ b/storage/connect/mysql-test/connect/t/rest.test
@@ -0,0 +1,17 @@
+--source rest.inc
+
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+--echo #
+--echo # Testing REST query
+--echo #
+CREATE TABLE t1
+ENGINE=CONNECT DATA_CHARSET=utf8 TABLE_TYPE=JSON FILE_NAME='users.json'
+HTTP='http://jsonplaceholder.typicode.com/users';
+SELECT * FROM t1;
+DROP TABLE t1;
+
+#
+# Clean up
+#
+--remove_file $MYSQLD_DATADIR/test/users.json