Changeset 585
- Timestamp:
- 09/14/07 15:31:06 (1 year ago)
- Files:
-
- tags/release_1.0beta3/lib/jelix/dao/jDaoParser.class.php (modified) (2 diffs)
- tags/release_1.0beta3/lib/jelix/dao/jDaoParser.class.php (modified) (2 diffs)
- tags/release_1.0beta3/testapp/modules/jelix_tests/tests/jdao.parser.html.php (modified) (1 diff)
- tags/release_1.0beta3/testapp/modules/jelix_tests/tests/jdao.parser.html.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tags/release_1.0beta3/lib/jelix/dao/jDaoParser.class.php
r583 r585 270 270 * constructor. 271 271 */ 272 function __construct ($ params, $def){272 function __construct ($aParams, $def){ 273 273 $needed = array('name', 'fieldname', 'table', 'datatype', 'required', 'minlength', 274 'maxlength', 'regexp', 'sequence' , 'updatemotif', 'insertmotif', 'selectmotif', 'updatepattern', 'insertpattern', 'selectpattern');275 276 $params = $def->getAttr($ params, $needed);274 'maxlength', 'regexp', 'sequence'); 275 276 $params = $def->getAttr($aParams, $needed); 277 277 278 278 if ($params['name']===null){ … … 333 333 // *motif attributes are deprecated since 1.0b3 334 334 // TODO: remove support of *motif attributes in jelix 1.0 335 $this->updatePattern= $params['updatemotif']!==null ? $params['updatemotif'] :'%s'; 336 $this->insertPattern= $params['insertmotif']!==null ? $params['insertmotif'] :'%s'; 337 $this->selectPattern= $params['selectmotif']!==null ? $params['selectmotif'] :'%s'; 338 $this->updatePattern= $params['updatepattern']!==null ? $params['updatepattern'] :$this->updatePattern; 339 $this->insertPattern= $params['insertpattern']!==null ? $params['insertpattern'] :$this->insertPattern; 340 $this->selectPattern= $params['selectpattern']!==null ? $params['selectpattern'] :$this->selectPattern; 335 336 if(isset($aParams['updatepattern'])) { 337 $this->updatePattern=(string)$aParams['updatepattern']; 338 }elseif(isset($aParams['updatemotif'])){ 339 $this->updatePattern=(string)$aParams['updatemotif']; 340 } 341 342 if(isset($aParams['insertpattern'])) { 343 $this->insertPattern=(string)$aParams['insertpattern']; 344 }elseif(isset($aParams['insertmotif'])){ 345 $this->insertPattern=(string)$aParams['insertmotif']; 346 } 347 348 if(isset($aParams['selectpattern'])) { 349 $this->selectPattern=(string)$aParams['selectpattern']; 350 }elseif(isset($aParams['selectmotif'])){ 351 $this->selectPattern=(string)$aParams['selectmotif']; 352 } 341 353 } 342 354 tags/release_1.0beta3/lib/jelix/dao/jDaoParser.class.php
r583 r585 270 270 * constructor. 271 271 */ 272 function __construct ($ params, $def){272 function __construct ($aParams, $def){ 273 273 $needed = array('name', 'fieldname', 'table', 'datatype', 'required', 'minlength', 274 'maxlength', 'regexp', 'sequence' , 'updatemotif', 'insertmotif', 'selectmotif', 'updatepattern', 'insertpattern', 'selectpattern');275 276 $params = $def->getAttr($ params, $needed);274 'maxlength', 'regexp', 'sequence'); 275 276 $params = $def->getAttr($aParams, $needed); 277 277 278 278 if ($params['name']===null){ … … 333 333 // *motif attributes are deprecated since 1.0b3 334 334 // TODO: remove support of *motif attributes in jelix 1.0 335 $this->updatePattern= $params['updatemotif']!==null ? $params['updatemotif'] :'%s'; 336 $this->insertPattern= $params['insertmotif']!==null ? $params['insertmotif'] :'%s'; 337 $this->selectPattern= $params['selectmotif']!==null ? $params['selectmotif'] :'%s'; 338 $this->updatePattern= $params['updatepattern']!==null ? $params['updatepattern'] :$this->updatePattern; 339 $this->insertPattern= $params['insertpattern']!==null ? $params['insertpattern'] :$this->insertPattern; 340 $this->selectPattern= $params['selectpattern']!==null ? $params['selectpattern'] :$this->selectPattern; 335 336 if(isset($aParams['updatepattern'])) { 337 $this->updatePattern=(string)$aParams['updatepattern']; 338 }elseif(isset($aParams['updatemotif'])){ 339 $this->updatePattern=(string)$aParams['updatemotif']; 340 } 341 342 if(isset($aParams['insertpattern'])) { 343 $this->insertPattern=(string)$aParams['insertpattern']; 344 }elseif(isset($aParams['insertmotif'])){ 345 $this->insertPattern=(string)$aParams['insertmotif']; 346 } 347 348 if(isset($aParams['selectpattern'])) { 349 $this->selectPattern=(string)$aParams['selectpattern']; 350 }elseif(isset($aParams['selectmotif'])){ 351 $this->selectPattern=(string)$aParams['selectmotif']; 352 } 341 353 } 342 354 tags/release_1.0beta3/testapp/modules/jelix_tests/tests/jdao.parser.html.php
r576 r585 390 390 </object>' 391 391 ), 392 392 array( '<?xml version="1.0"?> 393 <property name="label" datatype="string" selectpattern="%s" insertpattern="" updatepattern=""/>', 394 '<?xml version="1.0"?> 395 <object> 396 <string p="name" value="label"/> 397 <string p="fieldName" value="label"/> 398 <string p="table" value="news"/> 399 <string p="datatype" value="string"/> 400 <null p="regExp"/> 401 <boolean p="required" value="false"/> 402 <boolean p="requiredInConditions" value="false"/> 403 <boolean p="isPK" value="false" /> 404 <boolean p="isFK" value="false" /> 405 <string p="updatePattern" value="" /> 406 <string p="insertPattern" value="" /> 407 <string p="selectPattern" value="%s" /> 408 <string p="sequenceName" value="" /> 409 <null p="maxlength"/> 410 <null p="minlength"/> 411 <boolean p="ofPrimaryTable" value="true" /> 412 </object>' 413 ), 414 415 array( '<?xml version="1.0"?> 416 <property name="label" datatype="string" selectpattern="CASE WHEN LENGTH(password) = 0 THEN 1 ELSE 0 END" insertpattern="" updatepattern=""/>', 417 '<?xml version="1.0"?> 418 <object> 419 <string p="name" value="label"/> 420 <string p="fieldName" value="label"/> 421 <string p="table" value="news"/> 422 <string p="datatype" value="string"/> 423 <null p="regExp"/> 424 <boolean p="required" value="false"/> 425 <boolean p="requiredInConditions" value="false"/> 426 <boolean p="isPK" value="false" /> 427 <boolean p="isFK" value="false" /> 428 <string p="updatePattern" value="" /> 429 <string p="insertPattern" value="" /> 430 <string p="selectPattern" value="CASE WHEN LENGTH(password) = 0 THEN 1 ELSE 0 END" /> 431 <string p="sequenceName" value="" /> 432 <null p="maxlength"/> 433 <null p="minlength"/> 434 <boolean p="ofPrimaryTable" value="true" /> 435 </object>' 436 ), 393 437 ); 394 438 tags/release_1.0beta3/testapp/modules/jelix_tests/tests/jdao.parser.html.php
r576 r585 390 390 </object>' 391 391 ), 392 392 array( '<?xml version="1.0"?> 393 <property name="label" datatype="string" selectpattern="%s" insertpattern="" updatepattern=""/>', 394 '<?xml version="1.0"?> 395 <object> 396 <string p="name" value="label"/> 397 <string p="fieldName" value="label"/> 398 <string p="table" value="news"/> 399 <string p="datatype" value="string"/> 400 <null p="regExp"/> 401 <boolean p="required" value="false"/> 402 <boolean p="requiredInConditions" value="false"/> 403 <boolean p="isPK" value="false" /> 404 <boolean p="isFK" value="false" /> 405 <string p="updatePattern" value="" /> 406 <string p="insertPattern" value="" /> 407 <string p="selectPattern" value="%s" /> 408 <string p="sequenceName" value="" /> 409 <null p="maxlength"/> 410 <null p="minlength"/> 411 <boolean p="ofPrimaryTable" value="true" /> 412 </object>' 413 ), 414 415 array( '<?xml version="1.0"?> 416 <property name="label" datatype="string" selectpattern="CASE WHEN LENGTH(password) = 0 THEN 1 ELSE 0 END" insertpattern="" updatepattern=""/>', 417 '<?xml version="1.0"?> 418 <object> 419 <string p="name" value="label"/> 420 <string p="fieldName" value="label"/> 421 <string p="table" value="news"/> 422 <string p="datatype" value="string"/> 423 <null p="regExp"/> 424 <boolean p="required" value="false"/> 425 <boolean p="requiredInConditions" value="false"/> 426 <boolean p="isPK" value="false" /> 427 <boolean p="isFK" value="false" /> 428 <string p="updatePattern" value="" /> 429 <string p="insertPattern" value="" /> 430 <string p="selectPattern" value="CASE WHEN LENGTH(password) = 0 THEN 1 ELSE 0 END" /> 431 <string p="sequenceName" value="" /> 432 <null p="maxlength"/> 433 <null p="minlength"/> 434 <boolean p="ofPrimaryTable" value="true" /> 435 </object>' 436 ), 393 437 ); 394 438
