close to having working cql statements

Author: rustyrazorblade

src/main/java/com/datastax/cdm/CassandraDatasetManager.java

@@ -225,10 +225,6 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
         {
             Session session = cluster.connect();
 
-//        String createKeyspace = "DROP KEYSPACE IF EXISTS " + config.keyspace +
-//                                "; CREATE KEYSPACE " + config.keyspace +
-//                                " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}";
-
             StringBuilder createKeyspace = new StringBuilder();
             createKeyspace.append(" CREATE KEYSPACE ")
                     .append(config.keyspace)
@@ -251,6 +247,8 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
 
         Session session = cluster2.connect(config.keyspace);
 
+        this.session = session;
+
         for(String table: config.tables) {
             String dataFile = dataPath + table + ".csv";
             Iterable<CSVRecord> records = openCSV(dataFile);
@@ -278,8 +276,10 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
 
             for(CSVRecord record: records) {
                 // generate a CQL statement
-                String cql = generateCQL(table, record,
-                                         fieldlist, types);
+                String cql = generateCQL(table,
+                                         record,
+                                         fieldlist,
+                                         types);
                 session.execute(cql);
             }
         }
@@ -302,9 +302,23 @@ String generateCQL(String table,
         HashSet needs_quotes = new HashSet();
         needs_quotes.add("text");
         needs_quotes.add("datetime");
+        needs_quotes.add("map");
+        needs_quotes.add("list");
+        needs_quotes.add("udt");
+        needs_quotes.add("set");
 
         StringBuilder query = new StringBuilder("INSERT INTO ");
         query.append(table);
+        query.append("(");
+
+        StringJoiner sjfields = new StringJoiner(", ");
+        for(Field f: fields) {
+            sjfields.add(f.name);
+        }
+        query.append(sjfields.toString());
+
+        query.append(") VALUES (");
+        query.append(")");
 
         return query.toString();
     }

test/java/com/datastax/cdm/CassandraDatasetManagerTest.java

@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.StringJoiner;
 
 /**
  * Created by jhaddad on 9/5/16.
@@ -24,12 +25,18 @@ public void testCQLStatementGeneration() throws IOException {
 
         HashMap types = new HashMap();
         ArrayList<Field> fieldList = new ArrayList<Field>();
+        fieldList.add(new Field("id", "uuid"));
+        fieldList.add(new Field("avg", "float"));
+        fieldList.add(new Field("cash", "decimal"));
+        fieldList.add(new Field("intmap", "map"));
+        fieldList.add(new Field("num", "int"));
+        fieldList.add(new Field("ts", "timeuuid"));
+
         String query = c.generateCQL("whatever",
                                      r,
                                      fieldList,
                                      types);
-
-        assertThat(query, containsString("INSERT INTO whatever"));
+        assertThat(query, containsString("INSERT INTO whatever(id, avg, cash, intmap, num, ts) VALUES"));
 
     }