summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-05-23 13:24:22 -0700
committerSteve Piercy <web@stevepiercy.com>2016-05-23 13:26:12 -0700
commitf7236f8300cf38e7930a93f16a05e9ea132bad0f (patch)
treeef674c176ab29b9dede8a8fa70c3a18a26edde44 /docs
parent9cd1d152c450592f29264dfdc137c8015437e1aa (diff)
downloadpyramid-f7236f8300cf38e7930a93f16a05e9ea132bad0f.tar.gz
pyramid-f7236f8300cf38e7930a93f16a05e9ea132bad0f.tar.bz2
pyramid-f7236f8300cf38e7930a93f16a05e9ea132bad0f.zip
Merge pull request #2601 from stevepiercy/1.7-branch
revert column type change in alchemy scaffold and related docs
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py2
-rw-r--r--docs/tutorials/wiki2/installation.rst2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/models/mymodel.py2
-rw-r--r--docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py b/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
index cdb748fc7..eb645bfe6 100644
--- a/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
+++ b/docs/quick_tour/sqla_demo/sqla_demo/models/mymodel.py
@@ -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
diff --git a/docs/tutorials/wiki2/installation.rst b/docs/tutorials/wiki2/installation.rst
index 0ecb6e27b..a214b1306 100644
--- a/docs/tutorials/wiki2/installation.rst
+++ b/docs/tutorials/wiki2/installation.rst
@@ -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)
)
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/models/mymodel.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/models/mymodel.py
index 1d2abaf25..d65a01a42 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/models/mymodel.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/models/mymodel.py
@@ -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)
diff --git a/docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py b/docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py
index 1d2abaf25..d65a01a42 100644
--- a/docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py
+++ b/docs/tutorials/wiki2/src/installation/tutorial/models/mymodel.py
@@ -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)