]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Merge "Add support for identity columns"
authormike bayer <mike_mp@zzzcomputing.com>
Fri, 21 Aug 2020 21:39:40 +0000 (21:39 +0000)
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>
Fri, 21 Aug 2020 21:39:40 +0000 (21:39 +0000)
1  2 
lib/sqlalchemy/dialects/mssql/base.py
lib/sqlalchemy/dialects/postgresql/base.py
lib/sqlalchemy/testing/requirements.py
test/dialect/postgresql/test_compiler.py
test/requirements.py

index ab6e19cf4152a13e166fea50a86d02be4bcfeaef,949bd44df0adfe22840f2b07977270d358a71748..d18fb72990ac2d1ccf68671626ad07d4330985bd
@@@ -716,10 -732,8 +732,11 @@@ import operato
  import re
  
  from . import information_schema as ischema
 +from .json import JSON
 +from .json import JSONIndexType
 +from .json import JSONPathType
  from ... import exc
+ from ... import Identity
  from ... import schema as sa_schema
  from ... import Sequence
  from ... import sql
Simple merge