Skip to content

Py2 SQLAlchemy: Move some TypeEngine functions from subclasses to TypeEngine #724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 4 commits into from
Dec 13, 2016
Merged

Py2 SQLAlchemy: Move some TypeEngine functions from subclasses to TypeEngine #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e90f8bc
Add timezone to SQLAlchemy datetime constructor
TRManderson Nov 30, 2016
5eeee88
Move some TypeEngine functions from subclasses to TypeEngine
Dec 5, 2016
c9ea50b
Add newline in an attempt to make build pass
Dec 5, 2016
cd6e7dd
Remove defunct ellipsis
Dec 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions third_party/2/sqlalchemy/sql/sqltypes.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ class String(TypeEngine, Concatenable):
convert_unicode=False,
unicode_error=None,
_warn_on_bytestring=False): ...
def literal_processor(self, dialect): ...
def bind_processor(self, dialect): ...
def result_processor(self, dialect, coltype): ...
@property
def python_type(self): ...
def get_dbapi_type(self, dbapi): ...

class Text(String): ...
class Unicode(String): ...
Expand All @@ -23,7 +17,8 @@ class SmallInteger(Integer): ...
class BigInteger(Integer): ...
class Numeric(TypeEngine, _DateAffinity): ...
class Float(Numeric): ...
class DateTime(TypeEngine, _DateAffinity): ...
class DateTime(TypeEngine, _DateAffinity):
def __init__(self, timezone=None): ...
class Date(TypeEngine, _DateAffinity): ...
class Time(TypeEngine, _DateAffinity): ...
class _Binary(TypeEngine): ...
Expand Down
9 changes: 8 additions & 1 deletion third_party/2/sqlalchemy/sql/type_api.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
from .. import util
from .visitors import Visitable, VisitableType

class TypeEngine(Visitable): ...
class TypeEngine(Visitable):
@property
def python_type(self): ...
def get_dbapi_type(self, dbapi): ...
def literal_processor(self, dialect): ...
def bind_processor(self, dialect): ...
def result_processor(self, dialect, coltype): ...

class VisitableCheckKWArg(util.EnsureKWArgType, VisitableType): ...
# TODO: class UserDefinedType(util.with_metaclass(VisitableCheckKWArg, TypeEngine)):
class UserDefinedType(VisitableCheckKWArg, TypeEngine): ...
Expand Down