From 56c914b56fc5e432f8fed3a3258247508ee50a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= <ivasoft@exprojekt.cz>
Date: Fri, 24 Mar 2023 23:45:11 +0100
Subject: [PATCH] Workload SQL keyword patch.

---
 Dockerfile                 |  1 +
 patches/workload_sql.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 patches/workload_sql.patch

diff --git a/Dockerfile b/Dockerfile
index 3e74d75..fd95240 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,7 @@ RUN set -eux; \
 	rm -f /etc/cron.d/*; \
 	# Apply patches
 	git apply project_identifier.patch; \
+	git apply workload_sql.patch; \
 	git apply workload_module.patch; \
 	mv plugins/redmine_workload/lib/redmine_workload/hooks/plugin.rb plugins/redmine_workload/lib/redmine_workload/hooks/after_plugins_loaded_hook.rb; \
 	rm *.patch; \
diff --git a/patches/workload_sql.patch b/patches/workload_sql.patch
new file mode 100644
index 0000000..4515ee9
--- /dev/null
+++ b/patches/workload_sql.patch
@@ -0,0 +1,11 @@
+--- a/plugins/redmine_workload/lib/redmine_workload/wl_date_tools.rb
++++ b/plugins/redmine_workload/lib/redmine_workload/wl_date_tools.rb
+@@ -76,7 +76,7 @@ class WlDateTools
+   end
+ 
+   def self.holiday?(day)
+-    !WlNationalHoliday.where('start <= ? AND end >= ?', day, day).empty?
++    !WlNationalHoliday.where('start <= ? AND "end" >= ?', day, day).empty?
+   end
+ 
+   def self.vacation?(day, assignee)