spinta 0.2.dev29__tar.gz → 1.1.0__tar.gz

{spinta-0.2.dev29 → spinta-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spinta
-Version: 0.2.dev29
+Version: 1.1.0
 Summary: A platform for describing, extracting, transforming, loading and serving open data.
 License: MIT
 License-File: LICENSE
@@ -43,6 +43,7 @@ Requires-Dist: docutils (>=0.21.2,<0.22.0)
 Requires-Dist: fsspec
 Requires-Dist: gunicorn ; extra == "http" or extra == "all"
 Requires-Dist: jinja2
+Requires-Dist: joserfc (>=1.6.0)
 Requires-Dist: jsonpatch
 Requires-Dist: lark-parser
 Requires-Dist: lxml
@@ -58,7 +59,6 @@ Requires-Dist: pprintpp
 Requires-Dist: psutil
 Requires-Dist: psycopg2-binary
 Requires-Dist: pydantic
-Requires-Dist: pymongo (<=4.8.0)
 Requires-Dist: pyproj (==3.6.1) ; python_version < "3.13"
 Requires-Dist: pyproj (>=3.7.0) ; python_version >= "3.13"
 Requires-Dist: python-multipart
@@ -71,7 +71,7 @@ Requires-Dist: setuptools
 Requires-Dist: setuptools-scm
 Requires-Dist: sqlalchemy (>=1.4,<1.5)
 Requires-Dist: sqlalchemy-utils (<=0.41.2)
-Requires-Dist: sqlean-py (<=3.49.1)
+Requires-Dist: sqlean-py (>=3.50.4.5)
 Requires-Dist: sqlparse
 Requires-Dist: starlette (>=1.3.1,<2.0.0)
 Requires-Dist: tabulate
@@ -155,7 +155,7 @@ Features
 - Simple 15 column table format for describing data structures (you can use
   any spreadsheet software to manage metadata of your data)
 
-- Internal data storage with pluggable backends (PostgreSQL or Mongo)
+- Internal data storage with pluggable backends (PostgreSQL)
 
 - Build-in async API server built on top of Starlette_ for data publishing
 

{spinta-0.2.dev29 → spinta-1.1.0}/README.rst

@@ -63,7 +63,7 @@ Features
 - Simple 15 column table format for describing data structures (you can use
   any spreadsheet software to manage metadata of your data)
 
-- Internal data storage with pluggable backends (PostgreSQL or Mongo)
+- Internal data storage with pluggable backends (PostgreSQL)
 
 - Build-in async API server built on top of Starlette_ for data publishing
 

{spinta-0.2.dev29 → spinta-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spinta"
-version = "0.2dev29"
+version = "1.1.0"
 description = "A platform for describing, extracting, transforming, loading and serving open data."
 authors = ["Mantas Zimnickas <sirexas@gmail.com>"]
 license = "MIT"
@@ -40,6 +40,7 @@ aiofiles = "*"
 # https://github.com/atviriduomenys/spinta/issues/675
 # 0.x -> 1.x upgrade changed their implementation API, so we can no longer support 0.x.
 authlib = ">=1.0.0"
+joserfc = ">=1.6.0"
 nh3 = "*"
 markdown = "*"
 jinja2 = "*"
@@ -87,10 +88,6 @@ sqlalchemy = "~1.4"
 # https://github.com/kvesteri/sqlalchemy-utils/issues/791
 sqlalchemy-utils = "<=0.41.2"
 
-# Mongo backend dependendencies
-# https://github.com/atviriduomenys/spinta/issues/806
-pymongo = "<=4.8.0"
-
 # Excel dependencies
 xlrd = "*"
 
@@ -112,8 +109,9 @@ psutil = "*"
 tabulate = "*"
 pyproj = [{version = ">=3.7.0", python = ">=3.13"}, {version = "3.6.1", python = "<3.13"}]
 xmltodict = "*"
-# Error when trying to install >=3.50
-sqlean-py = "<=3.49.1"
+# >=3.50.4.5 provides wheels for CPython 3.10-3.14 (older releases fail to
+# build from source on 3.14).
+sqlean-py = ">=3.50.4.5"
 cachetools = "*"
 docutils = "^0.21.2"
 zeep = "^4.3.1"

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/auth.py

@@ -18,8 +18,6 @@ from typing import Any, List, Literal, Set, Tuple, Type, TypedDict, Union
 
 import requests
 import ruamel.yaml
-from authlib.jose import JsonWebKey, JWTClaims, RSAKey, jwt
-from authlib.jose.errors import BadSignatureError, DecodeError, InvalidTokenError, JoseError
 from authlib.oauth2 import OAuth2Error, OAuth2Request, rfc6749, rfc6750
 from authlib.oauth2.rfc6749 import OAuth2Payload, grants, list_to_scope
 from authlib.oauth2.rfc6749.errors import InvalidClientError
@@ -29,6 +27,9 @@ from cachetools import LRUCache, cached
 from cachetools.keys import hashkey
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
+from joserfc import jwt
+from joserfc.errors import BadSignatureError, DecodeError, InvalidTokenError, JoseError
+from joserfc.jwk import RSAKey, import_key
 from multipledispatch import dispatch
 from requests import RequestException
 from starlette.datastructures import FormData, Headers, QueryParams
@@ -79,6 +80,11 @@ DEFAULT_CLIENT_ID_CACHE_SIZE_LIMIT = 1
 DEFAULT_CREDENTIALS_SECTION = "default"
 DEPRECATED_SCOPE_PREFIX = "spinta_"
 
+# joserfc requires an explicit allow-list of signing algorithms (unlike the
+# deprecated authlib.jose, it rejects non-recommended algorithms such as RS512
+# by default). These match the key types supported by decode_kty_from_alg.
+ALLOWED_JWT_ALGORITHMS = ["RS256", "RS384", "RS512", "ES256", "ES384", "ES512"]
+
 # Scope types taken from authlib.oauth2.rfc6749.util.scope_to_list
 SCOPE_TYPE = Union[tuple, list, set, str, None]
 Kid = str  # key id
@@ -195,9 +201,9 @@ def load_all_public_keys(context: Context) -> list[RSAKey]:
         local_public_keys: list[RSAKey] = []
         if "keys" in token_validation_key:
             for key in token_validation_key["keys"]:
-                local_public_keys.append(JsonWebKey.import_key(key))
+                local_public_keys.append(import_key(key))
         else:
-            local_public_keys = [JsonWebKey.import_key(token_validation_key)]
+            local_public_keys = [import_key(token_validation_key)]
         return local_public_keys
     elif token_validation_keys_download_url:
         return load_downloaded_public_keys(context)
@@ -215,7 +221,7 @@ def load_downloaded_public_keys(context: Context) -> list[RSAKey]:
         return []
 
     with config.downloaded_public_keys_file.open() as f:
-        return [JsonWebKey.import_key(key) for key in json.load(f)["keys"]]
+        return [import_key(key) for key in json.load(f)["keys"]]
 
 
 def download_and_store_public_keys(context: Context) -> JWKS | None:
@@ -258,26 +264,26 @@ class BearerTokenValidator(rfc6750.BearerTokenValidator):
         self._default_public_key: RSAKey = load_key(context, KeyType.public)
         self._all_public_keys: list[RSAKey] = load_all_public_keys(context)
 
-    def decode_token(self, token_string: str) -> JWTClaims:
+    def decode_token(self, token_string: str) -> dict:
         if not token_string:
             raise InvalidToken("Token string is required")
 
         try:
             token_header = decode_unverified_header(token_string)
-            if kid := token_header.get("key"):
+            if kid := (token_header.get("kid") or token_header.get("key")):
                 for key in self._all_public_keys:
                     if key.kid and str(key.kid) == str(kid):
-                        return jwt.decode(token_string, key)
+                        return jwt.decode(token_string, key, algorithms=ALLOWED_JWT_ALGORITHMS).claims
 
             token_kty = decode_kty_from_alg(token_header["alg"])
             for key in self._all_public_keys:
-                is_not_encryption_key = key.tokens.get("use") != "enc"
-                key_algorithm = key.tokens.get("alg")
+                is_not_encryption_key = key.get("use") != "enc"
+                key_algorithm = key.get("alg")
                 is_same_algorithm = key_algorithm and token_header["alg"] == key_algorithm
-                is_same_algorithm_type = key.kty and key.kty == token_kty
+                is_same_algorithm_type = key.key_type and key.key_type == token_kty
                 if is_not_encryption_key and (is_same_algorithm or is_same_algorithm_type):
                     try:
-                        return jwt.decode(token_string, key)
+                        return jwt.decode(token_string, key, algorithms=ALLOWED_JWT_ALGORITHMS).claims
                     except BadSignatureError:
                         continue
         except (JoseError, DecodeError, InvalidTokenError) as e:
@@ -713,7 +719,7 @@ def load_key(context: Context, key_type: KeyType, *, required: bool = True) -> R
         else:
             return None
 
-    return JsonWebKey.import_key(key)
+    return import_key(key)
 
 
 def create_client_access_token(context: Context, client: Union[str, Client]):
@@ -754,7 +760,7 @@ def create_access_token(
         "scope": scopes,
         "jti": jti,
     }
-    return jwt.encode(header, payload, private_key).decode("ascii")
+    return jwt.encode(header, payload, private_key, algorithms=ALLOWED_JWT_ALGORITHMS)
 
 
 def get_client_file_path(path: pathlib.Path, client: str) -> pathlib.Path:
@@ -948,13 +954,13 @@ def gen_auth_server_keys(
         public_key = private_key.public_key()
 
         with files[0].open("w") as f:
-            result = JsonWebKey.import_key(private_key, {"kty": "RSA"})
-            json.dump(result.as_dict(is_private=True), f, indent=4, ensure_ascii=False)
+            result = RSAKey.import_key(private_key, {"kty": "RSA"})
+            json.dump(result.as_dict(private=True), f, indent=4, ensure_ascii=False)
         os.chmod(files[0], OWNER_READABLE_FILE)
 
         with files[1].open("w") as f:
-            result = JsonWebKey.import_key(public_key, {"kty": "RSA"})
-            json.dump(result.as_dict(), f, indent=4, ensure_ascii=False)
+            result = RSAKey.import_key(public_key, {"kty": "RSA"})
+            json.dump(result.as_dict(private=False), f, indent=4, ensure_ascii=False)
         os.chmod(files[1], WORLD_READABLE_FILE)
 
     return files

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/helpers.py

@@ -376,7 +376,7 @@ class TableIdentifier:
     base_name: str
     table_type: TableType = dataclasses.field(default=TableType.MAIN)
     table_arg: str | None = dataclasses.field(default=None)
-    default_pg_schema: str | None = dataclasses.field(default=None)
+    default_pg_schema: str | None = dataclasses.field(default=None, compare=False)
 
     logical_name: str = dataclasses.field(init=False, compare=False)
     # Name with namespace connected with '/', like it is used with Model class
@@ -427,6 +427,9 @@ class TableIdentifier:
             return dataclasses.replace(self, table_arg=f"__{self.table_arg}")
         return self
 
+    def __lt__(self, other: "TableIdentifier") -> bool:
+        return self.logical_qualified_name < other.logical_qualified_name
+
 
 @dispatch(str)
 def get_table_identifier(item: str, **kwargs) -> TableIdentifier:

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/migrate.py

@@ -1,11 +1,24 @@
+from copy import deepcopy
+
 import sqlalchemy as sa
 from sqlalchemy.engine.reflection import Inspector
 
 from spinta import commands
 from spinta.backends.postgresql.commands.migrate.constants import EXCLUDED_MODELS
 from spinta.backends.postgresql.components import PostgreSQL
-from spinta.backends.postgresql.helpers.migrate.actions import MigrationHandler
+from spinta.backends.postgresql.helpers.migrate.actions import (
+    MigrationHandler,
+    UndistributeSchema,
+)
 from spinta.backends.postgresql.helpers.migrate.cast import CastMatrix
+from spinta.backends.postgresql.helpers.migrate.citus import (
+    ShardingPlan,
+    create_sharding_plan,
+    distribute_all,
+    gather_current_sharding_plan,
+    invalidate_default_schema_distributions,
+    undistribute_all,
+)
 from spinta.backends.postgresql.helpers.migrate.migrate import (
     ModelTables,
     PostgresqlMigrationContext,
@@ -21,6 +34,7 @@ from spinta.backends.postgresql.helpers.name import (
     PG_NAMING_CONVENTION,
 )
 from spinta.cli.helpers.migrate import MigrationConfig
+from spinta.cli.helpers.upgrade.scripts.backends.postgresql.comments import migrate_comments
 from spinta.commands import create_exception
 from spinta.components import Context, Model
 from spinta.datasets.inspect.helpers import zipitems
@@ -81,6 +95,30 @@ def migrate(context: Context, manifest: Manifest, backend: PostgreSQL, migration
 
     sorted_models = sort_models_by_ref_and_base(list(models.values()))
     sorted_models_mapping = {model.model_type(): model for model in sorted_models}
+    allowed_old_namespaces = list(
+        set(
+            model_table.main_table.schema
+            for model_table in tables.values()
+            if model_table.main_table is not None and model_table.main_table.schema
+        )
+    )
+    sharding_plan = create_sharding_plan(context, sorted_models).get(backend.name, ShardingPlan())
+    sharding_plan = invalidate_default_schema_distributions(context, backend, sharding_plan)
+    current_sharding_plan = gather_current_sharding_plan(context, schemas=allowed_old_namespaces).get(
+        backend.name, ShardingPlan()
+    )
+    undistribute_plan = current_sharding_plan - sharding_plan
+    requires_undistribute = not undistribute_plan.empty()
+
+    distribute_plan = sharding_plan - current_sharding_plan
+    migration_ctx.distribute_plan = distribute_plan
+    migration_ctx.undistribute_plan = undistribute_plan
+
+    # Undistribute schemas first (always)
+    for schema in deepcopy(sorted(undistribute_plan.schemas)):
+        handler.add_action(UndistributeSchema(schema_name=schema))
+        undistribute_plan.schemas.discard(schema)
+
     # Do reverse zip, to ensure that sorted models get selected first
     zipped_names = zipitems(sorted_models_mapping.keys(), tables.keys(), name_key)
     for zipped_name in zipped_names:
@@ -93,6 +131,9 @@ def migrate(context: Context, manifest: Manifest, backend: PostgreSQL, migration
                 model_tables = tables[model_tables_name]
             commands.migrate(context, backend, migration_ctx, model_tables, model)
 
+    undistribute_all(context, backend, undistribute_plan, handler)
+    distribute_all(context, backend, distribute_plan, handler)
+
     try:
         # Handle autocommit migrations differently
         if migration_config.autocommit:
@@ -135,7 +176,8 @@ def migrate(context: Context, manifest: Manifest, backend: PostgreSQL, migration
         except Exception:
             trx.rollback()
             raise
-
+        if requires_undistribute and not migration_config.plan:
+            migrate_comments(context, manifest=manifest, verbose=False)
     except sa.exc.OperationalError as error:
         exception = create_exception(manifest, error)
         raise exception
@@ -164,6 +206,14 @@ def _filter_models_and_tables(
 ) -> tuple[dict[str, Model], dict[str, ModelTables]]:
     # tables = []
 
+    remapped_tables = {}
+    for name, table in model_tables.items():
+        table_identifier = rename.to_new_table(name)
+        table_name = table_identifier.logical_qualified_name
+        if table_name not in models.keys():
+            table_name = name
+        remapped_tables[table_name] = table
+
     # Filter if only specific dataset can be changed
     if filtered_datasets:
         filtered_models = {}
@@ -173,18 +223,10 @@ def _filter_models_and_tables(
         models = filtered_models
 
         filtered_names = {}
-        for table_name in model_tables:
+        for table_name in remapped_tables:
             for dataset_name in filtered_datasets:
                 if part_of_dataset(table_name, dataset_name):
-                    filtered_names[table_name] = model_tables[table_name]
-        model_tables = filtered_names
-
-    remapped_tables = {}
-    for name, table in model_tables.items():
-        table_identifier = rename.to_new_table(name)
-        table_name = table_identifier.logical_qualified_name
-        if table_name not in models.keys():
-            table_name = name
-        remapped_tables[table_name] = table
+                    filtered_names[table_name] = remapped_tables[table_name]
+        remapped_tables = filtered_names
 
     return models, remapped_tables

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/model.py

@@ -21,6 +21,7 @@ from spinta.backends.postgresql.helpers.migrate.migrate import (
     filter_related_tables,
     gather_prepare_columns,
     get_prop_names,
+    handle_ordered_distribution_strategies,
     revalidate_table_identifier,
     update_primary_key,
     zip_and_migrate_properties,
@@ -169,6 +170,10 @@ def migrate(
         handler=handler,
         model_context=model_ctx,
     )
+    handle_ordered_distribution_strategies(
+        migration_ctx=migration_ctx,
+        table_identifier=target_table_identifier,
+    )
 
 
 @commands.migrate.register(Context, PostgreSQL, PostgresqlMigrationContext, NotAvailable, Model)
@@ -180,10 +185,9 @@ def migrate(
     new: Model,
     **kwargs,
 ):
-    handler = migration_ctx.handler
     related_tables = filter_related_tables(new, backend.tables)
     for table in related_tables.values():
-        create_table_migration(table=table, handler=handler)
+        create_table_migration(migration_ctx=migration_ctx, table=table)
 
 
 @commands.migrate.register(Context, PostgreSQL, PostgresqlMigrationContext, ModelTables, NotAvailable)
@@ -361,7 +365,6 @@ def _clean_up_old_constraints(
             model_context.mark_foreign_constraint_handled(constrained_table, constraint)
             handler.add_action(
                 ma.DropConstraintMigrationAction(table_identifier=table_identifier, constraint_name=constraint),
-                foreign_key=True,
             )
 
         for index, state in constraint_states.index.items():
@@ -492,7 +495,6 @@ def _handle_model_foreign_key_constraints(
                     ma.DropConstraintMigrationAction(
                         table_identifier=target_table_identifier, constraint_name=id_constraint["name"]
                     ),
-                    True,
                 )
                 handler.add_action(
                     ma.CreateForeignKeyMigrationAction(
@@ -502,7 +504,6 @@ def _handle_model_foreign_key_constraints(
                         local_cols=["_id"],
                         remote_cols=["_id"],
                     ),
-                    True,
                 )
                 return
 
@@ -528,7 +529,6 @@ def _handle_model_foreign_key_constraints(
                 ma.DropConstraintMigrationAction(
                     table_identifier=target_table_identifier, constraint_name=id_constraint["name"]
                 ),
-                True,
             )
             handler.add_action(
                 ma.CreateForeignKeyMigrationAction(
@@ -538,7 +538,6 @@ def _handle_model_foreign_key_constraints(
                     local_cols=["_id"],
                     remote_cols=["_id"],
                 ),
-                True,
             )
             return
 
@@ -551,7 +550,6 @@ def _handle_model_foreign_key_constraints(
                 local_cols=["_id"],
                 remote_cols=["_id"],
             ),
-            True,
         )
 
 
@@ -600,7 +598,7 @@ def _handle_changelog_migration(
     changelog_table = model_tables.reserved.get(TableType.CHANGELOG)
     target_table = backend.get_table(model, TableType.CHANGELOG)
     if changelog_table is None:
-        create_table_migration(table=target_table, handler=handler)
+        create_table_migration(migration_ctx=migration_context, table=target_table)
     else:
         old_table_identifier = migration_context.get_table_identifier(changelog_table)
         new_table_identifier = migration_context.get_table_identifier(model, TableType.CHANGELOG)
@@ -629,6 +627,7 @@ def _handle_changelog_migration(
             handler=handler,
             inspector=inspector,
         )
+        handle_ordered_distribution_strategies(migration_context, new_table_identifier)
 
 
 def _handle_redirect_migration(
@@ -643,7 +642,7 @@ def _handle_redirect_migration(
     redirect_table = model_tables.reserved.get(TableType.REDIRECT)
     target_table = backend.get_table(model, TableType.REDIRECT)
     if redirect_table is None:
-        create_table_migration(table=target_table, handler=handler)
+        create_table_migration(migration_ctx=migration_context, table=target_table)
     else:
         old_table_identifier = migration_context.get_table_identifier(redirect_table)
         new_table_identifier = migration_context.get_table_identifier(model, TableType.REDIRECT)
@@ -664,6 +663,7 @@ def _handle_redirect_migration(
             handler=handler,
             inspector=inspector,
         )
+        handle_ordered_distribution_strategies(migration_context, new_table_identifier)
 
 
 def _generic_reserved_table_constraint_flag(

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/types/array.py

@@ -11,6 +11,7 @@ from spinta.backends.postgresql.helpers.migrate.migrate import (
     create_table_migration,
     gather_prepare_columns,
     get_source_table,
+    handle_ordered_distribution_strategies,
     index_not_handled_condition,
     index_with_columns,
     update_primary_key,
@@ -50,7 +51,7 @@ def migrate(
     array_table = backend.get_table(new.prop, TableType.LIST)
     array_table_identifier = migration_ctx.get_table_identifier(new.prop, TableType.LIST)
     if not inspector.has_table(array_table_identifier.pg_table_name, schema=array_table_identifier.pg_schema_name):
-        create_table_migration(array_table, handler=handler, table_identifier=array_table_identifier)
+        create_table_migration(migration_ctx=migration_ctx, table=array_table, table_identifier=array_table_identifier)
 
 
 @commands.migrate.register(Context, PostgreSQL, PostgresqlMigrationContext, PropertyMigrationContext, sa.Column, Array)
@@ -199,3 +200,4 @@ def migrate(
         new.items,
         **kwargs,
     )
+    handle_ordered_distribution_strategies(migration_ctx, target_array_identifier)

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/types/datatype.py

@@ -109,7 +109,6 @@ def migrate(
     property_ctx: PropertyMigrationContext,
     old: sa.Column,
     new: sa.Column,
-    foreign_key: bool = False,
     **kwargs,
 ):
     inspector = migration_ctx.inspector
@@ -153,7 +152,6 @@ def migrate(
                 comment=new.comment if new.comment != old.comment else False,
                 using=using,
             ),
-            foreign_key,
         )
 
     is_renamed = name_changed(
@@ -169,7 +167,6 @@ def migrate(
         new_column=new,
         handler=handler,
         inspector=inspector,
-        foreign_key=foreign_key,
         renamed=is_renamed,
         model_context=property_ctx.model_context,
     )
@@ -180,7 +177,6 @@ def migrate(
         new_column=new,
         handler=handler,
         inspector=inspector,
-        foreign_key=foreign_key,
         renamed=is_renamed,
         model_context=property_ctx.model_context,
     )
@@ -196,7 +192,6 @@ def migrate(
     property_ctx: PropertyMigrationContext,
     old: NotAvailable,
     new: sa.Column,
-    foreign_key: bool = False,
     **kwargs,
 ):
     inspector = migration_ctx.inspector
@@ -211,7 +206,6 @@ def migrate(
             table_identifier=target_table_identifier,
             column=new,
         ),
-        foreign_key,
     )
 
     new_column_name = new.name
@@ -299,7 +293,6 @@ def migrate(
     node_ctx: PropertyMigrationContext | ModelMigrationContext,
     old: sa.Column,
     new: NotAvailable,
-    foreign_key: bool = False,
     **kwargs,
 ):
     model_ctx = node_ctx
@@ -327,7 +320,7 @@ def migrate(
 
     if any(remove_name == column["name"] for column in columns):
         handler.add_action(
-            ma.DropColumnMigrationAction(table_identifier=target_table_identifier, column_name=remove_name), foreign_key
+            ma.DropColumnMigrationAction(table_identifier=target_table_identifier, column_name=remove_name)
         )
     handler.add_action(
         ma.AlterColumnMigrationAction(
@@ -336,7 +329,6 @@ def migrate(
             new_column_name=remove_name,
             comment=get_removed_name(old.comment or old.name),
         ),
-        foreign_key,
     )
     indexes = inspector.get_indexes(table_name=source_table_name, schema=source_table.schema)
     for index in indexes:
@@ -347,7 +339,6 @@ def migrate(
                     table_identifier=target_table_identifier,
                     index_name=index["name"],
                 ),
-                foreign_key,
             )
     if old.unique:
         unique_constraints = inspector.get_unique_constraints(table_name=source_table_name, schema=source_table.schema)
@@ -359,7 +350,6 @@ def migrate(
                         table_identifier=target_table_identifier,
                         constraint_name=constraint["name"],
                     ),
-                    foreign_key,
                 )
 
 
@@ -373,8 +363,7 @@ def migrate(
     property_ctx: PropertyMigrationContext,
     old: NotAvailable,
     new: List[sa.Column],
-    foreign_key: bool = False,
     **kwargs,
 ):
     for column in new:
-        commands.migrate(context, backend, migration_ctx, property_ctx, old, column, foreign_key=foreign_key, **kwargs)
+        commands.migrate(context, backend, migration_ctx, property_ctx, old, column, **kwargs)

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/types/file.py

@@ -11,6 +11,7 @@ from spinta.backends.postgresql.helpers.migrate.migrate import (
     gather_prepare_columns,
     get_root_attr,
     get_source_table,
+    handle_ordered_distribution_strategies,
     update_primary_key,
 )
 from spinta.backends.postgresql.helpers.name import name_changed
@@ -44,7 +45,11 @@ def migrate(
         handler.add_action(ma.AddColumnMigrationAction(table_identifier=target_file_identifier, column=column))
 
     if not inspector.has_table(target_file_identifier.pg_table_name, schema=target_file_identifier.pg_schema_name):
-        create_table_migration(target_file_table, handler, table_identifier=target_file_identifier)
+        create_table_migration(
+            migration_ctx=migration_ctx,
+            table=target_file_table,
+            table_identifier=target_file_identifier,
+        )
 
 
 @commands.migrate.register(Context, PostgreSQL, PostgresqlMigrationContext, PropertyMigrationContext, list, File)
@@ -111,3 +116,4 @@ def migrate(
             target_table_identifier=target_file_identifier,
             handler=handler,
         )
+    handle_ordered_distribution_strategies(migration_ctx, target_file_table)

{spinta-0.2.dev29 → spinta-1.1.0}/spinta/backends/postgresql/commands/migrate/types/ref.py

@@ -204,7 +204,6 @@ def _migrate_scalar_to_ref_4(
             ref_column=ref_column,
             columns={key: column},
         ),
-        True,
     )
 
     # Drop old column after migration
@@ -287,7 +286,6 @@ def _migrate_scalar_to_ref_3(
             columns={ref_column.name: sa.Column(target, type_=ref_column.type)},
             target=target,
         ),
-        True,
     )
 
     # Drop old column after migration
@@ -418,7 +416,6 @@ def migrate(
                         ref_column=primary_column,
                         columns=column_mapping,
                     ),
-                    True,
                 )
 
                 # Drop old columns
@@ -491,7 +488,6 @@ def _handle_property_foreign_key_constraint(
                     old_constraint_name=constraint["name"],
                     new_constraint_name=foreign_key_name,
                 ),
-                foreign_key=True,
             )
             return
 
@@ -503,7 +499,6 @@ def _handle_property_foreign_key_constraint(
                 local_cols=[primary_column.name],
                 remote_cols=[_IDENTIFIABLE_REF_KEY],
             ),
-            foreign_key=True,
         )
         return
 
@@ -518,7 +513,6 @@ def _handle_property_foreign_key_constraint(
             ma.DropConstraintMigrationAction(
                 table_identifier=target_table_identifier, constraint_name=constraint["name"]
             ),
-            foreign_key=True,
         )
         handler.add_action(
             ma.CreateForeignKeyMigrationAction(
@@ -528,7 +522,6 @@ def _handle_property_foreign_key_constraint(
                 local_cols=[primary_column.name],
                 remote_cols=[_IDENTIFIABLE_REF_KEY],
             ),
-            foreign_key=True,
         )
 
 
@@ -625,7 +618,6 @@ def migrate(
                         columns=column_mapping,
                         target=_IDENTIFIABLE_REF_KEY,
                     ),
-                    True,
                 )
 
                 # Drop old column