From 85ebe01349e0b4314d9e25cacc6701d6fed7b87e Mon Sep 17 00:00:00 2001 From: jakeogh Date: Sat, 27 Jun 2015 18:48:46 +0000 Subject: [PATCH] add NO MINVALUE and NO MAXVALUE support to Sequence() --- lib/sqlalchemy/engine/interfaces.py | 3 ++- lib/sqlalchemy/sql/compiler.py | 4 ++++ lib/sqlalchemy/sql/schema.py | 4 ++-- test/sql/test_defaults.py | 12 ++++++++++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py index 1779f6d486..9a31f05ae0 100644 --- a/lib/sqlalchemy/engine/interfaces.py +++ b/lib/sqlalchemy/engine/interfaces.py @@ -252,7 +252,8 @@ class Dialect(object): sequence a dictionary of the form - {'name' : str, 'start' :int, 'increment': int, 'minvalue': int, 'maxvalue': int} + {'name' : str, 'start' :int, 'increment': int, 'minvalue': int, + 'maxvalue': int, 'nominvalue': bool, 'nomaxvalue': bool} Additional column attributes may be present. """ diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index b3fee60ec0..f7aa021050 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -2303,6 +2303,10 @@ class DDLCompiler(Compiled): text += " MINVALUE %d" % create.element.minvalue if create.element.maxvalue is not None: text += " MAXVALUE %d" % create.element.maxvalue + if create.element.nominvalue is not None: + text += " NO MINVALUE" % create.element.nominvalue + if create.element.nomaxvalue is not None: + text += " NO MAXVALUE" % create.element.nomaxvalue return text def visit_drop_sequence(self, drop): diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index ef84d26808..ccec74a35c 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -2041,8 +2041,8 @@ class Sequence(DefaultGenerator): is_sequence = True def __init__(self, name, start=None, increment=None, minvalue=None, - maxvalue=None, schema=None, optional=False, quote=None, - metadata=None, quote_schema=None, + maxvalue=None, nominvalue=None, nomaxvalue=None, schema=None, + optional=False, quote=None, metadata=None, quote_schema=None, for_update=False): """Construct a :class:`.Sequence` object. diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py index b218aa53f9..53eb6c5001 100644 --- a/test/sql/test_defaults.py +++ b/test/sql/test_defaults.py @@ -804,6 +804,18 @@ class SequenceDDLTest(fixtures.TestBase, testing.AssertsCompiledSQL): "CREATE SEQUENCE foo_seq INCREMENT BY 2 START WITH 0 MAXVALUE 5", ) + self.assert_compile( + CreateSequence(Sequence( + 'foo_seq', increment=2, start=1, nomaxvalue=True)), + "CREATE SEQUENCE foo_seq INCREMENT BY 2 START WITH 0 NO MAXVALUE", + ) + + self.assert_compile( + CreateSequence(Sequence( + 'foo_seq', increment=2, start=0, nominvalue=True)), + "CREATE SEQUENCE foo_seq INCREMENT BY 2 START WITH 0 NO MINVALUE", + ) + self.assert_compile( DropSequence(Sequence('foo_seq')), "DROP SEQUENCE foo_seq", -- 2.47.3