Add type check for optimizations

Author: IsaacFleetwood

src/simple-eval.js

@@ -892,11 +892,11 @@ let compile = (q,userSettings={}) => {
   }
 
   // ---- middle tier, imperative form ----
-  if(settings.enableOptimizations) {
+  if(settings.enableOptimizations && settings.schema) {
     q = optimizer.loopsConsolidate(q, vars);
   }
 
-  if (settings.extractAssignments && !(settings.enableOptimizations || settings.extractAssignmentsLate)) {
+  if (settings.extractAssignments && !((settings.enableOptimizations && settings.schema) || settings.extractAssignmentsLate)) {
     // 8. Extract assignments
     q = extract2(q)
   }
@@ -906,12 +906,12 @@ let compile = (q,userSettings={}) => {
     assignments[i] = extract3(assignments[i])
   q = extract3(q)
 
-  if(settings.enableOptimizations) {
+  if(settings.enableOptimizations && settings.schema) {
     // Assignments must not be extracted yet.
     q = optimizer.shrinking(q);
   }
 
-  if (settings.extractAssignments  && (settings.enableOptimizations || settings.extractAssignmentsLate)) {
+  if (settings.extractAssignments  && ((settings.enableOptimizations && settings.schema) || settings.extractAssignmentsLate)) {
     for (let i in filters)
       filters[i] = extract2(filters[i])
     q = extract2(q)

test/original/optimizations.test.js

@@ -168,7 +168,7 @@ test("loop-consolidation", () => {
     ).toBe(true);
 
     let func3 = api.compileC2("sum(data.*A.value + data.*B.value)", typing.parseType({data: dataSchema}));
-    console.log(func3.explain2.pseudo);
+
     expect( // Check that both of the loops still exist
         func3.explain2.pseudo.match(/\\*B/g) !== null && func3.explain2.pseudo.match(/[*]A/g) !== null
     ).toBe(true);