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/alembic/versions/45_fix_libyear_column_typo.py b/collectoss/application/schema/alembic/versions/45_fix_libyear_column_typo.py new file mode 100644 index 000000000..67eeef262 --- /dev/null +++ b/collectoss/application/schema/alembic/versions/45_fix_libyear_column_typo.py @@ -0,0 +1,30 @@ +"""Fix typo in repo_deps_libyear column: current_verion -> current_version + +Revision ID: 45 +Revises: 44 +Create Date: 2025-12-15 +""" +from alembic import op +from sqlalchemy import text + +# revision identifiers, used by Alembic. +revision = '45' +down_revision = '44' +branch_labels = None +depends_on = None + + +def upgrade(): + conn = op.get_bind() + conn.execute(text(""" + ALTER TABLE data.repo_deps_libyear + RENAME COLUMN current_verion TO current_version; + """)) + + +def downgrade(): + conn = op.get_bind() + conn.execute(text(""" + ALTER TABLE data.repo_deps_libyear + RENAME COLUMN current_version TO current_verion; + """)) 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"])