From 89922ce98b94f0139af3e5ce88a92e92fb4abd76 Mon Sep 17 00:00:00 2001 From: Michal 'vorner' Vaner <michal.vaner@nic.cz> Date: Thu, 28 Jan 2016 16:05:57 +0100 Subject: [PATCH] initdb: List specific columns in subquery With SELECT *, it is impossible to drop columns (needed during migration to new data types). --- src/master/dbscripts/initdb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/master/dbscripts/initdb b/src/master/dbscripts/initdb index cd6ff9fb..d94de105 100755 --- a/src/master/dbscripts/initdb +++ b/src/master/dbscripts/initdb @@ -492,7 +492,7 @@ CREATE OR REPLACE VIEW fake_blacklist_cache_fill AS SELECT SUM(fake_blacklist_scores.score) AS score, MAX(fl.timestamp) AS timestamp FROM - (SELECT * FROM fake_logs WHERE timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '1 hour') AS fl + (SELECT server, remote, client, timestamp, event FROM fake_logs WHERE timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '1 hour') AS fl JOIN fake_blacklist_scores ON fl.server = fake_blacklist_scores.server AND fl.event = fake_blacklist_scores.event GROUP BY fl.server, fl.remote, fl.client; CREATE UNLOGGED TABLE fake_blacklist_cache ( @@ -536,7 +536,7 @@ FROM fl.client, SUM(fake_blacklist_scores.score) AS score, MAX(fl.timestamp) AS timestamp - FROM (SELECT * FROM fake_logs WHERE timestamp > (SELECT COALESCE(MAX(timestamp), TO_TIMESTAMP(0)) FROM fake_blacklist_cache)) AS fl + FROM (SELECT server, remote, client, timestamp, event FROM fake_logs WHERE timestamp > (SELECT COALESCE(MAX(timestamp), TO_TIMESTAMP(0)) FROM fake_blacklist_cache)) AS fl JOIN fake_blacklist_scores ON fl.server = fake_blacklist_scores.server AND fl.event = fake_blacklist_scores.event GROUP BY fl.server, fl.remote, fl.client) AS fl JOIN fake_blacklist_limits ON fl.server = fake_blacklist_limits.server -- GitLab