You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/25 21:19:53 UTC
[airavata-django-portal] branch master updated: AIRAVATA-2588
Support MariaDB
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/master by this push:
new 81b2231 AIRAVATA-2588 Support MariaDB
81b2231 is described below
commit 81b2231786210d596038804e51b47d2ae3d57c6b
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Jun 25 16:01:26 2019 -0400
AIRAVATA-2588 Support MariaDB
---
.../0001_squashed_0004_auto_20190625_1938.py | 42 ++++++++++++++++++++++
.../apps/api/migrations/0003_auto_20190625_1926.py | 20 +++++++++++
.../apps/api/migrations/0004_auto_20190625_1938.py | 23 ++++++++++++
django_airavata/apps/api/models.py | 8 +++--
requirements.txt | 1 +
5 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/django_airavata/apps/api/migrations/0001_squashed_0004_auto_20190625_1938.py b/django_airavata/apps/api/migrations/0001_squashed_0004_auto_20190625_1938.py
new file mode 100644
index 0000000..7251fce
--- /dev/null
+++ b/django_airavata/apps/api/migrations/0001_squashed_0004_auto_20190625_1938.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2019-06-25 19:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ replaces = [('django_airavata_api', '0001_initial'), ('django_airavata_api', '0002_auto_20190513_2037'), ('django_airavata_api', '0003_auto_20190625_1926'), ('django_airavata_api', '0004_auto_20190625_1938')]
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='WorkspacePreferences',
+ fields=[
+ ('username', models.CharField(max_length=64, primary_key=True, serialize=False)),
+ ('most_recent_project_id', models.CharField(max_length=64)),
+ ],
+ ),
+ migrations.CreateModel(
+ name='User_Files',
+ fields=[
+ ('username', models.CharField(max_length=64)),
+ ('file_path', models.TextField()),
+ ('file_dpu', models.CharField(max_length=255, primary_key=True, serialize=False)),
+ ],
+ ),
+ migrations.AlterField(
+ model_name='user_files',
+ name='file_dpu',
+ field=models.CharField(max_length=255, primary_key=True, serialize=False),
+ ),
+ migrations.AddIndex(
+ model_name='user_files',
+ index=models.Index(fields=['username'], name='username_idx'),
+ ),
+ ]
diff --git a/django_airavata/apps/api/migrations/0003_auto_20190625_1926.py b/django_airavata/apps/api/migrations/0003_auto_20190625_1926.py
new file mode 100644
index 0000000..3b639ce
--- /dev/null
+++ b/django_airavata/apps/api/migrations/0003_auto_20190625_1926.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2019-06-25 19:26
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('django_airavata_api', '0002_auto_20190513_2037'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='user_files',
+ name='file_dpu',
+ field=models.CharField(max_length=255, primary_key=True, serialize=False),
+ ),
+ ]
diff --git a/django_airavata/apps/api/migrations/0004_auto_20190625_1938.py b/django_airavata/apps/api/migrations/0004_auto_20190625_1938.py
new file mode 100644
index 0000000..245efca
--- /dev/null
+++ b/django_airavata/apps/api/migrations/0004_auto_20190625_1938.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.21 on 2019-06-25 19:38
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('django_airavata_api', '0003_auto_20190625_1926'),
+ ]
+
+ operations = [
+ migrations.RemoveIndex(
+ model_name='user_files',
+ name='username_file_path_idx',
+ ),
+ migrations.AddIndex(
+ model_name='user_files',
+ index=models.Index(fields=['username'], name='username_idx'),
+ ),
+ ]
diff --git a/django_airavata/apps/api/models.py b/django_airavata/apps/api/models.py
index 5242208..52e82c2 100644
--- a/django_airavata/apps/api/models.py
+++ b/django_airavata/apps/api/models.py
@@ -14,10 +14,12 @@ class WorkspacePreferences(models.Model):
class User_Files(models.Model):
username = models.CharField(max_length=64)
file_path = models.TextField()
- file_dpu = models.CharField(max_length=500, primary_key=True)
+ file_dpu = models.CharField(max_length=255, primary_key=True)
class Meta:
indexes = [
- models.Index(fields=['username', 'file_path'],
- name='username_file_path_idx')
+ # FIXME: ideally we would include file_path in the index to make
+ # lookups faster, but Django/MariaDB don't support key length on a
+ # TEXT column which is required to create an index
+ models.Index(fields=['username'], name='username_idx')
]
diff --git a/requirements.txt b/requirements.txt
index e46f090..b9e4158 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ thrift==0.10.0
thrift_connector==0.24
djangorestframework==3.8.2
django-webpack-loader==0.6.0
+mysqlclient==1.4.2.post1
wagtail==2.0
wagtailfontawesome==1.1.3