Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 15f20d9

Browse files
committed
Fix postgre issues with new fields / indexes.
1 parent 619e22b commit 15f20d9

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

core/src/plugins/conf.sql/class.sqlConfDriver.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,10 +704,19 @@ public function saveRoles($roles)
704704
case "sqlite":
705705
case "sqlite3":
706706
case "postgre":
707-
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories]) VALUES (%s, %bin, %s)", $roleId, serialize($roleObject), serialize($roleObject->listAcls()));
707+
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin, %s, %i)",
708+
$roleId,
709+
serialize($roleObject),
710+
serialize($roleObject->listAcls()),
711+
time()
712+
);
708713
break;
709714
case "mysql":
710-
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i)", $roleId, serialize($roleObject),time());
715+
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i)",
716+
$roleId,
717+
serialize($roleObject),
718+
time()
719+
);
711720
break;
712721
default:
713722
return "ERROR!, DB driver " . $this->sqlDriver["driver"] . " not supported yet in __FUNCTION__";
@@ -729,10 +738,10 @@ public function updateRole($role, $userObject = null)
729738
$row = dibi::query("SELECT [role_id] FROM [ajxp_roles] WHERE [role_id]=%s", $role->getId());
730739
$res = $row->fetchSingle();
731740
if($res != null){
732-
dibi::query("UPDATE [ajxp_roles] SET [serial_role]=%bin,[searchable_repositories]=%s WHERE [role_id]=%s", serialize($role), serialize($role->listAcls()), $role->getId());
741+
dibi::query("UPDATE [ajxp_roles] SET [serial_role]=%bin,[searchable_repositories]=%s,[last_updated]=%i WHERE [role_id]=%s", serialize($role), serialize($role->listAcls()), time(), $role->getId());
733742
}
734743
else{
735-
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories]) VALUES (%s, %bin,%s)", $role->getId(), serialize($role), serialize($role->listAcls()));
744+
dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin,%s,%i)", $role->getId(), serialize($role), serialize($role->listAcls()), time());
736745
}
737746
break;
738747
case "mysql":

core/src/plugins/conf.sql/create.pgsql

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
CREATE TABLE ajxp_users (
2-
login varchar(255) PRIMARY KEY,
3-
password varchar(255) NOT NULL,
4-
"groupPath" varchar(255)
5-
);
6-
71
CREATE TABLE ajxp_user_rights (
82
rid serial PRIMARY KEY,
93
login varchar(255) NOT NULL,
@@ -60,7 +54,7 @@ CREATE TABLE ajxp_roles (
6054
role_id varchar(255) PRIMARY KEY,
6155
serial_role bytea NOT NULL,
6256
searchable_repositories text,
63-
last_updated INTEGER NOT NULL DEFAULT 0
57+
last_updated INT NOT NULL DEFAULT 0
6458
);
6559

6660
CREATE INDEX roles_updated_idx ON ajxp_roles(last_updated);

0 commit comments

Comments
 (0)