Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jslvtr committed Oct 16, 2022
2 parents 98bd15f + a408f34 commit 3ada848
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
```

Let's also add this class to `models/__init__.py` so it can then be imported by `app.py`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)
2 changes: 1 addition & 1 deletion project/using-flask-restful/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)

def json(self):
return {
Expand Down
2 changes: 1 addition & 1 deletion project/using-flask-restx/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)

def json(self):
return {
Expand Down
2 changes: 1 addition & 1 deletion project/using-flask-smorest/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class UserModel(db.Model):

id = db.Column(db.Integer, primary_key=True)
username = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), unique=True, nullable=False)
password = db.Column(db.String(80), nullable=False)

def json(self):
return {
Expand Down

1 comment on commit 3ada848

@vercel
Copy link

@vercel vercel bot commented on 3ada848 Oct 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.