summaryrefslogtreecommitdiff
path: root/docs/tutorials
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-05-21 12:21:23 -0700
committerSteve Piercy <web@stevepiercy.com>2016-05-21 12:21:23 -0700
commit123904c858058bdf6c689557f1038672b5b13de0 (patch)
treeeb769f8284fda422ef5be324d8e1fe3827374af7 /docs/tutorials
parent8a6f759f46da108b24283ed3fae099a0007c5a70 (diff)
parent73589aa29ac9df22d60639d10b46f7052234fea9 (diff)
downloadpyramid-123904c858058bdf6c689557f1038672b5b13de0.tar.gz
pyramid-123904c858058bdf6c689557f1038672b5b13de0.tar.bz2
pyramid-123904c858058bdf6c689557f1038672b5b13de0.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/tutorials')
-rw-r--r--docs/tutorials/wiki2/src/authentication/tutorial/models/page.py2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/models/page.py2
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/models/page.py2
-rw-r--r--docs/tutorials/wiki2/src/tests/tutorial/models/page.py2
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/models/page.py2
5 files changed, 5 insertions, 5 deletions
diff --git a/docs/tutorials/wiki2/src/authentication/tutorial/models/page.py b/docs/tutorials/wiki2/src/authentication/tutorial/models/page.py
index 4dd5b5721..74ff1faf8 100644
--- a/docs/tutorials/wiki2/src/authentication/tutorial/models/page.py
+++ b/docs/tutorials/wiki2/src/authentication/tutorial/models/page.py
@@ -14,7 +14,7 @@ class Page(Base):
__tablename__ = 'pages'
id = Column(Integer, primary_key=True)
name = Column(Text, nullable=False, unique=True)
- data = Column(Integer, nullable=False)
+ data = Column(Text, nullable=False)
creator_id = Column(ForeignKey('users.id'), nullable=False)
creator = relationship('User', backref='created_pages')
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/models/page.py b/docs/tutorials/wiki2/src/authorization/tutorial/models/page.py
index 4dd5b5721..74ff1faf8 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/models/page.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/models/page.py
@@ -14,7 +14,7 @@ class Page(Base):
__tablename__ = 'pages'
id = Column(Integer, primary_key=True)
name = Column(Text, nullable=False, unique=True)
- data = Column(Integer, nullable=False)
+ data = Column(Text, nullable=False)
creator_id = Column(ForeignKey('users.id'), nullable=False)
creator = relationship('User', backref='created_pages')
diff --git a/docs/tutorials/wiki2/src/models/tutorial/models/page.py b/docs/tutorials/wiki2/src/models/tutorial/models/page.py
index 4dd5b5721..74ff1faf8 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/models/page.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/models/page.py
@@ -14,7 +14,7 @@ class Page(Base):
__tablename__ = 'pages'
id = Column(Integer, primary_key=True)
name = Column(Text, nullable=False, unique=True)
- data = Column(Integer, nullable=False)
+ data = Column(Text, nullable=False)
creator_id = Column(ForeignKey('users.id'), nullable=False)
creator = relationship('User', backref='created_pages')
diff --git a/docs/tutorials/wiki2/src/tests/tutorial/models/page.py b/docs/tutorials/wiki2/src/tests/tutorial/models/page.py
index 4dd5b5721..74ff1faf8 100644
--- a/docs/tutorials/wiki2/src/tests/tutorial/models/page.py
+++ b/docs/tutorials/wiki2/src/tests/tutorial/models/page.py
@@ -14,7 +14,7 @@ class Page(Base):
__tablename__ = 'pages'
id = Column(Integer, primary_key=True)
name = Column(Text, nullable=False, unique=True)
- data = Column(Integer, nullable=False)
+ data = Column(Text, nullable=False)
creator_id = Column(ForeignKey('users.id'), nullable=False)
creator = relationship('User', backref='created_pages')
diff --git a/docs/tutorials/wiki2/src/views/tutorial/models/page.py b/docs/tutorials/wiki2/src/views/tutorial/models/page.py
index 4dd5b5721..74ff1faf8 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/models/page.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/models/page.py
@@ -14,7 +14,7 @@ class Page(Base):
__tablename__ = 'pages'
id = Column(Integer, primary_key=True)
name = Column(Text, nullable=False, unique=True)
- data = Column(Integer, nullable=False)
+ data = Column(Text, nullable=False)
creator_id = Column(ForeignKey('users.id'), nullable=False)
creator = relationship('User', backref='created_pages')