activefacts 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed82ab2bf0c4e8d8dc9fce824d69e9fff87ab0b
-  data.tar.gz: 03644b12bd3d6717a457a7526342b797966fb712
+  metadata.gz: 9375bff433eb3d5ca379bb09c75cf61dbf06d0f9
+  data.tar.gz: 0eb5ae1999ee3022eb304366dcff00d0416e5562
 SHA512:
-  metadata.gz: 07c66c621a9009612baa4e90abfb03dfee833e8daba654089f75f80ee14fe2881aab1e7e9e90c0b55109f80e5472cc7a05bde2f9dc1d1534ae3357e4097bcf8a
-  data.tar.gz: d10faaa64f3c03eacc742888310a0ddb88158e9de646c80c3176040e970bf61e5e67f6a81d014b7acc794b8c91bf27f874391ef0c6b7a66d6210176b10bf0171
+  metadata.gz: ea7c95187824dcbceb58d036483f63611d1ed079deea269b53b1f52b0a1db53f62fe525c65561bd79aea4592902671dc69d607b84739392eab776bf785c460e6
+  data.tar.gz: ebc6351f9ef09824dd11629be72734cc55f99092c6f4b7e90405ae5aeb062ede4eea0ea7376c1ef8b714bdd36d3f75061f3d046e808c1b9dff987dc992d8fa67

data/lib/activefacts/cql/Language/English.treetop

@@ -131,7 +131,7 @@ module ActiveFacts
 
       # Subset constraint using "A only if B" syntax
       rule a_only_if_b
-	s clauses s only s if s r2:clauses s c:context_note? enforcement ';'
+	s clauses:query_clauses s only s if s r2:query_clauses s c:context_note? enforcement ';'
       end
 
       rule only_if

data/lib/activefacts/generate/rails/models.rb

@@ -122,12 +122,14 @@ module ActiveFacts
 	  table.foreign_keys.map do |fk|
 	    association_name = fk.rails_from_association_name
 
-	    foreign_key = ""
 	    if association_name != fk.to.rails_singular_name
 	      # A different class_name is implied, emit an explicit one:
 	      class_name = ", :class_name => '#{fk.to.rails_class_name}'"
-	      from_column = fk.from_columns
-	      foreign_key = ", :foreign_key => :#{fk.from_columns[0].rails_name}"
+	    end
+	    foreign_key = ", :foreign_key => :#{fk.from_columns[0].rails_name}"
+	    if foreign_key == fk.to.rails_singular_name+'_id'
+	      # See lib/active_record/reflection.rb, method #derive_foreign_key
+	      foreign_key = ''
 	    end
 
 	    %Q{

data/lib/activefacts/version.rb

@@ -8,7 +8,7 @@ module ActiveFacts
   module Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activefacts-api