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

Adding fix for #2530, adds support for Oracle to acl cli

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5032 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2007-05-06 03:32:06 +00:00
parent 44f611cba7
commit 6295402bc3
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cake/console/libs/acl.php
View file

@ -253,13 +253,13 @@ class AclScript extends CakeScript {
$sql = " CREATE TABLE ".$db->fullTableName('acos')." ( $sql = " CREATE TABLE ".$db->fullTableName('acos')." (
".$db->name('id')." ".$db->column($db->columns['primary_key']).", ".$db->name('id')." ".$db->column($db->columns['primary_key']).",
".$db->name('parent_id')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('parent_id')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('model')." ".$db->column($db->columns['string'])." NOT NULL default '', ".$db->name('model')." ".$db->column($db->columns['string'])." default '' NOT NULL,
".$db->name('foreign_key')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('foreign_key')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('alias')." ".$db->column($db->columns['string'])." NOT NULL default '', ".$db->name('alias')." ".$db->column($db->columns['string'])." default '' NOT NULL,
".$db->name('lft')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('lft')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('rght')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('rght')." ".$db->column($db->columns['integer'])." default NULL,
PRIMARY KEY (".$db->name('id').") PRIMARY KEY (".$db->name('id').")
);"; )";
if ($db->query($sql) === false) { if ($db->query($sql) === false) {
die("Error: " . $db->lastError() . "\n\n"); die("Error: " . $db->lastError() . "\n\n");
} }
@ -268,13 +268,13 @@ class AclScript extends CakeScript {
$sql2 = "CREATE TABLE ".$db->fullTableName('aros')." ( $sql2 = "CREATE TABLE ".$db->fullTableName('aros')." (
".$db->name('id')." ".$db->column($db->columns['primary_key']).", ".$db->name('id')." ".$db->column($db->columns['primary_key']).",
".$db->name('parent_id')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('parent_id')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('model')." ".$db->column($db->columns['string'])." NOT NULL default '', ".$db->name('model')." ".$db->column($db->columns['string'])." default '' NOT NULL,
".$db->name('foreign_key')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('foreign_key')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('alias')." ".$db->column($db->columns['string'])." NOT NULL default '', ".$db->name('alias')." ".$db->column($db->columns['string'])." default '' NOT NULL,
".$db->name('lft')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('lft')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('rght')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('rght')." ".$db->column($db->columns['integer'])." default NULL,
PRIMARY KEY (".$db->name('id').") PRIMARY KEY (".$db->name('id').")
);"; )";
if ($db->query($sql2) === false) { if ($db->query($sql2) === false) {
die("Error: " . $db->lastError() . "\n\n"); die("Error: " . $db->lastError() . "\n\n");
} }
@ -284,12 +284,12 @@ class AclScript extends CakeScript {
".$db->name('id')." ".$db->column($db->columns['primary_key']).", ".$db->name('id')." ".$db->column($db->columns['primary_key']).",
".$db->name('aro_id')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('aro_id')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('aco_id')." ".$db->column($db->columns['integer'])." default NULL, ".$db->name('aco_id')." ".$db->column($db->columns['integer'])." default NULL,
".$db->name('_create')." ".$db->column($db->columns['integer'])." NOT NULL default '0', ".$db->name('_create')." ".$db->column($db->columns['integer'])." default '0' NOT NULL,
".$db->name('_read')." ".$db->column($db->columns['integer'])." NOT NULL default '0', ".$db->name('_read')." ".$db->column($db->columns['integer'])." default '0' NOT NULL,
".$db->name('_update')." ".$db->column($db->columns['integer'])." NOT NULL default '0', ".$db->name('_update')." ".$db->column($db->columns['integer'])." default '0' NOT NULL,
".$db->name('_delete')." ".$db->column($db->columns['integer'])." NOT NULL default '0', ".$db->name('_delete')." ".$db->column($db->columns['integer'])." default '0' NOT NULL,
PRIMARY KEY (".$db->name('id').") PRIMARY KEY (".$db->name('id').")
);"; )";
if ($db->query($sql3) === false) { if ($db->query($sql3) === false) {
die("Error: " . $db->lastError() . "\n\n"); die("Error: " . $db->lastError() . "\n\n");
} }
@ -418,7 +418,7 @@ class AclScript extends CakeScript {
$driver = ''; $driver = '';
while ($driver == '') { while ($driver == '') {
$driver = $this->in('What database driver would you like to use?', array('mysql','mysqli','mssql','sqlite','postgres', 'odbc'), 'mysql'); $driver = $this->in('What database driver would you like to use?', array('mysql','mysqli','mssql','sqlite','postgres', 'odbc', 'oracle'), 'mysql');
if ($driver == '') { if ($driver == '') {
$this->out('The database driver supplied was empty. Please supply a database driver.'); $this->out('The database driver supplied was empty. Please supply a database driver.');
} }
@ -443,6 +443,9 @@ class AclScript extends CakeScript {
case 'odbc': case 'odbc':
$connect = 'odbc_connect'; $connect = 'odbc_connect';
break; break;
case 'oracle':
$connect = 'ocilogon';
break;
default: default:
$this->out('The connection parameter could not be set.'); $this->out('The connection parameter could not be set.');
break; break;
@ -543,4 +546,4 @@ class AclScript extends CakeScript {
} }
} }
?> ?>