Move ruleset hashes to repositories table (#973)

repology · Jan 14, 2020 · 9b23f66 · 9b23f66
1 parent 746e81a
commit 9b23f66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 25 deletions.
diff --git a/...et_hashes/get_repository_ruleset_hash.sql → ...ositories/get_repository_ruleset_hash.sql b/...et_hashes/get_repository_ruleset_hash.sql → ...ositories/get_repository_ruleset_hash.sql
@@ -1,4 +1,4 @@
--- Copyright (C) 2019 Dmitry Marakasov <[email protected]>
+-- Copyright (C) 2019-2020 Dmitry Marakasov <[email protected]>
 --
 -- This file is part of repology
 --
@@ -23,6 +23,6 @@
 --------------------------------------------------------------------------------
 SELECT
 	ruleset_hash
-FROM repository_ruleset_hashes
+FROM repositories
 WHERE
-	repository = %(repository)s;
+	name = %(repository)s;
diff --git a/...hashes/update_repository_ruleset_hash.sql → ...tories/update_repository_ruleset_hash.sql b/...hashes/update_repository_ruleset_hash.sql → ...tories/update_repository_ruleset_hash.sql
@@ -1,4 +1,4 @@
--- Copyright (C) 2019 Dmitry Marakasov <[email protected]>
+-- Copyright (C) 2019-2020 Dmitry Marakasov <[email protected]>
 --
 -- This file is part of repology
 --
@@ -21,14 +21,8 @@
 -- @param ruleset_hash
 --
 --------------------------------------------------------------------------------
-INSERT INTO repository_ruleset_hashes(
-	repository,
-	ruleset_hash
-)
-VALUES (
-	%(repository)s,
-	%(ruleset_hash)s
-)
-ON CONFLICT (repository)
-DO UPDATE SET
-	ruleset_hash = EXCLUDED.ruleset_hash;
+UPDATE repositories
+SET
+	ruleset_hash = %(ruleset_hash)s
+WHERE
+	name = %(repository)s;
diff --git a/sql.d/update/create_schema.sql b/sql.d/update/create_schema.sql
@@ -609,6 +609,8 @@ CREATE TABLE repositories (
 
 	used_package_fields text[],
 
+	ruleset_hash text NULL,
+
 	-- metadata from config
 	metadata jsonb NOT NULL,
 
@@ -865,16 +867,6 @@ CREATE TABLE url_relations (
 
 CREATE INDEX ON url_relations(urlhash, metapackage_id);
 
---------------------------------------------------------------------------------
--- Updates
---------------------------------------------------------------------------------
-DROP TABLE IF EXISTS repository_ruleset_hashes CASCADE;
-
-CREATE TABLE repository_ruleset_hashes (
-	repository text NOT NULL PRIMARY KEY,
-	ruleset_hash text NULL
-);
-
 --------------------------------------------------------------------------------
 -- Redirects
 --------------------------------------------------------------------------------