lib/activefacts/cql/compiler/fact.rb in activefacts-0.8.15 vs lib/activefacts/cql/compiler/fact.rb in activefacts-0.8.16

@@ -7,11 +7,11 @@
           @clauses = clauses
           @population_name = population_name
         end
 
         def compile
-          @population = @constellation.Population(@vocabulary, @population_name)
+          @population = @constellation.Population(@vocabulary, @population_name, :guid => :new)
 
           @context = CompilationContext.new(@vocabulary)
           @context.bind @clauses
           @context.left_contraction_allowed = true
           @clauses.each{ |clause| clause.match_existing_fact_type @context }
@@ -274,15 +274,13 @@
               #instance = object_type.all_instance.detect { |instance|
               #  instance.population == @population && instance.value == literal
               #}
               debug :instance, "This #{object_type.name} value already exists" if instance
               unless instance
-                instance = @constellation.Instance(
-                    :new,
-                    :object_type => object_type,
-                    :population => @population,
-                    :value => [literal.to_s, is_a_string, nil]
-                  )
+                instance = @constellation.Instance(:new)
+                instance.object_type = object_type
+                instance.population = @population
+                instance.value = [literal.to_s, is_a_string, nil]
                 @bound_facts << instance
               end
               instance
             end
           end