s3lph/matemat
s3lph/matemat
1
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages 2 Wiki Activity Actions

Merge branch 'main' into main

Browse source
This commit is contained in:
weva 2024-12-07 22:03:58 +01:00
commit 4f69a1b447
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -9,5 +9,6 @@
*.sqlite3 *.sqlite3
*.db *.db
*.bak
static/upload/ static/upload/
./matemat.conf ./matemat.conf

10
matemat/db/wrapper.py
View file

@ -60,10 +60,10 @@ class DatabaseWrapper(object):
def _setup(self) -> None: def _setup(self) -> None:
# Create or update schemas if necessary # Create or update schemas if necessary
with self.transaction() as c:
version: int = self._user_version version: int = self._user_version
if version < 1: if version < 1:
# Don't use executescript, as it issues a COMMIT first # Don't use executescript, as it issues a COMMIT first
with self.transaction() as c:
for command in SCHEMAS[self.SCHEMA_VERSION]: for command in SCHEMAS[self.SCHEMA_VERSION]:
c.execute(command) c.execute(command)
elif version < self.SCHEMA_VERSION: elif version < self.SCHEMA_VERSION:
@ -77,6 +77,14 @@ class DatabaseWrapper(object):
cursor.execute('PRAGMA foreign_keys=ON') cursor.execute('PRAGMA foreign_keys=ON')
def _upgrade(self, from_version: int, to_version: int) -> None: def _upgrade(self, from_version: int, to_version: int) -> None:
if from_version >= to_version:
return
if self._filename != ':memory:':
bakfile = f'{self._filename}_{from_version}_{to_version}.bak'
bak = sqlite3.connect(bakfile)
with bak:
self._sqlite_db.backup(bak, pages=1)
bak.close()
with self.transaction() as c: with self.transaction() as c:
c.execute('PRAGMA foreign_keys=OFF') c.execute('PRAGMA foreign_keys=OFF')
c.execute('PRAGMA legacy_alter_table=ON') c.execute('PRAGMA legacy_alter_table=ON')

1
package/debian/matemat/DEBIAN/postinst
View file

@ -16,6 +16,7 @@ if [[ "$1" == "configure" ]]; then
chmod 0750 /var/lib/matemat chmod 0750 /var/lib/matemat
ln -sf /var/lib/matemat/upload /usr/lib/matemat/static/upload ln -sf /var/lib/matemat/upload /usr/lib/matemat/static/upload
systemctl daemon-reload || true
deb-systemd-helper enable matemat.service deb-systemd-helper enable matemat.service
deb-systemd-invoke restart matemat.service deb-systemd-invoke restart matemat.service