Skip to content

Commit

Permalink
Merge pull request #2601 from stevepiercy/1.7-branch
Browse files Browse the repository at this point in the history
revert column type change in alchemy scaffold and related docs
  • Loading branch information
stevepiercy committed May 23, 2016
1 parent 9cd1d15 commit f7236f8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
Expand Up @@ -12,7 +12,7 @@ class MyModel(Base):
__tablename__ = 'models'
id = Column(Integer, primary_key=True)
name = Column(Text)
value = Column(Text)
value = Column(Integer)
# End Sphinx Include


Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/wiki2/installation.rst
Expand Up @@ -440,7 +440,7 @@ The output to your console should be something like this:
CREATE TABLE models (
id INTEGER NOT NULL,
name TEXT,
value TEXT,
value INTEGER,
CONSTRAINT pk_models PRIMARY KEY (id)
)
Expand Down
Expand Up @@ -12,7 +12,7 @@ class MyModel(Base):
__tablename__ = 'models'
id = Column(Integer, primary_key=True)
name = Column(Text)
value = Column(Text)
value = Column(Integer)


Index('my_index', MyModel.name, unique=True, mysql_length=255)
Expand Up @@ -12,7 +12,7 @@ class MyModel(Base):
__tablename__ = 'models'
id = Column(Integer, primary_key=True)
name = Column(Text)
value = Column(Text)
value = Column(Integer)


Index('my_index', MyModel.name, unique=True, mysql_length=255)
2 changes: 1 addition & 1 deletion pyramid/scaffolds/alchemy/+package+/models/mymodel.py
Expand Up @@ -12,7 +12,7 @@ class MyModel(Base):
__tablename__ = 'models'
id = Column(Integer, primary_key=True)
name = Column(Text)
value = Column(Text)
value = Column(Integer)


Index('my_index', MyModel.name, unique=True, mysql_length=255)

0 comments on commit f7236f8

Please sign in to comment.