pampa 2.0.22 → 2.0.23
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/pampa.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 10de8453deb7637ad66e77cfe6d2acc4a2e7d64683e77ab8bc6f576bb9c0afc1
|
4
|
+
data.tar.gz: d44eca8c036c3c22ec0b83e51f094817b4dee1cc113ea4a54c5a0c5812a9a9ab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 824b93af2d4895d473dfeb20c659cf5b67acaad803c3e92e3f8c1740a3c2e376e8f8575f8d470a3c69d97aefaf56746def6eb98fcfdbe86c48cd7b9f4b9118d2
|
7
|
+
data.tar.gz: 0f40666a46d6a56ab5c26911981fb80b8f0c27e8266df5aef51ca6801c3b3ce7e28ed42e57188e47c81171a8d8a9e05bbf1c511202227cd18fd050835c36ec76
|
data/lib/pampa.rb
CHANGED
@@ -790,8 +790,7 @@ module BlackStack
|
|
790
790
|
q = "
|
791
791
|
SELECT *
|
792
792
|
FROM #{self.table.to_s}
|
793
|
-
WHERE #{self.field_time.to_s}
|
794
|
-
AND #{self.field_time.to_s} < CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes'
|
793
|
+
WHERE COALESCE(#{self.field_time.to_s}, '1900-01-01') < CAST('#{BlackStack::Pampa.now}' AS TIMESTAMP) - INTERVAL '#{self.max_job_duration_minutes.to_i} minutes'
|
795
794
|
AND #{self.field_id.to_s} IS NOT NULL
|
796
795
|
AND #{self.field_end_time.to_s} IS NULL
|
797
796
|
AND COALESCE(#{self.field_times.to_s},0) < #{self.max_try_times.to_i}
|
@@ -814,6 +813,7 @@ module BlackStack
|
|
814
813
|
q = "
|
815
814
|
UPDATE #{self.table.to_s}
|
816
815
|
SET
|
816
|
+
#{self.field_id.to_s} = #{o[self.field_id.to_sym].nil? ? 'NULL' : "'#{o[self.field_id.to_sym]}'"},
|
817
817
|
#{self.field_time} = #{o[self.field_time.to_sym].nil? ? 'NULL' : "'#{o[self.field_time.to_sym].to_s}'"},
|
818
818
|
#{self.field_times} = #{o[self.field_times.to_sym].to_i},
|
819
819
|
#{self.field_start_time} = #{o[self.field_start_time.to_sym].nil? ? 'NULL' : "'#{o[self.field_start_time.to_sym].to_s}'"},
|