[Checkins] SVN: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/ removed useless primary_key parameter support

[Andreas Jung]

Log message for revision 74846:
  removed useless primary_key parameter support
  

Changed:
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/model.py

-=-
Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt	2007-04-26 23:21:42 UTC (rev 74845)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/CHANGES.txt	2007-04-27 05:13:08 UTC (rev 74846)
@@ -1,5 +1,8 @@
 0.1.10  (unreleased)
 
+   - removed the 'primary_key' parameter introduced in 0.1.9 because
+     we don't need. It can be defined within the model using a
+     PrimaryKeyConstraint()
 
 0.1.9 (26.04.2007)
 

Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2007-04-26 23:21:42 UTC (rev 74845)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2007-04-27 05:13:08 UTC (rev 74846)
@@ -37,7 +37,7 @@
     def __init__(self, metadata):
         self.metadata = metadata
 
-    def __call__(self, table, properties={}, cls=None, primary_key=None):
+    def __call__(self, table, properties={}, cls=None):
         """ Returns a tuple (mapped_class, table_class).
             'table' - sqlalchemy.Table to be mapped
 
@@ -54,8 +54,7 @@
 
         mapper(newCls, 
                table, 
-               properties=properties, 
-               primary_key=primary_key)
+               properties=properties) 
         return newCls
 
 

Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/model.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/model.py	2007-04-26 23:21:42 UTC (rev 74845)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/model.py	2007-04-27 05:13:08 UTC (rev 74846)
@@ -35,7 +35,7 @@
             self.add(**d)
 
 
-    def add(self, name, table=None, mapper_class=None, relations=None, autodetect_relations=False, table_name=None, primary_key=None):
+    def add(self, name, table=None, mapper_class=None, relations=None, autodetect_relations=False, table_name=None):
         """ 'name'  -- name of table (no schema support so far!)
 
             'table' -- a sqlalchemy.Table instance (None, for autoloading)
@@ -51,9 +51,6 @@
 
             'table_name' -- optional full name of a table (e.g. 'someschema.sometable') if
             you want to use 'name' as alias for the table.
-
-            'primary_key' -- a sequence of strings used as primary keys for a mapper
-            (basically necessary when auto-loading a view as Table())
         """
 
         if table is not None and not isinstance(table, sqlalchemy.Table):
@@ -78,7 +75,6 @@
                       'mapper_class' : mapper_class,
                       'autodetect_relations' : autodetect_relations,
                       'table_name' : table_name,
-                      'primary_key' : primary_key,
                      }