e2e fix

Author: AnkitCLI

mysql-plugin/src/e2e-test/java/io/cdap/plugin/MysqlClient.java

@@ -16,6 +16,7 @@
 
 package io.cdap.plugin;
 
+import com.google.common.base.Strings;
 import io.cdap.e2e.utils.PluginPropertyUtils;
 import org.junit.Assert;
 
@@ -162,9 +163,13 @@ public static void createSourceDatatypesTable(String sourceTable) throws SQLExce
       statement.executeUpdate(createSourceTableQuery);
 
       // Insert dummy data.
-      String datatypesValues = PluginPropertyUtils.pluginProp("datatypesValues");
-      String datatypesColumnsList = PluginPropertyUtils.pluginProp("datatypesColumnsList");
-      statement.executeUpdate("INSERT INTO " + sourceTable + " " + datatypesColumnsList + " " + datatypesValues);
+      int rowCount = 1;
+      while (!Strings.isNullOrEmpty(PluginPropertyUtils.pluginProp("datatypesValue" + rowCount))) {
+        String datatypesValues = PluginPropertyUtils.pluginProp("datatypesValue" + rowCount);
+        String datatypesColumnsList = PluginPropertyUtils.pluginProp("datatypesColumnsList");
+        statement.executeUpdate("INSERT INTO " + sourceTable + " " + datatypesColumnsList + " " + datatypesValues);
+        rowCount++;
+      }
     }
   }
 

mysql-plugin/src/e2e-test/resources/pluginParameters.properties

@@ -25,13 +25,14 @@ datatypesValues=VALUES ('User1',1000000000000000000,1000000000000000000,1,1,\
   '{"key1": "value1", "key2": "value2"}')
 datatypesSchema=[{"key":"ID","value":"string"},{"key":"COL1","value":"long"},{"key":"COL2","value":"decimal"},\
   {"key":"COL3","value":"bytes"},{"key":"COL4","value":"boolean"},{"key":"COL5","value":"bytes"},\
-  {"key":"COL6","value":"boolean"},{"key":"COL7","value":"string"},{"key":"COL8","value":"date"},\
+  {"key":"COL6","value":"int"},{"key":"COL7","value":"string"},{"key":"COL8","value":"date"},\
   {"key":"COL9","value":"timestamp"},{"key":"COL10","value":"decimal"},{"key":"COL11","value":"double"},\
   {"key":"COL12","value":"string"},{"key":"COL13","value":"float"},{"key":"COL14","value":"int"},\
   {"key":"COL15","value":"long"},{"key":"COL16","value":"bytes"},{"key":"COL17","value":"string"},\
   {"key":"COL18","value":"bytes"},{"key":"COL19","value":"string"},{"key":"COL20","value":"int"},\
-  {"key":"COL21","value":"long"},{"key":"COL22","value":"string"},{"key":"COL23","value":"int"},\
+  {"key":"COL21","value":"int"},{"key":"COL22","value":"string"},{"key":"COL23","value":"int"},\
   {"key":"COL24","value":"int"},{"key":"COL25","value":"string"},{"key":"COL26","value":"time"},\
   {"key":"COL27","value":"timestamp"},{"key":"COL28","value":"bytes"},{"key":"COL29","value":"int"},\
   {"key":"COL30","value":"int"},{"key":"COL31","value":"string"},{"key":"COL32","value":"bytes"},\
+  {"key":"COL33","value":"string"},{"key":"COL34","value":"int"}]
   {"key":"COL33","value":"string"}]

postgresql-plugin/src/e2e-test/resources/pluginParameters.properties

@@ -14,13 +14,13 @@ datatypesColumns=( id varchar(100) primary key, col1 bpchar, col2 bpchar(10), co
   col32 box, col33 path, col34 polygon, col35 circle, col36 cidr, col37 inet, col38 macaddr, col39 macaddr8, \
   col40 bit(2), col41 varbit(5), col42 json, col43 jsonb, col44 _pg_lsn, col45 pg_snapshot, col46 tsquery, \
   col47 tsvector, col48 txid_snapshot, col49 uuid, col50 xml, col51 int4range, col52 int8range, col53 numrange, \
-  col54 tsrange, col55 tstzrange, col56 daterange, col57 pg_lsn, col58 int4, col59 int2, col60 int8 )
-
+  col54 tsrange, col55 tstzrange, col56 daterange, col57 pg_lsn, col58 int4, col59 int2, col60 int8, col61 real, \
+  col62 smallint, col63 serial, col64 smallserial, col65 double precision, col66 bigint, col67 bigserial, col68 boolean)
 datatypesColumnsList=( id, col1, col2, col3, col4, col5, col6 , col7 , col8 , col10, col11, col12, col13, col14, \
   col15, col16, col17, col18, col22, col23, col24, col25, col26, col27, col28, col29, col30, col31, col32, col33, \
   col34, col35, col36, col37, col38, col39, col40, col41, col42, col43, col44, col45, col46, col47, col48, col49, \
-  col50, col51, col52, col53, col54, col55, col56, col57, col58, col59, col60 )
-
+  col50, col51, col52, col53, col54, col55, col56, col57, col58, col59, col60, col61, col62, col63, col64, col65,\
+  col66, col67, col68 )
 datatypesValues=VALUES ('User5', 'M', 'ABC...1234', 'B', 'ABC', decode('48656C6C6F20576F726C6421','hex'), 123, 123, \
   123456, 123.4567, 123456789, 123.456, 123.456, 100.26, 'Hello World!', 'User 5', 123.456, 100, \
   '2023-01-01 07:30:00.000', '2023-01-01 15:30:00.000', '02:00:00', '6 mons 02:30:00'::interval, \
@@ -34,15 +34,15 @@ datatypesValues=VALUES ('User5', 'M', 'ABC...1234', 'B', 'ABC', decode('48656C6C
   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, 'xml ''<foo>bar</foo>''', '[3,7)'::int4range, '[3,7)'::int8range, \
   '(1.0,14.0)'::numrange, '["2010-01-01 14:30:00","2010-01-01 15:30:00")'::tsrange, \
   '["2010-01-01 20:00:00+05:30","2010-01-01 21:00:00+05:30")'::tstzrange, '[1992-03-21,1994-06-26)'::daterange, \
-  '16/B374D848'::pg_lsn, 2, 2, 2);
-
+  '16/B374D848'::pg_lsn, 2, 2, 2, '1234.5679', '600', DEFAULT, DEFAULT, '61.823765812', '2500000000000', \
+  DEFAULT, false);
 datatypesSchema=[{"key":"id","value":"string"},{"key":"col1","value":"string"},{"key":"col2","value":"string"},\
   {"key":"col3","value":"string"},{"key":"col4","value":"string"},{"key":"col5","value":"bytes"},\
   {"key":"col6","value":"int"},{"key":"col7","value":"int"},{"key":"col8","value":"long"},\
   {"key":"col10","value":"decimal"},{"key":"col11","value":"decimal"},{"key":"col12","value":"float"},\
   {"key":"col13","value":"double"},{"key":"col14","value":"string"},{"key":"col15","value":"string"},\
   {"key":"col16","value":"string"},{"key":"col17","value":"double"},{"key":"col18","value":"decimal"},\
-  {"key":"col22","value":"timestamp"},{"key":"col23","value":"timestamp"},{"key":"col24","value":"time"},\
+  {"key":"col22","value":"datetime"},{"key":"col23","value":"timestamp"},{"key":"col24","value":"time"},\
   {"key":"col25","value":"string"},{"key":"col26","value":"string"},{"key":"col27","value":"date"},\
   {"key":"col28","value":"string"},{"key":"col29","value":"string"},{"key":"col30","value":"string"},\
   {"key":"col31","value":"string"},{"key":"col32","value":"string"},{"key":"col33","value":"string"},\
@@ -54,4 +54,7 @@ datatypesSchema=[{"key":"id","value":"string"},{"key":"col1","value":"string"},{
   {"key":"col49","value":"string"},{"key":"col50","value":"string"},{"key":"col51","value":"string"},\
   {"key":"col52","value":"string"},{"key":"col53","value":"string"},{"key":"col54","value":"string"},\
   {"key":"col55","value":"string"},{"key":"col56","value":"string"},{"key":"col57","value":"string"},\
-  {"key":"col58","value":"int"},{"key":"col59","value":"int"},{"key":"col60","value":"long"}]
+  {"key":"col58","value":"int"},{"key":"col59","value":"int"},{"key":"col60","value":"long"}, \
+  {"key":"col61","value":"float"},{"key":"col62","value":"int"},{"key":"col63","value":"int"},\
+  {"key":"col64","value":"int"},{"key":"col65","value":"double"},{"key":"col66","value":"long"},\
+  {"key":"col67","value":"long"},{"key":"col68","value":"boolean"}]