first commit
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
from .general import * # NOQA
|
||||
from .statistics import * # NOQA
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,90 @@
|
||||
import warnings
|
||||
|
||||
from django.contrib.postgres.fields import ArrayField
|
||||
from django.db.models import Aggregate, BooleanField, JSONField
|
||||
from django.db.models import StringAgg as _StringAgg
|
||||
from django.db.models import Value
|
||||
from django.utils.deprecation import RemovedInDjango70Warning
|
||||
|
||||
from .mixins import _DeprecatedOrdering
|
||||
|
||||
__all__ = [
|
||||
"ArrayAgg",
|
||||
"BitAnd",
|
||||
"BitOr",
|
||||
"BitXor",
|
||||
"BoolAnd",
|
||||
"BoolOr",
|
||||
"JSONBAgg",
|
||||
"StringAgg", # RemovedInDjango70Warning.
|
||||
]
|
||||
|
||||
|
||||
# RemovedInDjango61Warning: When the deprecation ends, replace with:
|
||||
# class ArrayAgg(Aggregate):
|
||||
class ArrayAgg(_DeprecatedOrdering, Aggregate):
|
||||
function = "ARRAY_AGG"
|
||||
allow_distinct = True
|
||||
allow_order_by = True
|
||||
|
||||
@property
|
||||
def output_field(self):
|
||||
return ArrayField(self.source_expressions[0].output_field)
|
||||
|
||||
|
||||
class BitAnd(Aggregate):
|
||||
function = "BIT_AND"
|
||||
|
||||
|
||||
class BitOr(Aggregate):
|
||||
function = "BIT_OR"
|
||||
|
||||
|
||||
class BitXor(Aggregate):
|
||||
function = "BIT_XOR"
|
||||
|
||||
|
||||
class BoolAnd(Aggregate):
|
||||
function = "BOOL_AND"
|
||||
output_field = BooleanField()
|
||||
|
||||
|
||||
class BoolOr(Aggregate):
|
||||
function = "BOOL_OR"
|
||||
output_field = BooleanField()
|
||||
|
||||
|
||||
# RemovedInDjango61Warning: When the deprecation ends, replace with:
|
||||
# class JSONBAgg(Aggregate):
|
||||
class JSONBAgg(_DeprecatedOrdering, Aggregate):
|
||||
function = "JSONB_AGG"
|
||||
allow_distinct = True
|
||||
allow_order_by = True
|
||||
output_field = JSONField()
|
||||
|
||||
|
||||
# RemovedInDjango61Warning: When the deprecation ends, replace with:
|
||||
# class StringAgg(_StringAgg):
|
||||
# RemovedInDjango70Warning: When the deprecation ends, remove completely.
|
||||
class StringAgg(_DeprecatedOrdering, _StringAgg):
|
||||
|
||||
def __init__(self, expression, delimiter, **extra):
|
||||
if isinstance(delimiter, str):
|
||||
warnings.warn(
|
||||
"delimiter: str will be resolved as a field reference instead "
|
||||
"of a string literal on Django 7.0. Pass "
|
||||
f"`delimiter=Value({delimiter!r})` to preserve the previous behavior.",
|
||||
category=RemovedInDjango70Warning,
|
||||
stacklevel=2,
|
||||
)
|
||||
|
||||
delimiter = Value(delimiter)
|
||||
|
||||
warnings.warn(
|
||||
"The PostgreSQL specific StringAgg function is deprecated. Use "
|
||||
"django.db.models.aggregates.StringAgg instead.",
|
||||
category=RemovedInDjango70Warning,
|
||||
stacklevel=2,
|
||||
)
|
||||
|
||||
super().__init__(expression, delimiter, **extra)
|
||||
@@ -0,0 +1,36 @@
|
||||
# RemovedInDjango70Warning: When the deprecation ends, remove completely.
|
||||
import warnings
|
||||
|
||||
from django.utils.deprecation import RemovedInDjango61Warning, RemovedInDjango70Warning
|
||||
|
||||
|
||||
# RemovedInDjango61Warning.
|
||||
class _DeprecatedOrdering:
|
||||
def __init__(self, *expressions, ordering=(), order_by=(), **extra):
|
||||
if ordering:
|
||||
warnings.warn(
|
||||
"The ordering argument is deprecated. Use order_by instead.",
|
||||
category=RemovedInDjango61Warning,
|
||||
stacklevel=2,
|
||||
)
|
||||
if order_by:
|
||||
raise TypeError("Cannot specify both order_by and ordering.")
|
||||
order_by = ordering
|
||||
|
||||
super().__init__(*expressions, order_by=order_by, **extra)
|
||||
|
||||
|
||||
# RemovedInDjango70Warning.
|
||||
# RemovedInDjango61Warning: When the deprecation ends, replace with:
|
||||
# class OrderableAggMixin:
|
||||
class OrderableAggMixin(_DeprecatedOrdering):
|
||||
allow_order_by = True
|
||||
|
||||
def __init_subclass__(cls, /, *args, **kwargs):
|
||||
warnings.warn(
|
||||
"OrderableAggMixin is deprecated. Use Aggregate and allow_order_by "
|
||||
"instead.",
|
||||
category=RemovedInDjango70Warning,
|
||||
stacklevel=1,
|
||||
)
|
||||
super().__init_subclass__(*args, **kwargs)
|
||||
@@ -0,0 +1,75 @@
|
||||
from django.db.models import Aggregate, FloatField, IntegerField
|
||||
|
||||
__all__ = [
|
||||
"CovarPop",
|
||||
"Corr",
|
||||
"RegrAvgX",
|
||||
"RegrAvgY",
|
||||
"RegrCount",
|
||||
"RegrIntercept",
|
||||
"RegrR2",
|
||||
"RegrSlope",
|
||||
"RegrSXX",
|
||||
"RegrSXY",
|
||||
"RegrSYY",
|
||||
"StatAggregate",
|
||||
]
|
||||
|
||||
|
||||
class StatAggregate(Aggregate):
|
||||
output_field = FloatField()
|
||||
|
||||
def __init__(self, y, x, output_field=None, filter=None, default=None):
|
||||
if not x or not y:
|
||||
raise ValueError("Both y and x must be provided.")
|
||||
super().__init__(
|
||||
y, x, output_field=output_field, filter=filter, default=default
|
||||
)
|
||||
|
||||
|
||||
class Corr(StatAggregate):
|
||||
function = "CORR"
|
||||
|
||||
|
||||
class CovarPop(StatAggregate):
|
||||
def __init__(self, y, x, sample=False, filter=None, default=None):
|
||||
self.function = "COVAR_SAMP" if sample else "COVAR_POP"
|
||||
super().__init__(y, x, filter=filter, default=default)
|
||||
|
||||
|
||||
class RegrAvgX(StatAggregate):
|
||||
function = "REGR_AVGX"
|
||||
|
||||
|
||||
class RegrAvgY(StatAggregate):
|
||||
function = "REGR_AVGY"
|
||||
|
||||
|
||||
class RegrCount(StatAggregate):
|
||||
function = "REGR_COUNT"
|
||||
output_field = IntegerField()
|
||||
empty_result_set_value = 0
|
||||
|
||||
|
||||
class RegrIntercept(StatAggregate):
|
||||
function = "REGR_INTERCEPT"
|
||||
|
||||
|
||||
class RegrR2(StatAggregate):
|
||||
function = "REGR_R2"
|
||||
|
||||
|
||||
class RegrSlope(StatAggregate):
|
||||
function = "REGR_SLOPE"
|
||||
|
||||
|
||||
class RegrSXX(StatAggregate):
|
||||
function = "REGR_SXX"
|
||||
|
||||
|
||||
class RegrSXY(StatAggregate):
|
||||
function = "REGR_SXY"
|
||||
|
||||
|
||||
class RegrSYY(StatAggregate):
|
||||
function = "REGR_SYY"
|
||||
Reference in New Issue
Block a user