[Checkins] SVN: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/ added sequence defs to tests, to work with dbs like oracle, renamed dns to url

[Bernd Dorn]

Log message for revision 68107:
  added sequence defs to tests, to work with dbs like oracle, renamed dns to url

Changed:
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/README.txt
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/datamanager.py
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/metadirectives.py
  U   z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt

-=-
Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/README.txt
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/README.txt	2006-05-12 11:20:46 UTC (rev 68106)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/README.txt	2006-05-12 11:57:51 UTC (rev 68107)
@@ -36,7 +36,8 @@
   >>> aTable = sqlalchemy.Table(
   ...     'aTable',
   ...     z3c.zalchemy.metadata,
-  ...     sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True),
+  ...     sqlalchemy.Column('id', sqlalchemy.Integer,
+  ...         sqlalchemy.Sequence('atable_id'), primary_key=True),
   ...     sqlalchemy.Column('value', sqlalchemy.Integer),
   ...     redefine=True,
   ...     )
@@ -122,7 +123,8 @@
   >>> bTable = sqlalchemy.Table(
   ...     'bTable',
   ...     z3c.zalchemy.metadata,
-  ...     sqlalchemy.Column('id', sqlalchemy.Integer, primary_key=True),
+  ...     sqlalchemy.Column('id', sqlalchemy.Integer,
+  ...         sqlalchemy.Sequence('btable_id'), primary_key=True),
   ...     sqlalchemy.Column('value', sqlalchemy.String),
   ...     redefine=True,
   ...     )

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/datamanager.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/datamanager.py	2006-05-12 11:20:46 UTC (rev 68106)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/datamanager.py	2006-05-12 11:57:51 UTC (rev 68107)
@@ -30,9 +30,9 @@
     """
     implements(IAlchemyEngineUtility)
 
-    def __init__(self, name, dns, echo=False, **kwargs):
+    def __init__(self, name, url, echo=False, **kwargs):
         self.name = name
-        self.dns = dns
+        self.url = url
         self.echo = echo
         self.kw={}
         self.kw.update(kwargs)
@@ -46,7 +46,7 @@
         kw = {}
         kw.update(self.kw)
         # create a new engine and store it thread local
-        self.storage.engine = sqlalchemy.create_engine(self.dns,
+        self.storage.engine = sqlalchemy.create_engine(self.url,
                                             echo=self.echo,
                                             **kw)
         return self.storage.engine

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/metadirectives.py
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/metadirectives.py	2006-05-12 11:20:46 UTC (rev 68106)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/metadirectives.py	2006-05-12 11:57:51 UTC (rev 68107)
@@ -19,8 +19,9 @@
 class IEngineDirective(interface.Interface):
     """Define an engine.
     """
-    dns = schema.BytesLine(
-        title = u'RFC RFC-1738 DNS for the database connection',
+    url = schema.URI(
+        title = u'Databse URL',
+        description = u'RFC-1738 compliant URL for the database connection',
         required = True,
         )
     name = schema.Text(

Modified: z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt
===================================================================
--- z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt	2006-05-12 11:20:46 UTC (rev 68106)
+++ z3c.zalchemy/branches/jukart-SA-0.2/src/z3c/zalchemy/tests/TRANSACTION.txt	2006-05-12 11:57:51 UTC (rev 68107)
@@ -22,7 +22,8 @@
   >>> aTable = sqlalchemy.Table(
   ...     'aTable',
   ...     z3c.zalchemy.metadata,
-  ...     sqlalchemy.Column('id', sqlalchemy.Integer, primary_key = True),
+  ...     sqlalchemy.Column('id', sqlalchemy.Integer,
+  ...         sqlalchemy.Sequence('atable_id'), primary_key = True),
   ...     sqlalchemy.Column('value', sqlalchemy.Integer),
   ...     redefine=True,
   ...     )