Skip to content

Commit 67d789d

Browse files
committed
Minor changes discussed in review
1 parent ec6d4a2 commit 67d789d

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

Diff for: graphene_sqlalchemy/converter.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from graphene.types.json import JSONString
99

1010
from .fields import createConnectionField
11+
from .registry import get_global_registry
1112

1213
try:
1314
from sqlalchemy_utils import ChoiceType, JSONType, ScalarListType, TSVectorType
@@ -64,8 +65,6 @@ def convert_sqlalchemy_composite(composite, registry):
6465

6566
def _register_composite_class(cls, registry=None):
6667
if registry is None:
67-
from .registry import get_global_registry
68-
6968
registry = get_global_registry()
7069

7170
def inner(fn):
@@ -148,7 +147,6 @@ def convert_column_to_float(type, column, registry=None):
148147
@convert_sqlalchemy_type.register(types.Enum)
149148
def convert_enum_to_enum(type, column, registry=None):
150149
if registry is None:
151-
from .registry import get_global_registry
152150
registry = get_global_registry()
153151
graphene_type = registry.get_type_for_enum(type)
154152
return Field(graphene_type,

Diff for: graphene_sqlalchemy/tests/test_query.py

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def test_should_query_well(session):
5858
setup_fixtures(session)
5959

6060
class PetType(SQLAlchemyObjectType):
61-
6261
class Meta:
6362
model = Pet
6463

Diff for: graphene_sqlalchemy/tests/test_utils.py

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def resolve_x(self, info):
3232
def test_to_type_name():
3333
assert to_type_name("make_camel_case") == "MakeCamelCase"
3434
assert to_type_name("AlreadyCamelCase") == "AlreadyCamelCase"
35+
assert to_type_name("A_Snake_and_a_Camel") == "ASnakeAndACamel"
3536

3637

3738
def test_to_enum_value_name():

Diff for: graphene_sqlalchemy/utils.py

-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ def create_sort_enum_for_model(
106106
name = cls.__name__ + "SortEnum"
107107
if registry is None:
108108
from .registry import get_global_registry
109-
110109
registry = get_global_registry()
111110
members = OrderedDict()
112111
default_sort = []
@@ -137,7 +136,6 @@ def get_sort_enum_for_model(cls, registry=None):
137136
"""
138137
if registry is None:
139138
from .registry import get_global_registry
140-
141139
registry = get_global_registry()
142140
sort_params = registry.get_sort_params_for_model(cls)
143141
if not sort_params:
@@ -169,7 +167,6 @@ def get_sort_argument_for_model(cls, has_default=True, registry=None):
169167
"""
170168
if registry is None:
171169
from .registry import get_global_registry
172-
173170
registry = get_global_registry()
174171
sort_params = registry.get_sort_params_for_model(cls)
175172
if not sort_params:

0 commit comments

Comments
 (0)