From eef412dd3cb04f1da3b4d70eaaf661e98a74376c Mon Sep 17 00:00:00 2001 From: Shlok Gilda Date: Thu, 18 Dec 2025 20:17:57 -0500 Subject: [PATCH 1/6] Fix repo_deps_libyear column typo: current_verion -> current_version Fixes #2662 The column 'current_verion' in repo_deps_libyear table was misspelled (missing 's'). This commit: - Adds Alembic migration (rev 38) to rename the column - Drops and recreates explorer_libyear_detail materialized view - Updates ORM model, task code, and all schema files for consistency Note: PostgreSQL supports simple column renames via ALTER TABLE, so no temp tables or data copying is needed. Signed-off-by: Shlok Gilda --- collectoss/application/db/models/data.py | 2 +- .../schema/20211006-augur-0.21.0-release.ndm2 | 4 +- .../alembic/versions/1_augur_new_changes.py | 4 +- .../versions/38_fix_libyear_column_typo.py | 92 +++++++++++++++++++ .../4_explorer_materialized_view_update.py | 4 +- .../versions/legacy/80.2-create-tables.sql | 2 +- collectoss/application/schema/augur_full.sql | 4 +- .../git/dependency_libyear_tasks/core.py | 10 +- docker/database/collectoss-new-schema.sql | 4 +- tests/entire_db.sql | 8 +- 10 files changed, 109 insertions(+), 25 deletions(-) create mode 100644 collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py diff --git a/collectoss/application/db/models/data.py b/collectoss/application/db/models/data.py index aa4d30482..fb9be4d4d 100644 --- a/collectoss/application/db/models/data.py +++ b/collectoss/application/db/models/data.py @@ -2036,7 +2036,7 @@ class RepoDepsLibyear(Base): requirement = Column(String) type = Column(String) package_manager = Column(String) - current_verion = Column(String) + current_version = Column(String) latest_version = Column(String) current_release_date = Column(String) latest_release_date = Column(String) diff --git a/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 b/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 index d213fadda..a6ca8e1dd 100644 --- a/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 +++ b/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 @@ -28872,7 +28872,7 @@ }, { "objectType": "TableField_PGSQL", - "name": "current_verion", + "name": "current_version", "type": "varchar", "length": 0, "decimals": 0, @@ -28882,7 +28882,7 @@ "defaultType": "None", "defaultValue": "", "comment": "", - "oldName": "current_verion", + "oldName": "current_version", "typeOID": 1, "fieldObjectType": "", "objectTypeSchema": "", diff --git a/collectoss/application/schema/alembic/versions/1_augur_new_changes.py b/collectoss/application/schema/alembic/versions/1_augur_new_changes.py index c53d1507b..0fcacab94 100644 --- a/collectoss/application/schema/alembic/versions/1_augur_new_changes.py +++ b/collectoss/application/schema/alembic/versions/1_augur_new_changes.py @@ -644,14 +644,14 @@ def add_materialized_views_13(upgrade=True): a.repo_name, b.name, b.requirement, - b.current_verion, + b.current_version, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement; """)) conn.execute(text(""" diff --git a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py new file mode 100644 index 000000000..2164a1863 --- /dev/null +++ b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py @@ -0,0 +1,92 @@ +"""Fix typo in repo_deps_libyear column: current_verion -> current_version + +Revision ID: 38 +Revises: 37 +Create Date: 2025-01-15 + +This migration fixes a typo in the repo_deps_libyear table where the column +'current_verion' was misspelled (missing 's'). The correct name should be +'current_version'. + +Since PostgreSQL supports simple column renames via ALTER TABLE, no data +copying or temp tables are needed. However, we must drop and recreate the +materialized view 'explorer_libyear_detail' which references this column. +""" +from alembic import op +from sqlalchemy import text + +# revision identifiers, used by Alembic. +revision = '38' +down_revision = '37' +branch_labels = None +depends_on = None + + +def upgrade(): + conn = op.get_bind() + + # Step 1: Drop the materialized view that references the column + conn.execute(text(""" + DROP MATERIALIZED VIEW IF EXISTS augur_data.explorer_libyear_detail; + """)) + + # Step 2: Rename the column (simple metadata operation in PostgreSQL) + conn.execute(text(""" + ALTER TABLE augur_data.repo_deps_libyear + RENAME COLUMN current_verion TO current_version; + """)) + + # Step 3: Recreate the materialized view with the corrected column name + conn.execute(text(""" + CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS + SELECT a.repo_id, + a.repo_name, + b.name, + b.requirement, + b.current_version, + b.latest_version, + b.current_release_date, + b.libyear, + max(b.data_collection_date) AS max + FROM augur_data.repo a, + augur_data.repo_deps_libyear b + WHERE a.repo_id = b.repo_id + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, + b.latest_version, b.current_release_date, b.libyear + ORDER BY a.repo_id, b.requirement; + """)) + + +def downgrade(): + conn = op.get_bind() + + # Step 1: Drop the materialized view + conn.execute(text(""" + DROP MATERIALIZED VIEW IF EXISTS augur_data.explorer_libyear_detail; + """)) + + # Step 2: Rename the column back to the typo version + conn.execute(text(""" + ALTER TABLE augur_data.repo_deps_libyear + RENAME COLUMN current_version TO current_verion; + """)) + + # Step 3: Recreate the materialized view with the original (typo) column name + conn.execute(text(""" + CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS + SELECT a.repo_id, + a.repo_name, + b.name, + b.requirement, + b.current_verion, + b.latest_version, + b.current_release_date, + b.libyear, + max(b.data_collection_date) AS max + FROM augur_data.repo a, + augur_data.repo_deps_libyear b + WHERE a.repo_id = b.repo_id + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, + b.latest_version, b.current_release_date, b.libyear + ORDER BY a.repo_id, b.requirement; + """)) diff --git a/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py b/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py index e30c2f312..03ca16e7f 100644 --- a/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py +++ b/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py @@ -127,14 +127,14 @@ def add_materialized_views_15(upgrade=True): a.repo_name, b.name, b.requirement, - b.current_verion, + b.current_version, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement; """)) conn.execute(text(""" diff --git a/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql b/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql index 8453661cc..53467e4c7 100644 --- a/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql +++ b/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql @@ -2906,7 +2906,7 @@ CREATE TABLE "augur_data"."repo_deps_libyear" ( "requirement" varchar COLLATE "pg_catalog"."default", "type" varchar COLLATE "pg_catalog"."default", "package_manager" varchar COLLATE "pg_catalog"."default", - "current_verion" varchar COLLATE "pg_catalog"."default", + "current_version" varchar COLLATE "pg_catalog"."default", "latest_version" varchar COLLATE "pg_catalog"."default", "current_release_date" varchar COLLATE "pg_catalog"."default", "latest_release_date" varchar COLLATE "pg_catalog"."default", diff --git a/collectoss/application/schema/augur_full.sql b/collectoss/application/schema/augur_full.sql index 203707157..4b360dc33 100644 --- a/collectoss/application/schema/augur_full.sql +++ b/collectoss/application/schema/augur_full.sql @@ -2129,7 +2129,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_verion character varying, + current_version character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -4725,7 +4725,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \. diff --git a/collectoss/tasks/git/dependency_libyear_tasks/core.py b/collectoss/tasks/git/dependency_libyear_tasks/core.py index 56b8f1a5b..1b950b162 100644 --- a/collectoss/tasks/git/dependency_libyear_tasks/core.py +++ b/collectoss/tasks/git/dependency_libyear_tasks/core.py @@ -45,8 +45,7 @@ def generate_deps_libyear_data(logger, repo_id, path): #'requirement' : dep['requirement'], 'type' : dep['type'], 'package_manager' : dep['package'], - #'current_version' : dep['current_version'], # 🔧 FIXED - 'current_verion' : dep['current_version'], + 'current_version' : dep['current_version'], 'latest_version' : dep['latest_version'], 'current_release_date' : dep['current_release_date'], 'latest_release_date' : dep['latest_release_date'], @@ -57,13 +56,6 @@ def generate_deps_libyear_data(logger, repo_id, path): 'data_collection_date': date_scanned } - #result = self.db.execute(self.repo_deps_libyear_table.insert().values(repo_deps)) - #self.logger.info(f"Added dep: {result.inserted_primary_key}") - #insert_statement = s.sql.text(""" - # INSERT INTO "repo_deps_libyear" ("repo_id","name","requirement","type","package_manager","current_verion","latest_version","current_release_date","latest_release_date","libyear","tool_source","tool_version","data_source","data_collection_date") - # VALUES (:repo_id, :name,:requirement,:type,:package_manager,:current_verion,:latest_version,:current_release_date,:latest_release_date,:libyear,:tool_source,:tool_version,:data_source, :data_collection_date) - #""").bindparams(**repo_deps) -# to_insert.append(repo_deps) bulk_insert_dicts(logger, to_insert, RepoDepsLibyear, ["repo_id","name","data_collection_date"]) diff --git a/docker/database/collectoss-new-schema.sql b/docker/database/collectoss-new-schema.sql index 1163a87df..04652373c 100644 --- a/docker/database/collectoss-new-schema.sql +++ b/docker/database/collectoss-new-schema.sql @@ -3894,7 +3894,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_verion character varying, + current_version character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -6832,7 +6832,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \. diff --git a/tests/entire_db.sql b/tests/entire_db.sql index 01d1015fb..2684140ef 100644 --- a/tests/entire_db.sql +++ b/tests/entire_db.sql @@ -1941,7 +1941,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_verion character varying, + current_version character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -1983,14 +1983,14 @@ CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS a.repo_name, b.name, b.requirement, - b.current_verion, + b.current_version, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement WITH NO DATA; @@ -6714,7 +6714,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \. From 031d0f6cea1fdae980473907c57a9fb4472d5dfa Mon Sep 17 00:00:00 2001 From: Shlok Gilda Date: Wed, 7 Jan 2026 01:44:23 -0500 Subject: [PATCH 2/6] fix: correct creation date in migration for libyear column typo Signed-off-by: Shlok Gilda --- .../schema/alembic/versions/38_fix_libyear_column_typo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py index 2164a1863..92b0f179d 100644 --- a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py +++ b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py @@ -2,7 +2,7 @@ Revision ID: 38 Revises: 37 -Create Date: 2025-01-15 +Create Date: 2025-12-15 This migration fixes a typo in the repo_deps_libyear table where the column 'current_verion' was misspelled (missing 's'). The correct name should be From 9b6801b31f28087acc4df49fdaa0ccddbf8f3656 Mon Sep 17 00:00:00 2001 From: Shlok Gilda Date: Thu, 8 Jan 2026 18:28:38 -0500 Subject: [PATCH 3/6] revert: restore original column name in old migrations Old migrations should be immutable - the typo fix belongs only in migration 38, not in historical migrations 1 and 4. Signed-off-by: Shlok Gilda --- .../schema/alembic/versions/1_augur_new_changes.py | 4 ++-- .../alembic/versions/4_explorer_materialized_view_update.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collectoss/application/schema/alembic/versions/1_augur_new_changes.py b/collectoss/application/schema/alembic/versions/1_augur_new_changes.py index 0fcacab94..c53d1507b 100644 --- a/collectoss/application/schema/alembic/versions/1_augur_new_changes.py +++ b/collectoss/application/schema/alembic/versions/1_augur_new_changes.py @@ -644,14 +644,14 @@ def add_materialized_views_13(upgrade=True): a.repo_name, b.name, b.requirement, - b.current_version, + b.current_verion, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement; """)) conn.execute(text(""" diff --git a/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py b/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py index 03ca16e7f..e30c2f312 100644 --- a/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py +++ b/collectoss/application/schema/alembic/versions/4_explorer_materialized_view_update.py @@ -127,14 +127,14 @@ def add_materialized_views_15(upgrade=True): a.repo_name, b.name, b.requirement, - b.current_version, + b.current_verion, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement; """)) conn.execute(text(""" From 829e175eff81c47ba5eb562cac9556ab4836eda8 Mon Sep 17 00:00:00 2001 From: Shlok Gilda Date: Thu, 8 Jan 2026 18:33:29 -0500 Subject: [PATCH 4/6] fix: simplify migration 38, view was already dropped The explorer_libyear_detail view was dropped in migration 25, so no view manipulation is needed - just rename the column. Signed-off-by: Shlok Gilda --- .../versions/38_fix_libyear_column_typo.py | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py index 92b0f179d..7e9a92be8 100644 --- a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py +++ b/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py @@ -3,14 +3,6 @@ Revision ID: 38 Revises: 37 Create Date: 2025-12-15 - -This migration fixes a typo in the repo_deps_libyear table where the column -'current_verion' was misspelled (missing 's'). The correct name should be -'current_version'. - -Since PostgreSQL supports simple column renames via ALTER TABLE, no data -copying or temp tables are needed. However, we must drop and recreate the -materialized view 'explorer_libyear_detail' which references this column. """ from alembic import op from sqlalchemy import text @@ -24,69 +16,15 @@ def upgrade(): conn = op.get_bind() - - # Step 1: Drop the materialized view that references the column - conn.execute(text(""" - DROP MATERIALIZED VIEW IF EXISTS augur_data.explorer_libyear_detail; - """)) - - # Step 2: Rename the column (simple metadata operation in PostgreSQL) conn.execute(text(""" ALTER TABLE augur_data.repo_deps_libyear RENAME COLUMN current_verion TO current_version; """)) - # Step 3: Recreate the materialized view with the corrected column name - conn.execute(text(""" - CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS - SELECT a.repo_id, - a.repo_name, - b.name, - b.requirement, - b.current_version, - b.latest_version, - b.current_release_date, - b.libyear, - max(b.data_collection_date) AS max - FROM augur_data.repo a, - augur_data.repo_deps_libyear b - WHERE a.repo_id = b.repo_id - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, - b.latest_version, b.current_release_date, b.libyear - ORDER BY a.repo_id, b.requirement; - """)) - def downgrade(): conn = op.get_bind() - - # Step 1: Drop the materialized view - conn.execute(text(""" - DROP MATERIALIZED VIEW IF EXISTS augur_data.explorer_libyear_detail; - """)) - - # Step 2: Rename the column back to the typo version conn.execute(text(""" ALTER TABLE augur_data.repo_deps_libyear RENAME COLUMN current_version TO current_verion; """)) - - # Step 3: Recreate the materialized view with the original (typo) column name - conn.execute(text(""" - CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS - SELECT a.repo_id, - a.repo_name, - b.name, - b.requirement, - b.current_verion, - b.latest_version, - b.current_release_date, - b.libyear, - max(b.data_collection_date) AS max - FROM augur_data.repo a, - augur_data.repo_deps_libyear b - WHERE a.repo_id = b.repo_id - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, - b.latest_version, b.current_release_date, b.libyear - ORDER BY a.repo_id, b.requirement; - """)) From 439abcc3b06751afcd7dc2118237f1dfac68b896 Mon Sep 17 00:00:00 2001 From: Adrian Edwards Date: Mon, 14 Sep 2026 14:16:35 -0400 Subject: [PATCH 5/6] renumber migration --- ..._column_typo.py => 45_fix_libyear_column_typo.py} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename collectoss/application/schema/alembic/versions/{38_fix_libyear_column_typo.py => 45_fix_libyear_column_typo.py} (75%) diff --git a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py b/collectoss/application/schema/alembic/versions/45_fix_libyear_column_typo.py similarity index 75% rename from collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py rename to collectoss/application/schema/alembic/versions/45_fix_libyear_column_typo.py index 7e9a92be8..67eeef262 100644 --- a/collectoss/application/schema/alembic/versions/38_fix_libyear_column_typo.py +++ b/collectoss/application/schema/alembic/versions/45_fix_libyear_column_typo.py @@ -1,15 +1,15 @@ """Fix typo in repo_deps_libyear column: current_verion -> current_version -Revision ID: 38 -Revises: 37 +Revision ID: 45 +Revises: 44 Create Date: 2025-12-15 """ from alembic import op from sqlalchemy import text # revision identifiers, used by Alembic. -revision = '38' -down_revision = '37' +revision = '45' +down_revision = '44' branch_labels = None depends_on = None @@ -17,7 +17,7 @@ def upgrade(): conn = op.get_bind() conn.execute(text(""" - ALTER TABLE augur_data.repo_deps_libyear + ALTER TABLE data.repo_deps_libyear RENAME COLUMN current_verion TO current_version; """)) @@ -25,6 +25,6 @@ def upgrade(): def downgrade(): conn = op.get_bind() conn.execute(text(""" - ALTER TABLE augur_data.repo_deps_libyear + ALTER TABLE data.repo_deps_libyear RENAME COLUMN current_version TO current_verion; """)) From ec449b91eed65ce0f1290749930fbf2a333c8728 Mon Sep 17 00:00:00 2001 From: Adrian Edwards Date: Mon, 14 Sep 2026 14:18:27 -0400 Subject: [PATCH 6/6] revert changes to legacy db files that dont need updating --- .../application/schema/20211006-augur-0.21.0-release.ndm2 | 4 ++-- .../schema/alembic/versions/legacy/80.2-create-tables.sql | 2 +- collectoss/application/schema/augur_full.sql | 4 ++-- docker/database/collectoss-new-schema.sql | 4 ++-- tests/entire_db.sql | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 b/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 index a6ca8e1dd..d213fadda 100644 --- a/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 +++ b/collectoss/application/schema/20211006-augur-0.21.0-release.ndm2 @@ -28872,7 +28872,7 @@ }, { "objectType": "TableField_PGSQL", - "name": "current_version", + "name": "current_verion", "type": "varchar", "length": 0, "decimals": 0, @@ -28882,7 +28882,7 @@ "defaultType": "None", "defaultValue": "", "comment": "", - "oldName": "current_version", + "oldName": "current_verion", "typeOID": 1, "fieldObjectType": "", "objectTypeSchema": "", diff --git a/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql b/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql index 53467e4c7..8453661cc 100644 --- a/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql +++ b/collectoss/application/schema/alembic/versions/legacy/80.2-create-tables.sql @@ -2906,7 +2906,7 @@ CREATE TABLE "augur_data"."repo_deps_libyear" ( "requirement" varchar COLLATE "pg_catalog"."default", "type" varchar COLLATE "pg_catalog"."default", "package_manager" varchar COLLATE "pg_catalog"."default", - "current_version" varchar COLLATE "pg_catalog"."default", + "current_verion" varchar COLLATE "pg_catalog"."default", "latest_version" varchar COLLATE "pg_catalog"."default", "current_release_date" varchar COLLATE "pg_catalog"."default", "latest_release_date" varchar COLLATE "pg_catalog"."default", diff --git a/collectoss/application/schema/augur_full.sql b/collectoss/application/schema/augur_full.sql index 4b360dc33..203707157 100644 --- a/collectoss/application/schema/augur_full.sql +++ b/collectoss/application/schema/augur_full.sql @@ -2129,7 +2129,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_version character varying, + current_verion character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -4725,7 +4725,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \. diff --git a/docker/database/collectoss-new-schema.sql b/docker/database/collectoss-new-schema.sql index 04652373c..1163a87df 100644 --- a/docker/database/collectoss-new-schema.sql +++ b/docker/database/collectoss-new-schema.sql @@ -3894,7 +3894,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_version character varying, + current_verion character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -6832,7 +6832,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \. diff --git a/tests/entire_db.sql b/tests/entire_db.sql index 2684140ef..01d1015fb 100644 --- a/tests/entire_db.sql +++ b/tests/entire_db.sql @@ -1941,7 +1941,7 @@ CREATE TABLE augur_data.repo_deps_libyear ( requirement character varying, type character varying, package_manager character varying, - current_version character varying, + current_verion character varying, latest_version character varying, current_release_date character varying, latest_release_date character varying, @@ -1983,14 +1983,14 @@ CREATE MATERIALIZED VIEW augur_data.explorer_libyear_detail AS a.repo_name, b.name, b.requirement, - b.current_version, + b.current_verion, b.latest_version, b.current_release_date, b.libyear, max(b.data_collection_date) AS max FROM augur_data.repo a, augur_data.repo_deps_libyear b - GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_version, b.latest_version, b.current_release_date, b.libyear + GROUP BY a.repo_id, a.repo_name, b.name, b.requirement, b.current_verion, b.latest_version, b.current_release_date, b.libyear ORDER BY a.repo_id, b.requirement WITH NO DATA; @@ -6714,7 +6714,7 @@ COPY augur_data.repo_dependencies (repo_dependencies_id, repo_id, dep_name, dep_ -- Data for Name: repo_deps_libyear; Type: TABLE DATA; Schema: augur_data; Owner: augur -- -COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_version, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; +COPY augur_data.repo_deps_libyear (repo_deps_libyear_id, repo_id, name, requirement, type, package_manager, current_verion, latest_version, current_release_date, latest_release_date, libyear, tool_source, tool_version, data_source, data_collection_date) FROM stdin; \.