Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion augur/application/db/models/augur_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -1981,7 +1981,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)
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/20211006-augur-0.21.0-release.ndm2
Original file line number Diff line number Diff line change
Expand Up @@ -28872,7 +28872,7 @@
},
{
"objectType": "TableField_PGSQL",
"name": "current_verion",
"name": "current_version",
"type": "varchar",
"length": 0,
"decimals": 0,
Expand All @@ -28882,7 +28882,7 @@
"defaultType": "None",
"defaultValue": "",
"comment": "",
"oldName": "current_verion",
"oldName": "current_version",
"typeOID": 1,
"fieldObjectType": "",
"objectTypeSchema": "",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
"""Fix typo in repo_deps_libyear column: current_verion -> current_version

Revision ID: 38
Revises: 37
Create Date: 2025-12-15
"""
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()
conn.execute(text("""
ALTER TABLE augur_data.repo_deps_libyear
RENAME COLUMN current_verion TO current_version;
"""))


def downgrade():
conn = op.get_bind()
conn.execute(text("""
ALTER TABLE augur_data.repo_deps_libyear
RENAME COLUMN current_version TO current_verion;
"""))
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions augur/application/schema/augur_full.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
\.


Expand Down
10 changes: 1 addition & 9 deletions augur/tasks/git/dependency_libyear_tasks/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand All @@ -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"])
4 changes: 2 additions & 2 deletions docker/database/augur-new-schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
\.


Expand Down
4 changes: 2 additions & 2 deletions docker/database/augur-retired-sql.schema
Original file line number Diff line number Diff line change
Expand Up @@ -2985,7 +2985,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,
Expand Down Expand Up @@ -5849,7 +5849,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;
\.


Expand Down
8 changes: 4 additions & 4 deletions tests/entire_db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
\.


Expand Down
Loading