adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for custom associations in bake 1.2

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3679 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2006-10-15 06:45:13 +00:00
parent 9a4e2c4f48
commit 7554887b1e
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cake/scripts/bake.php
View file

@ -479,9 +479,13 @@ class Bake {
if((strtolower($wannaDoAssoc) == 'y' || strtolower($wannaDoAssoc) == 'yes')) { if((strtolower($wannaDoAssoc) == 'y' || strtolower($wannaDoAssoc) == 'yes')) {
$this->stdout('One moment while I try to detect any associations...'); $this->stdout('One moment while I try to detect any associations...');
$possibleKeys = array();
//Look for belongsTo //Look for belongsTo
$i = 0; $i = 0;
foreach($modelFields as $field) { foreach($modelFields as $field) {
if($field['type'] == 'integer'){
$possibleKeys[] = $field['name'];
}
$offset = strpos($field['name'], '_id'); $offset = strpos($field['name'], '_id');
if($offset !== false) { if($offset !== false) {
$tmpModelName = $this->__modelNameFromKey($field['name']); $tmpModelName = $this->__modelNameFromKey($field['name']);
@ -498,6 +502,9 @@ class Bake {
$modelFieldsTemp = $db->describe($tempOtherModel); $modelFieldsTemp = $db->describe($tempOtherModel);
$j = 0; $j = 0;
foreach($modelFieldsTemp as $field) { foreach($modelFieldsTemp as $field) {
if($field['type'] == 'integer'){
$possibleKeys[] = $field['name'];
}
if($field['name'] == $this->__modelKey($currentModelName)) { if($field['name'] == $this->__modelKey($currentModelName)) {
$tmpModelName = $this->__modelName($otherTable); $tmpModelName = $this->__modelName($otherTable);
$hasOne[$j]['alias'] = $tmpModelName; $hasOne[$j]['alias'] = $tmpModelName;
@ -561,9 +568,6 @@ class Bake {
if($response == 'y') { if($response == 'y') {
$modelAssociations['belongsTo'][$i] = $belongsTo[$i]; $modelAssociations['belongsTo'][$i] = $belongsTo[$i];
$modelAssociations['belongsTo'][$i]['alias'] = $belongsToAlias; $modelAssociations['belongsTo'][$i]['alias'] = $belongsToAlias;
//$modelAssociations['belongsTo'][$i]['className'] = $belongsTo[$i]['className'];
//$modelAssociations['belongsTo'][$i]['foreignKey'] = $belongsTo[$i]['foreignKey'];
} }
} }
} }
@ -588,9 +592,6 @@ class Bake {
if($response == 'y') { if($response == 'y') {
$modelAssociations['hasOne'][$i] = $hasOne[$i]; $modelAssociations['hasOne'][$i] = $hasOne[$i];
$modelAssociations['hasOne'][$i]['alias'] = $hasOneAlias; $modelAssociations['hasOne'][$i]['alias'] = $hasOneAlias;
//$modelAssociations['hasOne'][$i]['className'] = $hasOne[$i]['className'];
//$modelAssociations['hasOne'][$i]['foreignKey'] = $hasOne[$i]['foreignKey'];
} }
} }
} }
@ -615,9 +616,6 @@ class Bake {
if($response == 'y') { if($response == 'y') {
$modelAssociations['hasMany'][$i] = $hasMany[$i]; $modelAssociations['hasMany'][$i] = $hasMany[$i];
$modelAssociations['hasMany'][$i]['alias'] = $hasManyAlias; $modelAssociations['hasMany'][$i]['alias'] = $hasManyAlias;
//$modelAssociations['hasMany'][$i]['className'] = $hasMany[$i]['className'];
//$modelAssociations['hasMany'][$i]['foreignKey'] = $hasMany[$i]['foreignKey'];
} }
} }
} }
@ -642,10 +640,6 @@ class Bake {
if($response == 'y') { if($response == 'y') {
$modelAssociations['hasAndBelongsToMany'][$i] = $hasAndBelongsToMany[$i]; $modelAssociations['hasAndBelongsToMany'][$i] = $hasAndBelongsToMany[$i];
$modelAssociations['hasAndBelongsToMany'][$i]['alias'] = $hasAndBelongsToManyAlias; $modelAssociations['hasAndBelongsToMany'][$i]['alias'] = $hasAndBelongsToManyAlias;
//$modelAssociations['hasAndBelongsToMany'][$i]['className'] = $hasAndBelongsToMany[$i]['className'];
//$modelAssociations['hasAndBelongsToMany'][$i]['foreignKey'] = $hasAndBelongsToMany[$i]['foreignKey'];
//$modelAssociations['hasAndBelongsToMany'][$i]['associationForeignKey'] = $hasAndBelongsToMany[$i]['associationForeignKey'];
//$modelAssociations['hasAndBelongsToMany'][$i]['joinTable'] = $hasAndBelongsToMany[$i]['joinTable'];
} }
} }
} }
@ -671,7 +665,14 @@ class Bake {
} }
$associationName = $this->getInput('What is the name of this association?'); $associationName = $this->getInput('What is the name of this association?');
$className = $this->getInput('What className will '.$associationName.' use?'); $className = $this->getInput('What className will '.$associationName.' use?');
$foreignKey = $this->getInput('What is the foreignKey?', null, $this->__modelKey($associationName)); $this->stdout('A helpful List of possible keys');
for ($i = 0; $i < count($possibleKeys); $i++) {
$this->stdout($i + 1 . ". " . $possibleKeys[$i]);
}
$foreignKey = $this->getInput('What is the foreignKey? Choose a number or specify your own.', null, $this->__modelKey($associationName));
if (intval($foreignKey) > 0 && intval($foreignKey) <= $i ) {
$foreignKey = $possibleKeys[intval($foreignKey) - 1];
}
if($assocType == '4') { if($assocType == '4') {
$associationForeignKey = $this->getInput('What is the associationForeignKey?', null, $this->__modelKey($currentModelName)); $associationForeignKey = $this->getInput('What is the associationForeignKey?', null, $this->__modelKey($currentModelName));
$joinTable = $this->getInput('What is the joinTable?'); $joinTable = $this->getInput('What is the joinTable?');
@ -1726,6 +1727,8 @@ class Bake {
mkdir($unixPath.implode(DS, $build)); mkdir($unixPath.implode(DS, $build));
} }
} }
} else {
return false;
} }
} }
$this->createFile($unixPath.$path.DS.$filename, $out); $this->createFile($unixPath.$path.DS.$filename, $out);