mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-01-03 13:45:49 +00:00
Code Issues Releases Wiki Activity

Remove unique constraint from Archive ID. Fixes #253 (#255)

Browse source 
* Remove unique constraint from Archive ID. Fixes #253

* Remove redundant primary key definition.
This commit is contained in:
Manuel Riel 2019-04-19 13:24:05 +08:00 committed by GitHub
parent 8f7a2a8883
commit b913c2a900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vorta/borg/list_repo.py
View file

@ -49,8 +49,8 @@ def process_result(self, result):
for archive in result['data'].get('archives', []): for archive in result['data'].get('archives', []):
new_archive, _ = ArchiveModel.get_or_create( new_archive, _ = ArchiveModel.get_or_create(
snapshot_id=archive['id'], snapshot_id=archive['id'],
repo=repo.id,
defaults={ defaults={
'repo': repo.id,
'name': archive['name'], 'name': archive['name'],
'time': parser.parse(archive['time']) 'time': parser.parse(archive['time'])
} }

20
src/vorta/models.py
View file

@ -15,7 +15,7 @@
from vorta.i18n import trans_late from vorta.i18n import trans_late
from vorta.utils import slugify, uses_dark_mode from vorta.utils import slugify, uses_dark_mode
SCHEMA_VERSION = 12 SCHEMA_VERSION = 13
db = pw.Proxy() db = pw.Proxy()
@ -113,7 +113,7 @@ class Meta:
class ArchiveModel(pw.Model): class ArchiveModel(pw.Model):
"""An archive in a remote repository.""" """An archive in a remote repository."""
snapshot_id = pw.CharField(unique=True) snapshot_id = pw.CharField()
name = pw.CharField() name = pw.CharField()
repo = pw.ForeignKeyField(RepoModel, backref='archives') repo = pw.ForeignKeyField(RepoModel, backref='archives')
time = pw.DateTimeField() time = pw.DateTimeField()
@ -125,7 +125,6 @@ def formatted_time(self):
class Meta: class Meta:
database = db database = db
table_name = 'snapshotmodel'
class WifiSettingModel(pw.Model): class WifiSettingModel(pw.Model):
@ -337,3 +336,18 @@ def init_db(con):
current_schema, 12, current_schema, 12,
migrator.add_column(RepoModel._meta.table_name, migrator.add_column(RepoModel._meta.table_name,
'extra_borg_arguments', pw.CharField(default=''))) 'extra_borg_arguments', pw.CharField(default='')))
if current_schema.version < 13:
"""
Migrate ArchiveModel data to new table to remove unique constraint from snapshot_id column.
"""
tables = db.get_tables()
if ArchiveModel.select().count() == 0 and 'snapshotmodel' in tables:
cursor = db.execute_sql('select * from snapshotmodel;')
fields = [ArchiveModel.id, ArchiveModel.snapshot_id, ArchiveModel.name, ArchiveModel.repo,
ArchiveModel.time, ArchiveModel.duration, ArchiveModel.size]
data = [row for row in cursor.fetchall()]
with db.atomic():
ArchiveModel.insert_many(data, fields=fields).execute()
_apply_schema_update(current_schema, 13)