Changeset 600

Timestamp:

09/29/07 21:53:53 (1 year ago)

Author:

laurentj

Message:

ticket #193: removed support of *motif attribute in jDao

Files:

• trunk/lib/jelix-scripts/templates/dao.xml.tpl (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/dao.xml.tpl (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl (modified) (1 diff)
• trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl (modified) (1 diff)
• trunk/lib/jelix/dao/jDaoParser.class.php (modified) (1 diff)
• trunk/lib/jelix/dao/jDaoParser.class.php (modified) (1 diff)

trunk/lib/jelix-scripts/templates/dao.xml.tpl

@@ -14 +14 @@
-        maxlength="" minlength="" regexp=""
-        sequence=""
-motif="" insertmotif="" selectmotif
+pattern="" insertpattern="" selectpattern
-    />-->
-    </record>

trunk/lib/jelix-scripts/templates/dao.xml.tpl

@@ -14 +14 @@
-        maxlength="" minlength="" regexp=""
-        sequence=""
-motif="" insertmotif="" selectmotif
+pattern="" insertpattern="" selectpattern
-    />-->
-    </record>

trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl

@@ -9 +9 @@
-        maxlength="" minlength="" regexp=""
-        sequence=""
-motif="" insertmotif="" selectmotif
+pattern="" insertpattern="" selectpattern
-    />-->
-    </record>

trunk/lib/jelix-scripts/templates/dao_empty.xml.tpl

@@ -9 +9 @@
-        maxlength="" minlength="" regexp=""
-        sequence=""
-motif="" insertmotif="" selectmotif
+pattern="" insertpattern="" selectpattern
-    />-->
-    </record>

trunk/lib/jelix/dao/jDaoParser.class.php

@@ -331 +331 @@
-        // on ignore les attributs *pattern sur les champs PK et FK
-        if(!$this->isPK && !$this->isFK){
-            // *motif attributes are deprecated since  1.0b3
-            // TODO: remove support of *motif attributes in jelix 1.0
-
-            if(isset($aParams['updatepattern'])) {
-                $this->updatePattern=(string)$aParams['updatepattern'];
-            }elseif(isset($aParams['updatemotif'])){
-                $this->updatePattern=(string)$aParams['updatemotif'];
-            }
-
-            if(isset($aParams['insertpattern'])) {
-                $this->insertPattern=(string)$aParams['insertpattern'];
-            }elseif(isset($aParams['insertmotif'])){
-                $this->insertPattern=(string)$aParams['insertmotif'];
-            }
-
-            if(isset($aParams['selectpattern'])) {
-                $this->selectPattern=(string)$aParams['selectpattern'];
-            }elseif(isset($aParams['selectmotif'])){
-                $this->selectPattern=(string)$aParams['selectmotif'];
-            }
-        }

trunk/lib/jelix/dao/jDaoParser.class.php

@@ -331 +331 @@
-        // on ignore les attributs *pattern sur les champs PK et FK
-        if(!$this->isPK && !$this->isFK){
-            // *motif attributes are deprecated since  1.0b3
-            // TODO: remove support of *motif attributes in jelix 1.0
-
-            if(isset($aParams['updatepattern'])) {
-                $this->updatePattern=(string)$aParams['updatepattern'];
-            }elseif(isset($aParams['updatemotif'])){
-                $this->updatePattern=(string)$aParams['updatemotif'];
-            }
-
-            if(isset($aParams['insertpattern'])) {
-                $this->insertPattern=(string)$aParams['insertpattern'];
-            }elseif(isset($aParams['insertmotif'])){
-                $this->insertPattern=(string)$aParams['insertmotif'];
-            }
-
-            if(isset($aParams['selectpattern'])) {
-                $this->selectPattern=(string)$aParams['selectpattern'];
-            }elseif(isset($aParams['selectmotif'])){
-                $this->selectPattern=(string)$aParams['selectmotif'];
-            }
-        }