dorsale 3.7.5 → 3.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad479d894fe508bd2db24dbcb03d17c986fd482b
-  data.tar.gz: 1122ddf76aabb70beab2c05c4807051b12d35e33
+  metadata.gz: 81e50babe312e2efc734c4f4a8d7f0330a9d202b
+  data.tar.gz: 288ebe8ef980c2757c47371d8f31c149b0b0136f
 SHA512:
-  metadata.gz: 215f9de605cb95f630c71f709c514e617c8c942bcd22af69411a295900efdfb818b1ef7ae1a392dc5c5d13697c5756d13f1bd064e0ef6ef999e9fa1f59f9c3de
-  data.tar.gz: 45b40e12c35892c1a2741a70210195746737105bd673bb08543332e237a3ea3b48387c6a00ec9409f81f8c460f93f0ebdfad6299c4d758954d00e6ba95901b6f
+  metadata.gz: 7aee6d4aad771859b4a6d695ae10f616b48bf7d0052e704103b861131fb3c8025b780a54dea643250cff7feae0af11fad2fe2623db6b9dd57bf82a9af20b1938
+  data.tar.gz: 6cd4a6e643628440fb561f3dd1c31373b12dac4ca94de30ccf1ea9cb651aa9180bb37f97e9c2c70b55a369db79a3a4c438c4c4471942f2864c2609e76c44c682

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.7.6
+
+- Add table names on SQL queries
+
 ## 3.7.5
 
 - Task improvements

data/app/filters/dorsale/billing_machine/small_data/filter_strategy_by_state.rb

@@ -1,7 +1,7 @@
 class Dorsale::BillingMachine::SmallData::FilterStrategyByState < ::Agilibox::SmallData::FilterStrategy
   def apply(query, value)
     if value.to_s.match(/not_(.+)/)
-      query.where("state != ?", $~[1])
+      query.where.not(state: $~[1])
     else
       query.where(state: value)
     end

data/app/helpers/dorsale/billing_machine/application_helper.rb

@@ -34,8 +34,9 @@ module Dorsale::BillingMachine::ApplicationHelper
   end
 
   def billing_machine_invoices_chart
-    invoices = policy_scope(::Dorsale::BillingMachine::Invoice)
-      .where("date > ?", 1.year.ago.beginning_of_month)
+    model    = ::Dorsale::BillingMachine::Invoice
+    invoices = policy_scope(model)
+      .where("#{model.table_name}.date > ?", 1.year.ago.beginning_of_month)
 
     totals = {}
 

data/app/models/dorsale/flyboy/task.rb

@@ -29,41 +29,41 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
 
   scope :ontime, -> {
     undone
-      .where("term IS NULL OR term > ?", Time.zone.now.to_date)
-      .where("reminder_date IS NULL OR reminder_date > ?", Time.zone.now.to_date)
+      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Time.zone.now.to_date)
+      .where("#{table_name}.reminder_date IS NULL OR #{table_name}.reminder_date > ?", Time.zone.now.to_date)
   }
 
   scope :onwarning, -> {
     undone
-      .where("reminder_date <= ?", Time.zone.now.to_date)
-      .where("term IS NULL OR term > ?", Time.zone.now.to_date)
+      .where("#{table_name}.reminder_date <= ?", Time.zone.now.to_date)
+      .where("#{table_name}.term IS NULL OR #{table_name}.term > ?", Time.zone.now.to_date)
   }
 
   scope :onalert, -> {
     undone
-      .where("term <= ?", Time.zone.now.to_date)
+      .where("#{table_name}.term <= ?", Time.zone.now.to_date)
   }
 
-  scope :delayed,  -> { where(done: false).where("term < ?", Time.zone.now.to_date) }
-  scope :today,    -> { where(done: false).where("term = ?", Time.zone.now.to_date) }
-  scope :tomorrow, -> { where(done: false).where("term = ?", Date.tomorrow)         }
+  scope :delayed,  -> { where(done: false).where("#{table_name}.term < ?", Time.zone.now.to_date) }
+  scope :today,    -> { where(done: false).where("#{table_name}.term = ?", Time.zone.now.to_date) }
+  scope :tomorrow, -> { where(done: false).where("#{table_name}.term = ?", Date.tomorrow)         }
 
   scope :this_week, -> {
     min = Date.tomorrow
     max = Time.zone.now.to_date.end_of_week
-    where(done: false).where("term > ?", min).where("term <= ?", max)
+    where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
   scope :next_week, -> {
     min = Time.zone.now.to_date.end_of_week
     max = Time.zone.now.to_date.next_week.end_of_week
-    where(done: false).where("term > ?", min).where("term <= ?", max)
+    where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
   scope :next_next_week, -> {
     min = Time.zone.now.to_date.next_week.end_of_week
     max = Time.zone.now.to_date.next_week.next_week.end_of_week
-    where(done: false).where("term > ?", min).where("term <= ?", max)
+    where(done: false).where("#{table_name}.term > ?", min).where("#{table_name}.term <= ?", max)
   }
 
   validates :name,          presence: true

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.7.5"
+  VERSION = "3.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.7.5
+  version: 3.7.6
 platform: ruby
 authors:
 - agilidée