can now supply a custom cql in the cdm.yaml

Author: rustyrazorblade

cdm.yaml

@@ -5,3 +5,4 @@ tables:
     - maptest
     - users2
 version: 2.2
+schema: schema.cql

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

@@ -22,4 +22,8 @@ public class CDMArgs {
     @Parameter(names = {"--no-data", "--nodata"}, description = "Only set up schema")
     public Boolean noData = false; // setting this is schema only
 
+    @Parameter(names = "--help", help = true)
+    private boolean help;
+
+
 }

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

@@ -42,6 +42,7 @@ public class InvalidArgsException extends Exception {
     private String cassandraContactPoint;
     private String host;
     private CDMArgs args;
+    public String relative_schema_path = "schema.cql";
 
 
     CassandraDatasetManager() {
@@ -64,7 +65,7 @@ public static void main(String[] args) throws IOException, InterruptedException,
 
         System.out.println("Starting CDM");
         CDMArgs parsedArgs = new CDMArgs();
-        new JCommander(parsedArgs, args);
+        JCommander jc = new JCommander(parsedArgs, args);
 
 
         // check for the .cdm directory
@@ -97,6 +98,7 @@ public static void main(String[] args) throws IOException, InterruptedException,
         // load schema using cqlsh - should this use a normal CSV loader eventually?
         if(args.length == 0) {
             cdm.printHelp();
+            jc.usage();
             return;
         }
 
@@ -118,7 +120,8 @@ public static void main(String[] args) throws IOException, InterruptedException,
                 cdm.update();
                 break;
             default:
-                System.out.println("Not sure what to do.");
+                jc.usage();
+                cdm.printHelp();
 
         }
         System.out.println("Finished.");
@@ -221,7 +224,6 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
         // all the paths
         dataPath = path + "/data/";
         configLocation = path + "/cdm.yaml";
-        schema = path + "/schema.cql";
 
         File configFile =  new File(configLocation);
 
@@ -230,6 +232,15 @@ void install(String name) throws IOException, InterruptedException, GitAPIExcept
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
 
         Config config = mapper.readValue(configFile, Config.class);
+
+        if(config.schema != null) {
+            schema = path + "/" + config.schema;
+
+        }
+        else {
+            schema = path + "/schema.cql";
+        }
+        System.out.println("Loading schema from " + schema);
         String address = this.host;
 
         Cluster cluster = Cluster.builder().addContactPoint(address).build();

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

@@ -9,4 +9,5 @@ public class Config {
     public String keyspace;
     public List<String> tables;
     public String version;
+    public String schema;
 }