Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 30468: koha-mysql does not honor Koha's timezone setting

Browse source 
If I run a query like "SELECT NOW()" from a koha report, I will get a different answer than if I had run it from koha-mysql.
In Koha, we set the timezone for each database connection.
However, koha-mysql does not do this, so instead we are left using the default timezone of the database.

Test Plan:
1) Set your time zone to something other than the database time zone
2) run "SELECT NOW()" using debian/scripts/koha-mysql
   *not* /usr/sbin/koha-mysql
3) Note you get the database timezone's current time
4) Apply this patch
5) Repeat step 2
6) Now you get the correct time!

Signed-off-by: Michal Urban <michalurban177@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Kyle Hall 2022-04-06 08:38:00 -04:00 committed by Tomas Cohen Arazi
parent 573db0fca1
commit e97b099d58
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
debian/scripts/koha-mysql vendored
View file

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set -e
umask 0077
# include helper functions
@ -50,11 +48,20 @@ is_instance "$name" || ( usage; die "Unknown instance '$name'" )
shift # remove instance name from argument list.
kohaconfig="/etc/koha/sites/$name/koha-conf.xml"
mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )"
mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )"
mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )"
mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )"
mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" || die "hostname missing from $kohaconfig"
mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" || die "database missing from $kohaconfig"
mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" || die "user missing from $kohaconfig"
mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" || die "pass missing from $kohaconfig"
mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \
mysqltz="$( xmlstarlet sel -t -v 'yazgfs/config/timezone' $kohaconfig )"
if [ $? -eq 0 ]
then
echo "Using time zone $mysqltz"
mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" --init-command="SET time_zone = '$mysqltz'" \
"$mysqldb" "${@}"
else
echo "No time zone set for Koha, using database time zone."
mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \
"$mysqldb" "${@}"
fi