New model for group/nodes relation to implement rights

doc/database/pod-upgrade-0.4.0_to_0.5.0.sql

@@ -0,0 +1,11 @@
+ALTER TABLE pod_group ADD COLUMN personnal_group BOOLEAN;
+
+CREATE TABLE pod_group_node (
+    group_id INTEGER NOT NULL,
+    node_id INTEGER NOT NULL,
+    rights INTEGER,
+    CONSTRAINT pod_group_node_pkey PRIMARY KEY (group_id, node_id),
+    CONSTRAINT pod_group_node_group_id_fkey FOREIGN KEY (group_id)
+    REFERENCES pod_group (group_id) MATCH SIMPLE
+    ON UPDATE CASCADE ON DELETE CASCADE
+);

pboard/pboard/model/auth.py

@@ -14,7 +14,7 @@ from hashlib import sha256
 __all__ = ['User', 'Group', 'Permission']
 
 from sqlalchemy import Table, ForeignKey, Column
-from sqlalchemy.types import Unicode, Integer, DateTime
+from sqlalchemy.types import Unicode, Integer, DateTime, Boolean
 from sqlalchemy.orm import relation, synonym
 
 from pboard.model import DeclarativeBase, metadata, DBSession
@@ -52,7 +52,9 @@ class Group(DeclarativeBase):
     group_name = Column(Unicode(16), unique=True, nullable=False)
     display_name = Column(Unicode(255))
     created = Column(DateTime, default=datetime.now)
+    personnal_group = Column(Boolean)
     users = relation('User', secondary=user_group_table, backref='groups')
+    rights = relation('Rights', secondary=group_node_table, backref='groups')
 
     def __repr__(self):
         return '<Group: name=%s>' % repr(self.group_name)

pboard/pboard/model/data.py

@@ -207,6 +207,7 @@ class PBNode(DeclarativeBase):
 
 
   _oParent = relationship('PBNode', remote_side=[node_id], backref='_lAllChildren')
+  rights = relation('Rights', secondary=group_node_table, backref='nodes')
 
   def getChildrenOfType(self, plNodeTypeList, poKeySortingMethod=None, pbDoReverseSorting=False):
     """return all children nodes of type 'data' or 'node' or 'folder'"""
@@ -413,3 +414,11 @@ mapper(
                     ) 
 """
 
+# This is the association table for the many-to-many relationship between groups and nodes
+group_node_table = Table('pod_group_node', metadata,
+        Column('group_id', Integer, ForeignKey('pod_group.group_id',
+            onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
+        Column('node_id', Integer, ForeignKey('pod_nodes.node_id',
+            onupdate="CASCADE", ondelete="CASCADE"), primary_key=True),
+        Column('rights', Integer)
+)