conceptql 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1553225376a8cfa089b1451b278e39414e304459
-  data.tar.gz: 39c0e0ffd0482fc30f63c1ee4096d47206e6ec9e
+  metadata.gz: 5750de5f196ce44a4f679c8c28613bd7476824a1
+  data.tar.gz: 66c448563f934f4a64e5a030e343eceef5a691aa
 SHA512:
-  metadata.gz: befaf475a31844c47f6635875b7e705450eb54f8e63cacbcc0ddd4849f6ddf9cfbcae4dcc67a57a18ad657d73ce0fe8674791dcfedd36ea4287b724c0edd102e
-  data.tar.gz: 7341272d22a347cc48a06d722f0400b95a7fda8e4d9ee8317deb52be85f5b62d3626e2ca316b7a279ae6a6f2358fdfd47676134e11acfefd502f35a7a9eb2136
+  metadata.gz: 286d1046bab811f33f2a83d0066cc608a2d205c46beb188bc3cd9227db36a4cad2b23bbc0ee968ddb49ba34394800bd2d312661787d77bb8467f6bb80a13d09e
+  data.tar.gz: b6978826328af7dd3d1cc3af40447a20ccd3afe83074c0ecbce3528f56dbc6cb48621131e784444194a050f10549dc523dccd0a9228a453892facb9faa099bb1

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.0.9 - 2014-09-03
+
+### Added
+- Support for MSSQL (SQL Server).
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Removed debug output from Node#namify
+
+
 ## 0.0.8 - 2014-08-28
 
 ### Added

data/lib/conceptql/nodes/date_range.rb

@@ -12,7 +12,7 @@ module ConceptQL
         db.from(:person)
           .select_append(Sequel.cast_string('person').as(:criterion_type))
           .select_append(Sequel.expr(:person_id).as(:criterion_id))
-          .select_append(Sequel.lit('date ?', start_date(db)).as(:start_date), Sequel.lit('date ?', end_date(db)).as(:end_date)).from_self
+          .select_append(start_date(db).as(:start_date), end_date(db).as(:end_date)).from_self
       end
 
       def types
@@ -33,7 +33,8 @@ module ConceptQL
       def date_from(db, str)
         return db.from(:visit_occurrence).select { min(:start_date) } if str.upcase == 'START'
         return db.from(:visit_occurrence).select { max(:end_date) } if str.upcase == 'END'
-        return str
+        return Sequel.lit('CONVERT(DATETIME, ?)', str) if db.database_type == :mssql
+        return Sequel.lit('date ?', str)
       end
     end
   end

data/lib/conceptql/nodes/node.rb

@@ -133,10 +133,13 @@ module ConceptQL
         end
         strings = strings.zip(['-'] * (symbols.length - 1)).flatten.compact
         concatted_strings = Sequel.join(strings)
-        unless query.db.database_type == :oracle
-          Sequel.cast(concatted_strings, Date)
-        else
+        case query.db.database_type
+        when :oracle
           Sequel.function(:to_date, concatted_strings, 'YYYY-MM-DD')
+        when :mssql
+          Sequel.lit('CONVERT(DATETIME, ?)', concatted_strings)
+        else
+          Sequel.cast(concatted_strings, Date)
         end
       end
 
@@ -154,7 +157,7 @@ module ConceptQL
 
       def namify(name)
         digest = Zlib.crc32 name
-        ('_' + digest.to_s).tap {|s| puts s}.to_sym
+        ('_' + digest.to_s).to_sym
       end
     end
   end

data/lib/conceptql/version.rb

@@ -1,3 +1,3 @@
 module ConceptQL
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/conceptql/nodes/date_range_spec.rb

@@ -22,11 +22,11 @@ describe ConceptQL::Nodes::DateRange do
     end
 
     it 'handles START as day before first recorded visit_occurrence' do
-      ConceptQL::Nodes::DateRange.new(start: 'START', end: '2010-03-20').query(Sequel.mock).sql.must_equal("SELECT * FROM (SELECT *, CAST('person' AS varchar(255)) AS criterion_type, person_id AS criterion_id, date (SELECT min(start_date) FROM visit_occurrence) AS start_date, date '2010-03-20' AS end_date FROM person) AS t1")
+      ConceptQL::Nodes::DateRange.new(start: 'START', end: '2010-03-20').query(Sequel.mock).sql.must_equal("SELECT * FROM (SELECT *, CAST('person' AS varchar(255)) AS criterion_type, person_id AS criterion_id, (SELECT min(start_date) FROM visit_occurrence) AS start_date, date '2010-03-20' AS end_date FROM person) AS t1")
     end
 
     it 'handles END as 2010-12-31' do
-      ConceptQL::Nodes::DateRange.new(start: '2004-12-13', end: 'END').query(Sequel.mock).sql.must_equal("SELECT * FROM (SELECT *, CAST('person' AS varchar(255)) AS criterion_type, person_id AS criterion_id, date '2004-12-13' AS start_date, date (SELECT max(end_date) FROM visit_occurrence) AS end_date FROM person) AS t1")
+      ConceptQL::Nodes::DateRange.new(start: '2004-12-13', end: 'END').query(Sequel.mock).sql.must_equal("SELECT * FROM (SELECT *, CAST('person' AS varchar(255)) AS criterion_type, person_id AS criterion_id, date '2004-12-13' AS start_date, (SELECT max(end_date) FROM visit_occurrence) AS end_date FROM person) AS t1")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conceptql
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ryan Duryea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport