Kaynağa Gözat

use pod_ prefixed tables in the database

damien 11 yıl önce
ebeveyn
işleme
92bfe8df8d
2 değiştirilmiş dosya ile 17 ekleme ve 27 silme
  1. 9 9
      pboard/pboard/model/auth.py
  2. 8 18
      pboard/pboard/model/data.py

+ 9 - 9
pboard/pboard/model/auth.py Dosyayı Görüntüle

21
 
21
 
22
 # This is the association table for the many-to-many relationship between
22
 # This is the association table for the many-to-many relationship between
23
 # groups and permissions.
23
 # groups and permissions.
24
-group_permission_table = Table('tg_group_permission', metadata,
25
-    Column('group_id', Integer, ForeignKey('tg_group.group_id',
24
+group_permission_table = Table('pod_group_permission', metadata,
25
+    Column('group_id', Integer, ForeignKey('pod_group.group_id',
26
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
26
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
27
-    Column('permission_id', Integer, ForeignKey('tg_permission.permission_id',
27
+    Column('permission_id', Integer, ForeignKey('pod_permission.permission_id',
28
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
28
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
29
 )
29
 )
30
 
30
 
31
 # This is the association table for the many-to-many relationship between
31
 # This is the association table for the many-to-many relationship between
32
 # groups and members - this is, the memberships.
32
 # groups and members - this is, the memberships.
33
-user_group_table = Table('tg_user_group', metadata,
34
-    Column('user_id', Integer, ForeignKey('tg_user.user_id',
33
+user_group_table = Table('pod_user_group', metadata,
34
+    Column('user_id', Integer, ForeignKey('pod_user.user_id',
35
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
35
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
36
-    Column('group_id', Integer, ForeignKey('tg_group.group_id',
36
+    Column('group_id', Integer, ForeignKey('pod_group.group_id',
37
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
37
         onupdate="CASCADE", ondelete="CASCADE"), primary_key=True)
38
 )
38
 )
39
 
39
 
46
 
46
 
47
     """
47
     """
48
 
48
 
49
-    __tablename__ = 'tg_group'
49
+    __tablename__ = 'pod_group'
50
 
50
 
51
     group_id = Column(Integer, autoincrement=True, primary_key=True)
51
     group_id = Column(Integer, autoincrement=True, primary_key=True)
52
     group_name = Column(Unicode(16), unique=True, nullable=False)
52
     group_name = Column(Unicode(16), unique=True, nullable=False)
73
     least the ``email_address`` column.
73
     least the ``email_address`` column.
74
 
74
 
75
     """
75
     """
76
-    __tablename__ = 'tg_user'
76
+    __tablename__ = 'pod_user'
77
 
77
 
78
     user_id = Column(Integer, autoincrement=True, primary_key=True)
78
     user_id = Column(Integer, autoincrement=True, primary_key=True)
79
     email_address = Column(Unicode(255), unique=True, nullable=False)
79
     email_address = Column(Unicode(255), unique=True, nullable=False)
160
 
160
 
161
     """
161
     """
162
 
162
 
163
-    __tablename__ = 'tg_permission'
163
+    __tablename__ = 'pod_permission'
164
 
164
 
165
 
165
 
166
     permission_id = Column(Integer, autoincrement=True, primary_key=True)
166
     permission_id = Column(Integer, autoincrement=True, primary_key=True)

+ 8 - 18
pboard/pboard/model/data.py Dosyayı Görüntüle

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
-"""
3
-
4
-Search activity on the dashboard:
5
-select node_id, node_type, created_at as last_action, data_label, 'new data' as label from pb_nodes where updated_at=created_at
6
-union
7
-select node_id, node_type, updated_at as last_action, data_label, 'updated data' as label from pb_nodes where updated_at>created_at
8
-union
9
-select node_id, node_type, data_datetime as last_action, data_label, 'event' as label from pb_nodes where node_type='event'
10
-order by last_action desc
11
 
2
 
12
-"""
13
 import os
3
 import os
14
 import re
4
 import re
15
 import datetime as datetimeroot
5
 import datetime as datetimeroot
28
 
18
 
29
 # This is the association table for the many-to-many relationship between
19
 # This is the association table for the many-to-many relationship between
30
 # groups and permissions.
20
 # groups and permissions.
31
-"""pb_node_table = Table('pb_nodes', metadata,
32
-    Column('node_id', Integer, Sequence('pb_nodes__node_id__sequence'), primary_key=True),
33
-    Column('parent_id', Integer, ForeignKey('pb_nodes.node_id'), nullable=True, default=None),
21
+"""pod_node_table = Table('pod_nodes', metadata,
22
+    Column('node_id', Integer, Sequence('pod_nodes__node_id__sequence'), primary_key=True),
23
+    Column('parent_id', Integer, ForeignKey('pod_nodes.node_id'), nullable=True, default=None),
34
     Column('node_order', Integer, nullable=True, default=1),
24
     Column('node_order', Integer, nullable=True, default=1),
35
     Column('node_type',   Unicode(16), unique=False, nullable=False, default=u'data'),
25
     Column('node_type',   Unicode(16), unique=False, nullable=False, default=u'data'),
36
     Column('node_status', Unicode(16), unique=False, nullable=False, default=u'new'),
26
     Column('node_status', Unicode(16), unique=False, nullable=False, default=u'new'),
165
   def getStaticChildNb(self):
155
   def getStaticChildNb(self):
166
     return len(self._lStaticChildList)
156
     return len(self._lStaticChildList)
167
 
157
 
168
-  __tablename__ = 'pb_nodes'
169
-  node_id          = Column(Integer, Sequence('pb_nodes__node_id__sequence'), primary_key=True)
170
-  parent_id        = Column(Integer, ForeignKey('pb_nodes.node_id'), nullable=True, default=None)
158
+  __tablename__ = 'pod_nodes'
159
+  node_id          = Column(Integer, Sequence('pod_nodes__node_id__sequence'), primary_key=True)
160
+  parent_id        = Column(Integer, ForeignKey('pod_nodes.node_id'), nullable=True, default=None)
171
   node_depth       = Column(Integer, unique=False, nullable=False, default=0)
161
   node_depth       = Column(Integer, unique=False, nullable=False, default=0)
172
   parent_tree_path = Column(Unicode(255), unique=False, nullable=False, default=u'')
162
   parent_tree_path = Column(Unicode(255), unique=False, nullable=False, default=u'')
173
-  owner_id         = Column(Integer, ForeignKey('tg_user.user_id'), nullable=True, default=None)
163
+  owner_id         = Column(Integer, ForeignKey('pod_user.user_id'), nullable=True, default=None)
174
 
164
 
175
   node_order  = Column(Integer, nullable=True, default=1)
165
   node_order  = Column(Integer, nullable=True, default=1)
176
   node_type   = Column(Unicode(16), unique=False, nullable=False, default=u'data')
166
   node_type   = Column(Unicode(16), unique=False, nullable=False, default=u'data')
329
 """from sqlalchemy.orm import mapper
319
 """from sqlalchemy.orm import mapper
330
 mapper(
320
 mapper(
331
   PBNode,
321
   PBNode,
332
-  pb_node_table,
322
+  pod_node_table,
333
   properties = {'_lAllChildren' : relationship(PBNode, backref=backref('_oParent', remote_side=PBNode.parent_id)) }
323
   properties = {'_lAllChildren' : relationship(PBNode, backref=backref('_oParent', remote_side=PBNode.parent_id)) }
334
 )"""
324
 )"""
335
 
325