From 2b58ac27b4624955f31adff797aa2d22f0067fb0 Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Tue, 6 Aug 2024 17:37:40 +0200
Subject: [PATCH] Pluck uuid-ossp extension
---
arkindex/documents/migrations/0001_initial.py | 2 --
arkindex/documents/models.py | 4 ++--
arkindex/process/managers.py | 2 +-
arkindex/sql_validation/add_first_parent.sql | 4 ++--
arkindex/sql_validation/add_second_parent.sql | 4 ++--
arkindex/sql_validation/workeractivity_bulk_insert.sql | 2 +-
.../workeractivity_bulk_insert_no_configuration.sql | 2 +-
.../sql_validation/workeractivity_bulk_insert_no_model.sql | 2 +-
.../workeractivity_bulk_insert_worker_version_only.sql | 2 +-
arkindex/training/migrations/0007_datasetset_model.py | 4 ++--
10 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/arkindex/documents/migrations/0001_initial.py b/arkindex/documents/migrations/0001_initial.py
index 31468a0014..d52a0da513 100644
--- a/arkindex/documents/migrations/0001_initial.py
+++ b/arkindex/documents/migrations/0001_initial.py
@@ -6,7 +6,6 @@ import django.contrib.postgres.fields.hstore
import django.core.validators
import django.db.models.deletion
import enumfields.fields
-from django.contrib.postgres.operations import CreateExtension
from django.db import migrations, models
import arkindex.documents.dates
@@ -23,7 +22,6 @@ class Migration(migrations.Migration):
]
operations = [
- CreateExtension("uuid-ossp"),
migrations.CreateModel(
name="AllowedMetaData",
fields=[
diff --git a/arkindex/documents/models.py b/arkindex/documents/models.py
index 3a683208e8..e6eb2bc4a6 100644
--- a/arkindex/documents/models.py
+++ b/arkindex/documents/models.py
@@ -431,7 +431,7 @@ class Element(IndexableModel):
query = """
INSERT INTO documents_elementpath (id, element_id, path, ordering)
SELECT
- uuid_generate_v4(),
+ gen_random_uuid(),
%(self_id)s,
path || %(parent_id)s,
%(ordering)s
@@ -483,7 +483,7 @@ class Element(IndexableModel):
query = """
INSERT INTO documents_elementpath (id, element_id, path, ordering)
SELECT
- uuid_generate_v4(),
+ gen_random_uuid(),
child_paths.element_id,
new_parent_paths.path || %(new_parent_id)s || child_paths.path[%(start_index)s:],
child_paths.ordering
diff --git a/arkindex/process/managers.py b/arkindex/process/managers.py
index c7ca82b2d0..5685e1567c 100644
--- a/arkindex/process/managers.py
+++ b/arkindex/process/managers.py
@@ -56,7 +56,7 @@ class ActivityManager(Manager):
INSERT INTO process_workeractivity
(element_id, worker_version_id, configuration_id, model_version_id, state, process_id, id, created, updated)
SELECT
- elt.id, %s, %s, %s, 'queued', %s, uuid_generate_v4(), current_timestamp, current_timestamp
+ elt.id, %s, %s, %s, 'queued', %s, gen_random_uuid(), current_timestamp, current_timestamp
FROM ({sql}) AS elt
ON CONFLICT {conflict_target} DO UPDATE SET
process_id = EXCLUDED.process_id,
diff --git a/arkindex/sql_validation/add_first_parent.sql b/arkindex/sql_validation/add_first_parent.sql
index 755f1b3fba..296ee48210 100644
--- a/arkindex/sql_validation/add_first_parent.sql
+++ b/arkindex/sql_validation/add_first_parent.sql
@@ -33,7 +33,7 @@ SELECT EXISTS
AND path[array_length(path, 1)] = '{A}'::uuid ) ;
INSERT INTO documents_elementpath (id, element_id, path, ordering)
-SELECT uuid_generate_v4(),
+SELECT gen_random_uuid(),
'{B}'::uuid,
path || '{A}'::uuid,
1
@@ -52,7 +52,7 @@ SET "path" = array_cat(ARRAY['{first_parent}'::uuid, '{A}'::uuid], "documents_el
WHERE "documents_elementpath"."path" && (ARRAY['{B}'::uuid])::uuid[];
INSERT INTO documents_elementpath (id, element_id, path, ordering)
-SELECT uuid_generate_v4(),
+SELECT gen_random_uuid(),
child_paths.element_id,
new_parent_paths.path || '{A}'::uuid || child_paths.path[3:],
child_paths.ordering
diff --git a/arkindex/sql_validation/add_second_parent.sql b/arkindex/sql_validation/add_second_parent.sql
index 0d8691022a..27375cfede 100644
--- a/arkindex/sql_validation/add_second_parent.sql
+++ b/arkindex/sql_validation/add_second_parent.sql
@@ -33,7 +33,7 @@ SELECT EXISTS
AND path[array_length(path, 1)] = '{A}'::uuid ) ;
INSERT INTO documents_elementpath (id, element_id, path, ordering)
-SELECT uuid_generate_v4(),
+SELECT gen_random_uuid(),
'{B}'::uuid,
path || '{A}'::uuid,
1
@@ -41,7 +41,7 @@ FROM documents_elementpath
WHERE element_id = '{A}'::uuid ;
INSERT INTO documents_elementpath (id, element_id, path, ordering)
-SELECT uuid_generate_v4(),
+SELECT gen_random_uuid(),
child_paths.element_id,
new_parent_paths.path || '{A}'::uuid || child_paths.path[2:],
child_paths.ordering
diff --git a/arkindex/sql_validation/workeractivity_bulk_insert.sql b/arkindex/sql_validation/workeractivity_bulk_insert.sql
index 3052489a20..cd72f2a05b 100644
--- a/arkindex/sql_validation/workeractivity_bulk_insert.sql
+++ b/arkindex/sql_validation/workeractivity_bulk_insert.sql
@@ -5,7 +5,7 @@ SELECT elt.id,
'{model_version_id}'::uuid,
'queued',
'{process_id}'::uuid,
- uuid_generate_v4(),
+ gen_random_uuid(),
current_timestamp,
current_timestamp
FROM
diff --git a/arkindex/sql_validation/workeractivity_bulk_insert_no_configuration.sql b/arkindex/sql_validation/workeractivity_bulk_insert_no_configuration.sql
index 1b5f3b10e0..7e92328e47 100644
--- a/arkindex/sql_validation/workeractivity_bulk_insert_no_configuration.sql
+++ b/arkindex/sql_validation/workeractivity_bulk_insert_no_configuration.sql
@@ -5,7 +5,7 @@ SELECT elt.id,
'{model_version_id}'::uuid,
'queued',
'{process_id}'::uuid,
- uuid_generate_v4(),
+ gen_random_uuid(),
current_timestamp,
current_timestamp
FROM
diff --git a/arkindex/sql_validation/workeractivity_bulk_insert_no_model.sql b/arkindex/sql_validation/workeractivity_bulk_insert_no_model.sql
index 4bdacbfe4b..cd539dd953 100644
--- a/arkindex/sql_validation/workeractivity_bulk_insert_no_model.sql
+++ b/arkindex/sql_validation/workeractivity_bulk_insert_no_model.sql
@@ -5,7 +5,7 @@ SELECT elt.id,
NULL,
'queued',
'{process_id}'::uuid,
- uuid_generate_v4(),
+ gen_random_uuid(),
current_timestamp,
current_timestamp
FROM
diff --git a/arkindex/sql_validation/workeractivity_bulk_insert_worker_version_only.sql b/arkindex/sql_validation/workeractivity_bulk_insert_worker_version_only.sql
index 0d4cc39a45..55c03afaea 100644
--- a/arkindex/sql_validation/workeractivity_bulk_insert_worker_version_only.sql
+++ b/arkindex/sql_validation/workeractivity_bulk_insert_worker_version_only.sql
@@ -5,7 +5,7 @@ SELECT elt.id,
NULL,
'queued',
'{process_id}'::uuid,
- uuid_generate_v4(),
+ gen_random_uuid(),
current_timestamp,
current_timestamp
FROM
diff --git a/arkindex/training/migrations/0007_datasetset_model.py b/arkindex/training/migrations/0007_datasetset_model.py
index 7f21a630dc..a14d756ebc 100644
--- a/arkindex/training/migrations/0007_datasetset_model.py
+++ b/arkindex/training/migrations/0007_datasetset_model.py
@@ -51,7 +51,7 @@ class Migration(migrations.Migration):
[
"""
INSERT INTO training_datasetset (id, dataset_id, name)
- SELECT uuid_generate_v4(), ds.id, ds.set
+ SELECT gen_random_uuid(), ds.id, ds.set
FROM (
SELECT DISTINCT id, unnest(sets) AS set
FROM training_dataset
@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
""",
"""
INSERT INTO training_datasetset (id, dataset_id, name)
- SELECT uuid_generate_v4(), sets.dataset_id, sets.set
+ SELECT gen_random_uuid(), sets.dataset_id, sets.set
FROM (
SELECT DISTINCT dataset_id, set
FROM training_datasetelement
--
GitLab