gnue designer/src/schema/parser/GSParser.py des...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/07/29 13:12:52

Modified files:
        designer/src/schema/parser: GSParser.py 
        designer/templates/schema: Introspection.py 
        phpforms/src   : database.inc 

Log message:
        make "name" attribute in a <value> tag not required
        add name to privatekey in Introspection wizard

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/schema/parser/GSParser.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/schema/Introspection.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/phpforms/src/database.inc.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/designer/src/schema/parser/GSParser.py
diff -c gnue/designer/src/schema/parser/GSParser.py:1.6 
gnue/designer/src/schema/parser/GSParser.py:1.7
*** gnue/designer/src/schema/parser/GSParser.py:1.6     Wed Jul 24 11:23:36 2002
--- gnue/designer/src/schema/parser/GSParser.py Mon Jul 29 13:12:51 2002
***************
*** 229,235 ****
           'BaseClass': Objects.GSValue,
           'Attributes': {
              'field':        {
!                'Required': 1,
                 'Typecast': GTypecast.name },
              'type':        {
                 'Required': 0,
--- 229,235 ----
           'BaseClass': Objects.GSValue,
           'Attributes': {
              'field':        {
!                'Required': 0,
                 'Typecast': GTypecast.name },
              'type':        {
                 'Required': 0,
Index: gnue/designer/templates/schema/Introspection.py
diff -c gnue/designer/templates/schema/Introspection.py:1.3 
gnue/designer/templates/schema/Introspection.py:1.4
*** gnue/designer/templates/schema/Introspection.py:1.3 Mon Jul 22 00:09:40 2002
--- gnue/designer/templates/schema/Introspection.py     Mon Jul 29 13:12:51 2002
***************
*** 174,179 ****
--- 174,180 ----
        # Primary keys
        if hasattr(schema,'primarykey') and schema.primarykey:
          pk = self.AddElement ('primarykey', table, {})
+         pk.name='pk_%s' % tablename
          for field in schema.primarykey:
            self.AddElement('pkfield', pk, {'name': field})
  
Index: gnue/phpforms/src/database.inc
diff -c gnue/phpforms/src/database.inc:1.6 gnue/phpforms/src/database.inc:1.7
*** gnue/phpforms/src/database.inc:1.6  Thu Jul 18 04:07:48 2002
--- gnue/phpforms/src/database.inc      Mon Jul 29 13:12:51 2002
***************
*** 184,190 ****
              $sql=$sql." WHERE ".$where;          
          if (isset($order_by))
              $sql=$sql." ORDER BY ".$order_by;
!          print $sql;
          $res=$this->select($sql);
          if (count($res)>0) $r->setCache($res);
          return $r;
--- 184,190 ----
              $sql=$sql." WHERE ".$where;          
          if (isset($order_by))
              $sql=$sql." ORDER BY ".$order_by;
!         DEBUG(3,"DATABASE ADAPTER:EXECUTING SQL ".$sql);
          $res=$this->select($sql);
          if (count($res)>0) $r->setCache($res);
          return $r;