api_helper 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9efe86fda7179ba792ecf18057ebf0b1445d7f83
-  data.tar.gz: 9f17ca34299833efa46df0e68a1f75d1470d269b
+  metadata.gz: aeda154cc88246fbd37bbce92133f4e73feee7a7
+  data.tar.gz: 403c2eb669b8b1ba866f4cec3875f44bf35528ef
 SHA512:
-  metadata.gz: fcfd8f2af69946d843ebfd2f0579ef44f8db74b816c9a6843df7fd5cdb95565b8f93a3f5767b195089cec00f5b0a9894f7cf69300c133fb1116da37a43f4118b
-  data.tar.gz: eb80f9bd80df82e8ae784b4b4a368c39c47d63ce16a910025d225d3197af26501d3e0e8bfff7be5cfe9ab002d62ba3c022fed09487dd4d1d10ae3671075ee5e6
+  metadata.gz: 55d8d8cc853e75cf8d75c2fc45523a35d773daffbf289e5df47d016b2e95378a05801c2a909d78687195ade2787253d2b8501ef852ed441475bed783438b3d51
+  data.tar.gz: c15c43fe4804b574b458ebeba1f8e2c55865cee75d6bedd42e53c0c103d189813f1c382aba5bc5c314e011accf84f91da24f27bff9fd6ce631b8663c2b64d8d8

data/lib/api_helper/filterable.rb

@@ -91,6 +91,14 @@ module APIHelper::Filterable
 
         # if a function is used
         if func = condition.match(/(?<function>[^\(\)]+)\((?<param>.*)\)/)
+
+          db_column_name = begin
+            raise if ActiveRecord::Base.configurations[Rails.env]['adapter'] != 'mysql2'
+            "`#{resource.table_name}`.`#{field}`"
+          rescue
+            "\"#{resource.table_name}\".\"#{field}\""
+          end
+
           case func[:function]
           when 'not'
             values = func[:param].split(',')
@@ -99,38 +107,38 @@ module APIHelper::Filterable
 
           when 'greater_then'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" > ?",
+                       .where("#{db_column_name} > ?",
                               func[:param])
 
           when 'less_then'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" < ?",
+                       .where("#{db_column_name} < ?",
                               func[:param])
 
           when 'greater_then_or_equal'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" >= ?",
+                       .where("#{db_column_name} >= ?",
                               func[:param])
 
           when 'less_then_or_equal'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" <= ?",
+                       .where("#{db_column_name} <= ?",
                               func[:param])
 
           when 'between'
             param = func[:param].split(',')
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" BETWEEN ? AND ?",
+                       .where("#{db_column_name} BETWEEN ? AND ?",
                               param.first, param.last)
 
           when 'like'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" LIKE ?",
+                       .where("#{db_column_name} LIKE ?",
                               func[:param])
 
           when 'contains'
             resource = resource
-                       .where("\"#{resource.table_name}\".\"#{field}\" LIKE ?",
+                       .where("#{db_column_name} LIKE ?",
                               "%#{func[:param]}%")
 
           when 'null'

data/lib/api_helper/version.rb

@@ -1,3 +1,3 @@
 module APIHelper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Neson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler