Skip to content

Commit f6c8600

Browse files
authored
Merge pull request #91 from yubiuser/development
Release v2.6.6
2 parents cb0f043 + 9d03c45 commit f6c8600

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

pihole_adlist_tool

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
PIHOLE_ADLIST_TOOL_VERSION="2.6.5"
3+
PIHOLE_ADLIST_TOOL_VERSION="2.6.6"
44

55
# define path to pihole's databases and temporary database
66
TEMP_DB="/tmp/temp.db"
@@ -135,16 +135,18 @@ timestamp2date () {
135135

136136
set_timestamps () {
137137

138-
TIMESTAMP_FIRST_QUERY=$(sqlite "$PIHOLE_FTL" "SELECT MIN(timestamp) FROM queries;")
139-
TIMESTAMP_LAST_QUERY=$(sqlite "$PIHOLE_FTL" "SELECT MAX(timestamp) FROM queries;")
138+
139+
TIMESTAMP_FIRST_QUERY=$(sqlite "$PIHOLE_FTL" "SELECT CAST(MIN(timestamp) AS INTEGER) FROM queries;")
140+
TIMESTAMP_LAST_QUERY=$(sqlite "$PIHOLE_FTL" "SELECT CAST(MAX(timestamp) AS INTEGR) FROM queries;")
141+
140142
if [ "$DAYS_REQUESTED" = 0 ];
141143
then
142144
TIMESTAMP_REQUESTED=$TIMESTAMP_FIRST_QUERY
143145
else
144146
TIMESTAMP_REQUESTED=$(date +%s)
145147
TIMESTAMP_REQUESTED="$TIMESTAMP_REQUESTED-86400*${DAYS_REQUESTED}"
146148
fi
147-
TIMESTAMP_FIRST_ANALYZED=$(sqlite "$PIHOLE_FTL" "SELECT min(timestamp) FROM queries WHERE timestamp>=$TIMESTAMP_REQUESTED;")
149+
TIMESTAMP_FIRST_ANALYZED=$(sqlite "$PIHOLE_FTL" "SELECT CAST(min(timestamp) AS INTEGER) FROM queries WHERE timestamp>=$TIMESTAMP_REQUESTED;")
148150
}
149151

150152
# converts dates

0 commit comments

Comments
 (0)