r5930 - in trunk: gnue-appserver/samples gnue-appserver/src/gcd gnue-common/src/datasources/drivers/interbase/Schema/Creation gnue-common/src/schema/scripter

[johannes]

Author: johannes
Date: 2004-06-23 08:35:36 -0500 (Wed, 23 Jun 2004)
New Revision: 5930

Modified:
   trunk/gnue-appserver/samples/sample.gsd
   trunk/gnue-appserver/src/gcd/gcd2sql.py
   
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py
   trunk/gnue-common/src/schema/scripter/Scripter.py
Log:
Use the proper passwords. Sample data now has their <definition> tags back, so
datatype conversion works as intended.


Modified: trunk/gnue-appserver/samples/sample.gsd
===================================================================
--- trunk/gnue-appserver/samples/sample.gsd     2004-06-23 12:03:54 UTC (rev 
5929)
+++ trunk/gnue-appserver/samples/sample.gsd     2004-06-23 13:35:36 UTC (rev 
5930)
@@ -3,6 +3,12 @@
         version="1.0">
   <data>
     <tabledata name="sample_accounts" tablename="gnue_useraccess">
+      <defintion>
+        <column field="gnue_id" type="string(32)"/>
+        <column field="gnue_username" type="string(20)"/>
+        <column field="gnue_password" type="string(70)"/>
+        <column field="gnue_accesslist" type="string(100)"/>
+      </defintion>
       <rows>
         <row>
           <value field="gnue_id" 
key="Y">00000000000000000000001000000001</value>
@@ -1223,6 +1229,18 @@
       </rows>
     </tabledata>
     <tabledata name="sample_persons" tablename="address_person">
+      <definition>
+        <column field="gnue_id" type="string(32)"/>
+        <column field="address_name" type="string(35)"/>
+        <column field="address_zip" type="string(35)"/>
+        <column field="address_country" type="string(32)"/>
+        <column field="address_children" type="number(2)"/>
+        <column field="address_born" type="datetime"/>
+        <column field="address_meettime" type="time"/>
+        <column field="address_lastmeeting" type="datetime"/>
+        <column field="address_human" type="boolean"/>
+        <column field="address_weight" type="number(4,1)"/>
+      </definition>
       <rows>
         <row>
           <value field="gnue_id" 
key="Y">00000000000000000000000000001100</value>

Modified: trunk/gnue-appserver/src/gcd/gcd2sql.py
===================================================================
--- trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-06-23 12:03:54 UTC (rev 
5929)
+++ trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-06-23 13:35:36 UTC (rev 
5930)
@@ -359,7 +359,7 @@
     connection = self.connections.getConnection (self.OPTIONS ['connection'])
 
     connection.parameters ['username'] = self.OPTIONS ['username'] or "gnue"
-    connection.parameters ['password'] = self.OPTIONS ['password'] or ""
+    connection.parameters ['password'] = self.OPTIONS ['password'] or "gnue"
 
     self.connections.loginToConnection (connection)
 

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py
===================================================================
--- 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py 
    2004-06-23 12:03:54 UTC (rev 5929)
+++ 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py 
    2004-06-23 13:35:36 UTC (rev 5930)
@@ -46,7 +46,7 @@
     """
     dbname   = self.connection.parameters.get ('dbname', None)
     username = self.connection.parameters.get ('username', 'gnue')
-    password = self.connection.parameters.get ('password', None)
+    password = self.connection.parameters.get ('password', 'gnue')
     host     = self.connection.parameters.get ('host', None)
     gsecbin  = self.connection.parameters.get ('gsecbin', 'gsec')
 
@@ -69,9 +69,8 @@
     except:
       pass
 
-    code = u"%s -user sysdba -password %s -add %s" % (gsecbin, syspw, username)
-    if password:
-      code += " -pw %s" % password
+    code = u"%s -user sysdba -password %s -add %s -pw %s" % \
+        (gsecbin, syspw, username, password)
 
     if os.system (code):
       raise gException, ("Cannot create user")

Modified: trunk/gnue-common/src/schema/scripter/Scripter.py
===================================================================
--- trunk/gnue-common/src/schema/scripter/Scripter.py   2004-06-23 12:03:54 UTC 
(rev 5929)
+++ trunk/gnue-common/src/schema/scripter/Scripter.py   2004-06-23 13:35:36 UTC 
(rev 5930)
@@ -199,9 +199,10 @@
     # password to the connection parameters. If the password is not set, it
     # defaults to an empty string.
     username = self.OPTIONS ['username'] or 'gnue'
+    password = self.OPTIONS ['password'] or 'gnue'
 
     self.connection.parameters ['username'] = username
-    self.connection.parameters ['password'] = self.OPTIONS ['password'] or ""
+    self.connection.parameters ['password'] = password