Fixed conflicts.

1 files changed, 23 insertions, 8 deletions

diff --git a/src/web/models/tag.py b/src/web/models/tag.py
index 8d7fe4d4..ab901cda 100644
--- a/src/web/models/tag.py
+++ b/src/web/models/tag.py
@@ -1,22 +1,37 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from sqlalchemy import Column, ForeignKey, Integer, String
-from sqlalchemy.orm import relationship
-
 from bootstrap import db
 
 
-class Tag(db.Model):
-    text = Column(String, primary_key=True, unique=False)
+class ArticleTag(db.Model):
+    text = db.Column(db.String, primary_key=True, unique=False)
+    # user_id = db.Column(db.Integer(), db.ForeignKey('user.id'))
 
     # foreign keys
-    article_id = Column(Integer, ForeignKey('article.id', ondelete='CASCADE'),
+    article_id = db.Column(db.Integer, db.ForeignKey('article.id', ondelete='CASCADE'),
                         primary_key=True)
 
     # relationships
-    article = relationship('Article', back_populates='tag_objs',
-                           foreign_keys=[article_id])
+    article = db.relationship('Article', back_populates='tag_objs',
+                                                    foreign_keys=[article_id])
 
     def __init__(self, text):
         self.text = text
+
+
+class BookmarkTag(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    text = db.Column(db.String, unique=False)
+
+    # foreign keys
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'))
+    bookmark_id = db.Column(db.Integer, db.ForeignKey('bookmark.id', ondelete='CASCADE'))
+
+    # relationships
+    bookmark = db.relationship('Bookmark', back_populates='tags',
+                            cascade="all,delete", foreign_keys=[bookmark_id])
+
+    # def __init__(self, text, user_id):
+    #     self.text = text
+    #     self.user_id = user_id