Fix #140: TypeError: sql_flush() got an unexpected keyword argument

Author: r4fek

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 
 language: python
 python:
- - "3.7"
+ - "3.8"
 
 before_script:
  - echo "deb http://www.apache.org/dist/cassandra/debian 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list
@@ -14,10 +14,12 @@ before_script:
 
 env:
  matrix:
- - TOX_ENV=py37-django21
- - TOX_ENV=py37-django22
- - TOX_ENV=py37-django30
- - TOX_ENV=py37-djangomaster
+ - TOX_ENV=django21
+ - TOX_ENV=django22
+ - TOX_ENV=django30
+ - TOX_ENV=django31
+ - TOX_ENV=django32
+ - TOX_ENV=djangomaster
  global:
  - CASS_DRIVER_NO_CYTHON=1
  - CASS_HOST=127.0.0.1
@@ -44,4 +46,4 @@ install:
  - pip3 install tox-travis lz4
 
 script:
- - wait-for-it 127.0.0.1:9042 -- tox -e $TOX_ENV
+ - wait-for-it 127.0.0.1:9042 -t 120 -- tox -e $TOX_ENV

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 ENV PYTHONUNBUFFERED=1
 ENV CASS_HOST=cassandra
 RUN apt-get -y update

django_cassandra_engine/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Do not forget to change version number in mkdocs.yml also!
-__version__ = (1, 6, 1)
+__version__ = (1, 6, 2)
 __author__ = "Rafał Furmański"
 __contact__ = "r.furmanski@gmail.com"
 __homepage__ = "http://github.com/r4fek/django-cassandra-engine"

django_cassandra_engine/base/operations.py

@@ -1,4 +1,5 @@
 from django.db.backends.base.operations import BaseDatabaseOperations
+
 from django_cassandra_engine.utils import get_cassandra_connection
 
 
@@ -29,10 +30,9 @@ def prep_for_iexact_query(self, value):
  """
  return value
 
- def sql_flush(self, style, tables, sequences, allow_cascade=False):
+ def sql_flush(self, style, tables, *args, **kwargs):
  """
  Truncate all existing tables in current keyspace.
-
  :returns: an empty list
  """
 
@@ -44,8 +44,11 @@ def sql_flush(self, style, tables, sequences, allow_cascade=False):
  return cql_list
  return []
 
- def execute_sql_flush(self, using, cql_list):
- for cql in cql_list:
+ def execute_sql_flush(self, *args):
+ # In previous django versions first parameter was `using` and second `sql_list`.
+ # In Django 3.1 only one parameter `sql_list` is present.
+ # One thing is certain though: last parameter is `sql_list`
+ for cql in args[-1]:
  self.connection.connection.execute(cql)
 
  def prepare_sql_script(self, sql):

django_cassandra_engine/models/__init__.py

@@ -1,27 +1,36 @@
-import logging
-import inspect
-import copy
-import warnings
-from operator import attrgetter
-import collections
 from functools import partial
 from itertools import chain
+from operator import attrgetter
+import collections
+import copy
+import inspect
+import logging
+import warnings
 
-import six
-from django.conf import settings
 from django.apps import apps
+from django.conf import settings
 from django.core import validators
-from django.db.models.base import ModelBase
-from django.utils.translation import ugettext_lazy as _
 from django.db.models import options
+from django.db.models.base import ModelBase
+from django.utils.translation import gettext_lazy as _
+import six
 
-from ..compat import (BaseModel, ColumnDescriptor, ModelDefinitionException,
- ModelException, ModelMetaClass, OrderedDict, columns,
- query)
-from .constants import ORDER_BY_WARN, ORDER_BY_ERROR_HELP, PK_META_MISSING_HELP
-from . import django_field_methods
-from . import django_model_methods
-
+from ..compat import (
+ BaseModel,
+ ColumnDescriptor,
+ ModelDefinitionException,
+ ModelException,
+ ModelMetaClass,
+ OrderedDict,
+ columns,
+ query,
+)
+from . import django_field_methods, django_model_methods
+from .constants import (
+ ORDER_BY_ERROR_HELP,
+ ORDER_BY_WARN,
+ PK_META_MISSING_HELP,
+)
 
 log = logging.getLogger(__name__)
 _django_manager_attr_names = ('objects', 'default_manager', '_default_manager',

django_cassandra_engine/models/django_field_methods.py

@@ -3,13 +3,13 @@
 import warnings
 
 from django import forms
-from django.utils.functional import Promise
-from django.utils.text import capfirst
 from django.core import checks, exceptions
-from django.utils.encoding import smart_text
 from django.utils.deprecation import (
  RemovedInNextVersionWarning as RemovedInDjango20Warning,
 )
+from django.utils.encoding import smart_str
+from django.utils.functional import Promise
+from django.utils.text import capfirst
 
 NOT_IMPL_MSG = 'Method not available on Cassandra model fields'
 
@@ -21,7 +21,7 @@ def value_from_object(self, obj):
 
 def value_to_string(self, obj):
  # Taken from django.db.models.fields.__init__
- return smart_text(self.value_from_object(obj))
+ return smart_str(self.value_from_object(obj))
 
 
 def get_attname(self):

django_cassandra_engine/sessions/backends/db.py

@@ -1,16 +1,17 @@
 from datetime import datetime
 import logging
 
+from django.contrib.sessions.backends import db
 from django.contrib.sessions.backends.db import (
- SessionStore as DjangoSessionStore
+ SessionStore as DjangoSessionStore,
 )
 from django.core.exceptions import SuspiciousOperation
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.functional import cached_property
-from django.contrib.sessions.backends import db
 
 # monkey patch for Django versions older than 1.9
 from django_cassandra_engine.sessions.models import Session as CassandraSession
+
 db.Session = CassandraSession
 
 
@@ -52,7 +53,7 @@ def load(self):
  if isinstance(e, SuspiciousOperation):
  logger = logging.getLogger('django.security.%s' %
  e.__class__.__name__)
- logger.warning(force_text(e))
+ logger.warning(force_str(e))
  self.create()
  return {}
 

django_cassandra_engine/utils.py

@@ -1,8 +1,8 @@
 import inspect
 
-import django
 from django.conf import settings
 from django.db import DEFAULT_DB_ALIAS
+import django
 
 from .compat import cqlengine
 
@@ -59,18 +59,13 @@ def get_installed_apps():
  """
  Return list of all installed apps
  """
- if django.VERSION >= (1, 7):
- from django.apps import apps
-
- return [
- a.models_module
- for a in apps.get_app_configs()
- if a.models_module is not None
- ]
- else:
- from django.db import models
-
- return models.get_apps()
+ from django.apps import apps
+
+ return [
+ a.models_module
+ for a in apps.get_app_configs()
+ if a.models_module is not None
+ ]
 
 
 def get_cql_models(app, connection=None, keyspace=None):

requirements.txt

@@ -1,3 +1,3 @@
-cassandra-driver>=3.13
+cassandra-driver>=3.25
 Django>=2.0
 six>=1.6

testproject/app/tests/test_databasewrapper.py

@@ -1,17 +1,17 @@
 from datetime import datetime
 
+from app.models import ExampleModel, ExampleModel2
 from django.core.management import call_command
 from django.core.management.sql import sql_flush
 from mock import Mock
 
-from django_cassandra_engine.test import TestCase
 from django_cassandra_engine.connection import CassandraConnection
+from django_cassandra_engine.test import TestCase
 from django_cassandra_engine.utils import (
+ get_cassandra_connection,
  get_cql_models,
  get_installed_apps,
- get_cassandra_connection,
 )
-from app.models import ExampleModel, ExampleModel2
 
 
 class DatabaseWrapperTestCase(TestCase):
@@ -52,7 +52,6 @@ def test_sql_flush_works(self):
  interactive=False,
  database=self.connection.alias,
  skip_checks=True,
- reset_sequences=False,
  allow_cascade=False,
  inhibit_post_migrate=True,
  )