commit c6fd5b4f7066bb1efab82fab3f13d9fa17bbc1f3 parent 649b4542e6016fba8b95e9718c230f4b93501bba Author: Jan Dankert <develop@jandankert.de> Date: Sun, 7 Mar 2021 00:10:20 +0100 Refactoring: Hopefully more performance while accessing the database resultsets. Diffstat:
36 files changed, 227 insertions(+), 237 deletions(-)
diff --git a/modules/cms/model/Alias.class.php b/modules/cms/model/Alias.class.php @@ -80,7 +80,7 @@ class Alias extends BaseObject ' WHERE id={aliasid}' ); $sql->setInt( 'aliasid',$this->aliasid ); - $sql->query(); + $sql->execute(); parent::delete(); } @@ -99,7 +99,7 @@ class Alias extends BaseObject $sql->setInt ('linkobjectid',$this->linkedObjectId ); $sql->setIntOrNull('languageid' ,$this->languageid ); - $sql->query(); + $sql->execute(); parent::save(); } @@ -134,6 +134,6 @@ SQL $stmt->setInt ('linkobjectid',$this->linkedObjectId ); $stmt->setIntOrNull('languageid' ,$this->languageid ); - $stmt->query(); + $stmt->execute(); } } diff --git a/modules/cms/model/BaseObject.class.php b/modules/cms/model/BaseObject.class.php @@ -862,7 +862,7 @@ SQL $stmt->setInt ('objectid' , $this->objectid ); - $stmt->query(); + $stmt->execute(); $this->setTimestamp(); } @@ -890,7 +890,7 @@ SQL $sql->setInt ('objectid',$this->objectid ); $sql->setInt ('time' ,$this->lastchangeDate ); - $sql->query(); + $sql->execute(); } @@ -906,7 +906,7 @@ SQL $sql->setInt ('objectid',$this->objectid ); $sql->setInt ('time' ,$this->createDate ); - $sql->query(); + $sql->execute(); } @@ -927,7 +927,7 @@ SQL $sql->setInt ('objectid',$this->objectid ); $sql->setInt ('time' ,$this->publishedDate ); - $sql->query(); + $sql->execute(); } @@ -945,30 +945,30 @@ SQL ' SET default_objectid=NULL '. ' WHERE default_objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); $sql = $db->sql( 'UPDATE {{value}} '. ' SET linkobjectid=NULL '. ' WHERE linkobjectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); $sql = $db->sql( 'UPDATE {{link}} '. ' SET link_objectid=NULL '. ' WHERE link_objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); // Objekt-Namen l?schen $sql = $db->sql('DELETE FROM {{name}} WHERE objectid={objectid}'); $sql->setInt('objectid', $this->objectid); - $sql->query(); + $sql->execute(); // Aliases löschen. $sql = Db::sql('DELETE FROM {{alias}} WHERE objectid={objectid}'); $sql->setInt('objectid', $this->objectid); - $sql->query(); + $sql->execute(); // ACLs loeschen $this->deleteAllACLs(); @@ -976,7 +976,7 @@ SQL // Objekt l?schen $sql = $db->sql('DELETE FROM {{object}} WHERE id={objectid}'); $sql->setInt('objectid', $this->objectid); - $sql->query(); + $sql->execute(); $this->objectid = null; } @@ -1015,7 +1015,7 @@ SQL $sql->setInt( 'typeid',$this->getTypeid()); - $sql->query(); + $sql->execute(); // Standard-Rechte fuer dieses neue Objekt setzen. // Der angemeldete Benutzer erhaelt alle Rechte auf @@ -1176,7 +1176,7 @@ SQL $sql->setInt('objectid', $this->objectid); $sql->setInt('orderid', $orderid); - $sql->query(); + $sql->execute(); } @@ -1237,7 +1237,7 @@ SQL $sql->setInt('objectid', $this->objectid); $sql->setInt('parentid', $parentid); - $sql->query(); + $sql->execute(); } diff --git a/modules/cms/model/Element.class.php b/modules/cms/model/Element.class.php @@ -208,7 +208,7 @@ class Element extends ModelBase $sql->setInt ( 'flags' ,$flags ); $sql->setString ( 'description',$this->desc ); - $sql->query(); + $sql->execute(); } @@ -329,7 +329,7 @@ SQL $sql->setNull( 'defaultObjectId' ); else $sql->setInt ( 'defaultObjectId' ,$this->defaultObjectId ); - $sql->query(); + $sql->execute(); } @@ -365,7 +365,7 @@ SQL ' WHERE id={elementid}' ); $sql->setInt( 'elementid',$this->elementid ); - $sql->query(); + $sql->execute(); } @@ -381,7 +381,7 @@ SQL $sql = $db->sql('DELETE FROM {{value}} '. ' WHERE elementid={elementid}' ); $sql->setInt( 'elementid',$this->elementid ); - $sql->query(); + $sql->execute(); } diff --git a/modules/cms/model/File.class.php b/modules/cms/model/File.class.php @@ -453,7 +453,7 @@ class File extends BaseObject $sql = $db->sql( 'DELETE FROM {{file}} '. ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $sql->query(); + $sql->execute(); parent::delete(); } @@ -516,7 +516,7 @@ EOF $sql->setString('extension',$this->extension ); $sql->setString('objectid' ,$this->objectid ); $sql->setInt ('filterid' ,$this->filterid ); - $sql->query(); + $sql->execute(); parent::save(); } @@ -587,7 +587,7 @@ EOF else $sql->setString( 'value',$this->value ); - $sql->query(); + $sql->execute(); } @@ -617,7 +617,7 @@ EOF $sql->setInt ('objectid' ,$this->objectid ); $sql->setString('extension',$this->extension ); - $sql->query(); + $sql->execute(); $this->saveValue(); } @@ -656,7 +656,7 @@ SQL $stmt->setInt('typeid' , $this->typeid ); $stmt->setInt('objectid', $this->objectid); - $stmt->query(); + $stmt->execute(); } diff --git a/modules/cms/model/Folder.class.php b/modules/cms/model/Folder.class.php @@ -43,7 +43,7 @@ class Folder extends BaseObject $sql->setInt ('folderid' ,$this->folderid ); $sql->setInt ('objectid' ,$this->objectid ); - $sql->query(); + $sql->execute(); } @@ -98,7 +98,7 @@ class Folder extends BaseObject $sql->setInt('folderid',$this->folderid); $sql->setInt('orderid' ,$orderid ); - $sql->query(); + $sql->execute(); } @@ -563,12 +563,12 @@ SQL ' SET folderobjectid=NULL '. ' WHERE folderobjectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); $sql = $db->sql( 'DELETE FROM {{folder}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); parent::delete(); } diff --git a/modules/cms/model/Group.class.php b/modules/cms/model/Group.class.php @@ -206,7 +206,7 @@ SQL $sql->setIntOrNull('parentid',$this->parentid); // Datenbankabfrage ausfuehren - $sql->query(); + $sql->execute(); } @@ -241,7 +241,7 @@ SQL $sql->setString('name' ,$this->name ); // Datenbankbefehl ausfuehren - $sql->query(); + $sql->execute(); } @@ -254,20 +254,20 @@ SQL $sql = $db->sql( 'DELETE FROM {{acl}} '. 'WHERE groupid={groupid}' ); $sql->setInt ('groupid',$this->groupid ); - $sql->query(); + $sql->execute(); // Alle Gruppenzugehoerigkeiten zu dieser Gruppe loeschen $sql = $db->sql( 'DELETE FROM {{usergroup}} '. 'WHERE groupid={groupid}' ); $sql->setInt ('groupid',$this->groupid ); - $sql->query(); + $sql->execute(); // Gruppe loeschen $sql = $db->sql( 'DELETE FROM {{group}} '. 'WHERE id={groupid}' ); $sql->setInt ('groupid',$this->groupid ); - $sql->query(); + $sql->execute(); } @@ -317,7 +317,7 @@ SQL $sql->setInt('userid' ,$userid ); $sql->setInt('groupid' ,$this->groupid ); - $sql->query(); + $sql->execute(); } @@ -332,7 +332,7 @@ SQL $sql->setInt ('userid' ,$userid ); $sql->setInt ('groupid' ,$this->groupid ); - $sql->query(); + $sql->execute(); } diff --git a/modules/cms/model/Language.class.php b/modules/cms/model/Language.class.php @@ -122,7 +122,7 @@ class Language extends ModelBase $sql->setInt( 'languageid',$this->languageid ); // Datenbankabfrage ausfuehren - $sql->query(); + $sql->execute(); } @@ -166,7 +166,7 @@ class Language extends ModelBase $sql->setString('isocode' ,$this->isoCode ); // Datenbankbefehl ausfuehren - $sql->query(); + $sql->execute(); } @@ -180,14 +180,14 @@ class Language extends ModelBase ' SET is_default = 0 '. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$this->projectid ); - $sql->query(); + $sql->execute(); // Jetzt die gew?nschte Sprachvariante auf Standard setzen $sql = $db->sql( 'UPDATE {{language}} '. ' SET is_default = 1 '. ' WHERE id={languageid}' ); $sql->setInt('languageid',$this->languageid ); - $sql->query(); + $sql->execute(); } @@ -207,17 +207,17 @@ class Language extends ModelBase // Inhalte mit dieser Sprache l?schen $sql = $db->sql( 'DELETE FROM {{value}} WHERE languageid={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); - $sql->query(); + $sql->execute(); // Inhalte mit dieser Sprache l?schen $sql = $db->sql( 'DELETE FROM {{name}} WHERE languageid={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); - $sql->query(); + $sql->execute(); // Sprache l?schen $sql = $db->sql( 'DELETE FROM {{language}} WHERE id={languageid}' ); $sql->setInt( 'languageid',$this->languageid ); - $sql->query(); + $sql->execute(); // Andere Sprache auf "Default" setzen $sql = $db->sql( 'SELECT id FROM {{language}} WHERE projectid={projectid}' ); @@ -226,7 +226,7 @@ class Language extends ModelBase $sql = $db->sql( 'UPDATE {{language}} SET is_default=1 WHERE id={languageid}' ); $sql->setInt( 'languageid',$new_default_languageid ); - $sql->query(); + $sql->execute(); // } } diff --git a/modules/cms/model/Link.class.php b/modules/cms/model/Link.class.php @@ -62,7 +62,7 @@ class Link extends BaseObject ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $sql->query(); + $sql->execute(); parent::delete(); } @@ -88,7 +88,7 @@ SQL else $sql->setInt ('linkobjectid',$this->linkedObjectId ); - $sql->query(); + $sql->execute(); parent::save(); } @@ -126,7 +126,7 @@ SQL $stmt->setInt ('objectid' ,$this->objectid ); $stmt->setNull ('linkobjectid'); - $stmt->query(); + $stmt->execute(); } } diff --git a/modules/cms/model/Model.class.php b/modules/cms/model/Model.class.php @@ -104,7 +104,7 @@ class Model extends ModelBase $sql->setInt( 'modelid',$this->modelid ); // Datenbankabfrage ausfuehren - $sql->query(); + $sql->execute(); } @@ -146,7 +146,7 @@ class Model extends ModelBase $sql->setString('name' ,$this->name ); // Datenbankbefehl ausfuehren - $sql->query(); + $sql->execute(); } @@ -161,14 +161,14 @@ class Model extends ModelBase ' SET is_default = 0 '. ' WHERE projectid={projectid}' ); $sql->setInt('projectid',$this->projectid ); - $sql->query(); + $sql->execute(); // Jetzt die gew?nschte Sprachvariante auf Standard setzen $sql = $db->sql( 'UPDATE {{projectmodel}} '. ' SET is_default = 1 '. ' WHERE id={modelid}' ); $sql->setInt('modelid',$this->modelid ); - $sql->query(); + $sql->execute(); } @@ -188,7 +188,7 @@ class Model extends ModelBase SQL ); $sql->setInt( 'modelid',$this->modelid ); - $sql->query(); + $sql->execute(); // Dieses Modell löschen $sql = $db->sql( <<<SQL @@ -197,7 +197,7 @@ SQL SQL ); $sql->setInt( 'modelid',$this->modelid ); - $sql->query(); + $sql->execute(); // Anderes Modell auf "Default" setzen (sofern vorhanden) if ( $this->isDefault ) @@ -208,7 +208,7 @@ SQL $sql = $db->sql( 'UPDATE {{projectmodel}} SET is_default=1 WHERE id={modelid}' ); $sql->setInt( 'modelid',$new_default_modelid ); - $sql->query(); + $sql->execute(); } } diff --git a/modules/cms/model/Name.class.php b/modules/cms/model/Name.class.php @@ -106,7 +106,7 @@ SQL $sql->setInt ('languageid', $this->languageid ); $sql->setString('name' , $this->name); $sql->setString('desc' , $this->description); - $sql->query(); + $sql->execute(); } /** @@ -129,7 +129,7 @@ SQL $sql->setString('desc', $this->description); $sql->setInt( 'objectid' , $this->objectid ); $sql->setInt( 'languageid', $this->languageid ); - $sql->query(); + $sql->execute(); } diff --git a/modules/cms/model/Page.class.php b/modules/cms/model/Page.class.php @@ -152,7 +152,7 @@ SQL $sql->setInt ('objectid' ,$this->objectid ); $sql->setInt ('templateid',$this->templateid ); - $sql->query(); + $sql->execute(); } @@ -183,12 +183,12 @@ SQL $sql = $db->sql( 'DELETE FROM {{value}} '. ' WHERE pageid={pageid}' ); $sql->setInt('pageid',$this->pageid); - $sql->query(); + $sql->execute(); $sql = $db->sql( 'DELETE FROM {{page}} '. ' WHERE objectid={objectid}' ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); parent::delete(); } @@ -238,7 +238,7 @@ SQL ' WHERE objectid={objectid}' ); $sql->setInt('templateid' ,$this->templateid); $sql->setInt('objectid' ,$this->objectid ); - $sql->query(); + $sql->execute(); parent::save(); } @@ -259,7 +259,7 @@ SQL ' WHERE objectid={objectid}' ); $sql->setInt('templateid' ,$this->templateid); $sql->setInt('objectid' ,$this->objectid ); - $sql->query(); + $sql->execute(); // Inhalte umschluesseln, d.h. die Element-Ids aendern @@ -276,7 +276,7 @@ SQL $sql->setInt('pageid' ,$this->pageid); $sql->setInt('elementid',$oldElementId ); - $sql->query(); + $sql->execute(); } else { @@ -290,7 +290,7 @@ SQL $sql->setInt('pageid' ,$this->pageid); $sql->setInt('oldelementid',$oldElementId ); $sql->setInt('newelementid',$newElementId ); - $sql->query(); + $sql->execute(); } } } diff --git a/modules/cms/model/Permission.class.php b/modules/cms/model/Permission.class.php @@ -387,7 +387,7 @@ class Permission extends ModelBase $sql->setInt('aclid' ,$this->aclid ); $sql->setInt('objectid',$this->objectid); - $sql->query(); + $sql->execute(); $this->aclid = 0; } @@ -474,7 +474,7 @@ SQL else $stmt->setInt ('languageid',$this->languageid); - $stmt->query(); + $stmt->execute(); } diff --git a/modules/cms/model/Project.class.php b/modules/cms/model/Project.class.php @@ -293,7 +293,7 @@ SQL $stmt->setInt ('flags' ,$flags ); $stmt->setInt ('projectid' ,$this->projectid ); - $stmt->query(); + $stmt->execute(); try { @@ -335,7 +335,7 @@ SQL $sql->setInt ('projectid',$this->projectid ); $sql->setString('name' ,$this->name ); - $sql->query(); + $sql->execute(); // Modell anlegen $model = new Model(); @@ -419,7 +419,7 @@ SQL $sql = $db->sql( 'DELETE FROM {{project}}'. ' WHERE id= {projectid} ' ); $sql->setInt( 'projectid',$this->projectid ); - $sql->query(); + $sql->execute(); } @@ -742,7 +742,7 @@ EOF } } //$sql = $db->sql( 'INSERT INTO {t_'.$tabelle.'} ('.join(array_keys($row),',').') VALUES('.join($row,',').')',$dbid_destination); - $stmt->query(); + $stmt->execute(); } if ( isset($data['self_key']) ) @@ -750,7 +750,7 @@ EOF foreach( $mapping[$tabelle] as $oldid=>$newid ) { $stmt = $db_dest->sql( 'UPDATE {t_'.$tabelle.'} SET '.$data['self_key'].'='.$newid.' WHERE '.$data['self_key'].'='.($oldid+$maxid),$dbid_destination ); - $stmt->query(); + $stmt->execute(); } } } diff --git a/modules/cms/model/Template.class.php b/modules/cms/model/Template.class.php @@ -115,7 +115,7 @@ SQL $stmt->setInt ( 'type' ,$type ); - $stmt->query(); + $stmt->execute(); } @@ -276,7 +276,7 @@ SQL $sql->setInt ('projectid' ,$this->projectid ); - $sql->query(); + $sql->execute(); } @@ -315,13 +315,13 @@ SQL $stmt = $db->sql( 'DELETE FROM {{templatemodel}}'. ' WHERE templateid={templateid}' ); $stmt->setInt( 'templateid',$this->templateid ); - $stmt->query(); + $stmt->execute(); $stmt = $db->sql( 'DELETE FROM {{template}}'. ' WHERE id={templateid}' ); $stmt->setInt( 'templateid',$this->templateid ); - $stmt->query(); + $stmt->execute(); $this->templateid = 0; } diff --git a/modules/cms/model/TemplateModel.class.php b/modules/cms/model/TemplateModel.class.php @@ -98,7 +98,7 @@ class TemplateModel extends ModelBase $stmt->setString( 'extension' ,$this->extension ); $stmt->setString( 'src' ,$this->src ); - $stmt->query(); + $stmt->execute(); } @@ -121,7 +121,7 @@ class TemplateModel extends ModelBase $stmt->setInt ( 'modelid' ,$this->modelid ); $stmt->setString( 'src' ,$this->src ); - $stmt->query(); + $stmt->execute(); $this->templatemodelid = $nextid; } @@ -139,7 +139,7 @@ class TemplateModel extends ModelBase $stmt = $db->sql( 'DELETE FROM {{templatemodel}}'. ' WHERE id={id}' ); $stmt->setInt( 'id',$this->templatemodelid ); - $stmt->query(); + $stmt->execute(); } diff --git a/modules/cms/model/Url.class.php b/modules/cms/model/Url.class.php @@ -53,7 +53,7 @@ class Url extends BaseObject ' WHERE objectid={objectid}' ); $sql->setInt( 'objectid',$this->objectid ); - $sql->query(); + $sql->execute(); parent::delete(); } @@ -70,7 +70,7 @@ class Url extends BaseObject $sql->setInt ('objectid' ,$this->objectid ); $sql->setString('url',$this->url ); - $sql->query(); + $sql->execute(); parent::save(); } @@ -106,6 +106,6 @@ class Url extends BaseObject $sql->setString('url',$this->url ); - $sql->query(); + $sql->execute(); } } diff --git a/modules/cms/model/User.class.php b/modules/cms/model/User.class.php @@ -154,7 +154,7 @@ SQL $stmt->setInt( 'userid',$this->userid ); // Datenbankabfrage ausfuehren - $stmt->query(); + $stmt->execute(); } @@ -514,7 +514,7 @@ SQL $sql->setInt ( 'locked_until',$this->passwordLockedUntil ); // Datenbankabfrage ausfuehren - $sql->query(); + $sql->execute(); } @@ -543,7 +543,7 @@ SQL $sql->setString ('type' ,$this->type ); // Datenbankbefehl ausfuehren - $sql->query(); + $sql->execute(); $this->addNewUserGroups(); // Neue Gruppen hinzufuegen. @@ -628,40 +628,40 @@ SQL 'SET create_userid=null '. 'WHERE create_userid={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); // "Letzte �nderung von" f�r diesen Benutzer entfernen $sql = $db->sql( 'UPDATE {{object}} '. 'SET lastchange_userid=null '. 'WHERE lastchange_userid={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); // Alle Archivdaten in Dateien mit diesem Benutzer entfernen $sql = $db->sql( 'UPDATE {{value}} '. 'SET lastchange_userid=null '. 'WHERE lastchange_userid={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); // Alle Berechtigungen dieses Benutzers l?schen $sql = $db->sql( 'DELETE FROM {{acl}} '. 'WHERE userid={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); // Alle Gruppenzugehoerigkeiten dieses Benutzers l?schen $sql = $db->sql( 'DELETE FROM {{usergroup}} '. 'WHERE userid={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); $this->deleteAllLoginTokens(); // Benutzer loeschen $sql = $db->sql( 'DELETE FROM {{user}} '. 'WHERE id={userid}' ); $sql->setInt ('userid',$this->userid ); - $sql->query(); + $sql->execute(); $this->userid = null; } @@ -731,7 +731,7 @@ SQL $sql->setString('password',Password::hash(User::pepperPassword($password),$algo) ); $sql->setInt ('userid' ,$this->userid ); - $sql->query(); // Updating the password + $sql->execute(); // Updating the password // Delete all login tokens, because the user should // use the new password on all devices @@ -837,7 +837,7 @@ SQL $sql->setInt('userid' ,$this->userid ); $sql->setInt('groupid' ,$groupid ); - $sql->query(); + $sql->execute(); } @@ -857,7 +857,7 @@ SQL $sql->setInt ('userid' ,$this->userid ); $sql->setInt ('groupid' ,$groupid ); - $sql->query(); + $sql->execute(); } diff --git a/modules/cms/model/Value.class.php b/modules/cms/model/Value.class.php @@ -414,7 +414,7 @@ SQL $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - $sql->query(); + $sql->execute(); $sql = Db::sql( <<<SQL UPDATE {{value}} @@ -429,7 +429,7 @@ SQL $sql->setInt( 'pageid' ,$this->pageid ); $sql->setInt( 'languageid',$this->languageid); - $sql->query(); + $sql->execute(); } @@ -459,7 +459,7 @@ SQL $stmt->setInt( 'pageid' ,$this->pageid ); $stmt->setInt( 'languageid',$this->languageid); - $stmt->query(); + $stmt->execute(); if ( $this->publish ) { @@ -477,7 +477,7 @@ SQL $stmt->setInt( 'pageid' ,$this->pageid ); $stmt->setInt( 'languageid',$this->languageid); - $stmt->query(); + $stmt->execute(); } // Naechste ID aus Datenbank besorgen @@ -517,7 +517,7 @@ SQL $user = \util\Session::getUser(); $stmt->setInt ( 'lastchange_userid',$user->userid ); - $stmt->query(); + $stmt->execute(); // Nur ausfuehren, wenn in Konfiguration aktiviert. $limit = Configuration::subset(['content','revision-limit'] ); @@ -567,7 +567,7 @@ SQL $sql->setInt( 'languageid',$this->languageid ); $sql->setInt( 'min_date' ,$limitConfig['max-age']*24*60*60); $sql->setInt( 'min_id' ,$values[count($values)-$limitConfig['min-revisions']]); - $sql->query(); + $sql->execute(); } if ( count($values) > $limitConfig->get('max-revisions',100 ) ) @@ -588,7 +588,7 @@ SQL $sql->setInt( 'languageid',$this->languageid ); $sql->setInt( 'min_date' ,$limitConfig['min-age']*24*60*60); $sql->setInt( 'min_id' ,$values[count($values)-$limitConfig['max-revisions']]); - $sql->query(); + $sql->execute(); } } diff --git a/modules/cms/update/Update.class.php b/modules/cms/update/Update.class.php @@ -62,7 +62,7 @@ class Update $sql->setInt('version', $installVersion); $sql->setInt('status', self::STATUS_UPDATE_PROGRESS); $sql->setInt('time', time()); - $sql->query(); + $sql->execute(); $db->commit(); } @@ -81,7 +81,7 @@ class Update $sql->setInt('status', self::STATUS_UPDATE_SUCCESS); $sql->setInt('version', $installVersion); $sql->setInt('time', time()); - $sql->query(); + $sql->execute(); $db->commit(); } } diff --git a/modules/cms/update/version/DBVersion000001.class.php b/modules/cms/update/version/DBVersion000001.class.php @@ -326,7 +326,7 @@ class DBVersion000001 extends DbVersion { // Hashing the admin password with MD5. In Version 6 the Algo will be set to 2 (=MD5). $sql = $db->sql("INSERT INTO {{user}} (id,name,password,ldap_dn,fullname,tel,mail,descr,style,is_admin) VALUES(1,'admin','21232f297a57a5a743894a0e4a801fc3','','Administrator','','','Account for administration tasks.','default',1)",$db->id); - $sql->query(); + $sql->execute(); $db->commit(); } } diff --git a/modules/cms/update/version/DBVersion000005.class.php b/modules/cms/update/version/DBVersion000005.class.php @@ -24,7 +24,7 @@ class DBVersion000005 extends DbVersion $updateStmt = $db->sql('UPDATE '.$table->getSqlName(). ' SET password_hash=password' ); - $updateStmt->query(); + $updateStmt->execute(); $table->column('password')->drop(); diff --git a/modules/cms/update/version/DBVersion000006.class.php b/modules/cms/update/version/DBVersion000006.class.php @@ -31,7 +31,7 @@ class DBVersion000006 extends DbVersion $updateAlgoStmt = $db->sql('UPDATE '.$table->getSqlName(). ' SET password_algo=1 WHERE SUBSTR(password_hash,1,1) = '."'$'".';' ); - $updateAlgoStmt->query(); + $updateAlgoStmt->execute(); } } \ No newline at end of file diff --git a/modules/cms/update/version/DBVersion000007.class.php b/modules/cms/update/version/DBVersion000007.class.php @@ -28,7 +28,7 @@ class DBVersion000007 extends DbVersion $stmt = $db->sql('UPDATE '.$tableName.' SET otp_secret={secret} WHERE id={id}'); $stmt->setString('secret',$secret); $stmt->setInt('id',$userid); - $stmt->query(); + $stmt->execute(); } $table->column('totp' )->type(Column::TYPE_INT )->size( 1)->defaultValue( 0)->add(); diff --git a/modules/cms/update/version/DBVersion000008.class.php b/modules/cms/update/version/DBVersion000008.class.php @@ -31,22 +31,22 @@ class DBVersion000008 extends DbVersion $updateStmt = $db->sql('UPDATE '.$tableName. ' SET typeid=1 WHERE is_folder=1' ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql('UPDATE '.$tableName. ' SET typeid=2 WHERE is_file=1' ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql('UPDATE '.$tableName. ' SET typeid=3 WHERE is_page=1' ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql('UPDATE '.$tableName. ' SET typeid=4 WHERE is_link=1' ); - $updateStmt->query(); + $updateStmt->execute(); $table->column('is_folder')->drop(); $table->column('is_file' )->drop(); diff --git a/modules/cms/update/version/DBVersion000009.class.php b/modules/cms/update/version/DBVersion000009.class.php @@ -40,19 +40,19 @@ class DBVersion000009 extends DbVersion $insertStmt = $db->sql('INSERT INTO '.$table->getSqlName(). ' (id,objectid,url) SELECT id,objectid,url FROM '.$this->table('link')->getSqlName().' WHERE url is not null' ); - $insertStmt->query(); + $insertStmt->execute(); // Updating the typeid for URL entrys in table 'object' $updateStmt = $db->sql('UPDATE '.$this->table('object')->getSqlName(). ' SET typeid='.BaseObject::TYPEID_URL.' WHERE id IN (SELECT objectid FROM '.$this->table('url')->getSqlName().')' ); - $updateStmt->query(); + $updateStmt->execute(); $tableLink = $this->table('link'); // Remove old entrys in table 'link' $updateStmt = $db->sql('DELETE FROM '.$tableLink->getSqlName().' WHERE url is not null' ); - $updateStmt->query(); + $updateStmt->execute(); // Cleanup: Drop unused column. $tableLink->column('url')->drop(); diff --git a/modules/cms/update/version/DBVersion000010.class.php b/modules/cms/update/version/DBVersion000010.class.php @@ -26,13 +26,13 @@ class DBVersion000010 extends DbVersion ' SET typeid=6 WHERE id IN (SELECT objectid FROM '.$tableFile. " WHERE extension IN ('gif','png','jpeg','jpg','svg','tiff') )" ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql('UPDATE '.$tableObject. ' SET typeid=7 WHERE id IN (SELECT objectid FROM '.$tableFile. " WHERE extension IN ('css','text','txt','js','html','xml','log','ini','gpx') )" ); - $updateStmt->query(); + $updateStmt->execute(); } } \ No newline at end of file diff --git a/modules/cms/update/version/DBVersion000011.class.php b/modules/cms/update/version/DBVersion000011.class.php @@ -33,7 +33,7 @@ UPDATE $tableProject SET url= CONCAT('//',name) SQL ); - $updateStmt->query(); + $updateStmt->execute(); // Update the new flags $updateStmt = $db->sql(<<<SQL @@ -41,14 +41,14 @@ UPDATE $tableProject SET flags=flags+1 WHERE cut_index=1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql(<<<SQL UPDATE $tableProject SET flags=flags+2 WHERE content_negotiation=1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); // now the information is hold in column 'flags', so we can delete the old columns. $table->column( 'cut_index')->drop(); diff --git a/modules/cms/update/version/DBVersion000016.class.php b/modules/cms/update/version/DBVersion000016.class.php @@ -51,7 +51,7 @@ UPDATE $tableProject SET typeid=$typeid WHERE type = '$typename' SQL ); - $updateStmt->query(); + $updateStmt->execute(); } $table->column('type')->drop(); @@ -65,28 +65,28 @@ UPDATE $tableProject SET flags=flags+1 WHERE html = 1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql(<<<SQL UPDATE $tableProject SET flags=flags+2 WHERE all_languages = 1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql(<<<SQL UPDATE $tableProject SET flags=flags+4 WHERE writable = 1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $db->sql(<<<SQL UPDATE $tableProject SET flags=flags+8 WHERE with_icon = 1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); @@ -98,7 +98,7 @@ UPDATE $tableProject SET format=1 WHERE html = 1 and wiki = 0 SQL ); - $updateStmt->query(); + $updateStmt->execute(); // Format = Wiki $updateStmt = $db->sql(<<<SQL @@ -106,7 +106,7 @@ UPDATE $tableProject SET format=2 WHERE wiki = 1 SQL ); - $updateStmt->query(); + $updateStmt->execute(); // Other formats were not supported up to this version. diff --git a/modules/cms/update/version/DBVersion000018.class.php b/modules/cms/update/version/DBVersion000018.class.php @@ -30,7 +30,7 @@ UPDATE $tableElement SET label=name SQL ); - $updateStmt->query(); + $updateStmt->execute(); $table->addUniqueIndex(['templateid','label']); } diff --git a/modules/cms/update/version/DBVersion000019.class.php b/modules/cms/update/version/DBVersion000019.class.php @@ -31,7 +31,7 @@ UPDATE $tableValue SET format=(select format from $tableElement where $tableValue.elementid=$tableElement.id) SQL ); - $updateStmt->query(); + $updateStmt->execute(); } } diff --git a/modules/cms/update/version/DBVersion000027.class.php b/modules/cms/update/version/DBVersion000027.class.php @@ -30,21 +30,21 @@ UPDATE $tableSqlName SET type=3; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET type=2 where groupid is not null; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET type=1 where userid is not null; SQL ); - $updateStmt->query(); + $updateStmt->execute(); } } diff --git a/modules/cms/update/version/DBVersion000028.class.php b/modules/cms/update/version/DBVersion000028.class.php @@ -32,84 +32,84 @@ UPDATE $tableSqlName SET flags=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+2 WHERE is_write=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+4 WHERE is_prop=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+64 WHERE is_create_folder=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+128 WHERE is_create_file=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+256 WHERE is_create_link=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+512 WHERE is_create_page=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+8 WHERE is_delete=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+16 WHERE is_release=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+32 WHERE is_publish=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+1024 WHERE is_grant=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $updateStmt = $this->getDb()->sql(<<<SQL UPDATE $tableSqlName SET flags=flags+2048 WHERE is_transmit=1; SQL ); - $updateStmt->query(); + $updateStmt->execute(); $table->column('is_write' )->drop(); $table->column('is_prop' )->drop(); diff --git a/modules/database/Column.class.php b/modules/database/Column.class.php @@ -165,7 +165,7 @@ class Column $ddl = $this->db->sql('ALTER TABLE ' . $table . ' ADD COLUMN ' . $this->name . ' ' . $this->getColumnDefinition(). ';' ); - $ddl->query(); + $ddl->execute(); } public function modify() { @@ -173,7 +173,7 @@ class Column $ddl = $this->db->sql('ALTER TABLE ' . $table . ' MODIFY COLUMN ' . $this->name . ' ' . $this->getColumnDefinition() . ';' ); - $ddl->query(); + $ddl->execute(); } function drop() @@ -181,6 +181,6 @@ class Column $table = $this->table->getSqlName(); $ddl = $this->db->sql('ALTER TABLE ' . $table . ' DROP COLUMN ' . $this->name . ';'); - $ddl->query(); + $ddl->execute(); } } \ No newline at end of file diff --git a/modules/database/Statement.class.php b/modules/database/Statement.class.php @@ -18,6 +18,7 @@ namespace database; use database\driver\PDODriver; +use logger\Logger; use util\exception\DatabaseException; /** @@ -83,22 +84,10 @@ class Statement * * @return Object (Result) */ - public function query() - { - return $this->execute(); - } - - - /** - * Ausfuehren einer Datenbankanfrage. - * - * @param SQL-Objekt - * @return Object (Result) - */ - public function execute( ) + public function execute() { // Ausfuehren... - return $this->client->query($this->stmt, $this->sql); + return $this->client->execute($this->stmt, $this->sql); } @@ -106,19 +95,13 @@ class Statement * Ermittelt genau 1 Datenbankergebnis aus einer SQL-Anfrage. * Falls es mehrere Treffer gibt, wird die 1. Spalte aus der 1. Zeile genommen. * - * @return String + * @return String|null */ - public function &getOne() + public function getOne() { - $none = ''; - $result = $this->query(); - - $row = $this->client->fetchRow($this->stmt); - - if ( ! is_array($row) ) - return $none; + $this->execute(); - return array_values($row)[0];; + return $this->client->fetchFirstColumn($this->stmt); } @@ -129,9 +112,8 @@ class Statement */ public function &getRow() { - $result = $this->query(); - - $row = $this->client->fetchRow($this->stmt); + $this->execute(); + $row = $this->client->fetchAssocRow($this->stmt); if ( ! is_array($row) ) $row = array(); @@ -145,22 +127,11 @@ class Statement * * @return array */ - public function &getCol() + public function getCol() { - $result = $this->query(); + $this->execute(); - $i = 0; - $col = array(); - while( $row = $this->client->fetchRow($this->stmt) ) - { - if ( empty($row) ) - break; - - $keys = array_keys($row); - $col[] = $row[ $keys[0] ]; - } - - return $col; + return $this->client->fetchAllFirstColumn($this->stmt); } @@ -171,34 +142,11 @@ class Statement */ public function &getAssoc() { - $force_array = false; - + $this->execute(); $results = array(); - $result = $this->query(); - - $i = 0; - - while( $row = $this->client->fetchRow($this->stmt) ) - { - if ( empty($row) ) - break; - - $keys = array_keys($row); - $key1 = $keys[0]; - $id = $row[$key1]; - - if ( count($row) > 2 || $force_array ) - { - unset( $row[$key1] ); - $results[ $id ] = $row; - } - else - { - $key2 = $keys[1]; - $results[ $id ] = $row[$key2]; - } - } + while( $row = $this->client->fetchIndexedRow($this->stmt) ) + $results[ $row[0] ] = $row[1]; return $results; } @@ -209,15 +157,11 @@ class Statement * * @return array */ - public function &getAll() + public function getAll() { - $result = $this->query(); - $results = array(); - - while( $row = $this->client->fetchRow($this->stmt) ) - $results[] = $row; + $this->execute(); - return $results; + return $this->client->fetchAllRows($this->stmt); } @@ -305,6 +249,3 @@ class Statement } - - -?>- \ No newline at end of file diff --git a/modules/database/Table.class.php b/modules/database/Table.class.php @@ -74,7 +74,7 @@ class Table $ddl = $this->db->sql('CREATE TABLE ' . $tableName . '(id INTEGER)' . $table_opts . ';'); // The syntax 'TYPE = InnoDB' was deprecated in MySQL 5.0 and was removed in MySQL 5.1 and later versions. - $ddl->query(); + $ddl->execute(); return $this; } @@ -88,7 +88,7 @@ class Table $columnNames = explode(',', $columnNames); $ddl = $this->db->sql('ALTER TABLE ' . $table . ' ADD PRIMARY KEY (' . implode(',', $columnNames) . ');'); - $ddl->query(); + $ddl->execute(); } @@ -109,7 +109,7 @@ class Table // else $ddl = $this->db->sql('CREATE ' . ($unique ? 'UNIQUE ' : '') . 'INDEX ' . $indexName . ' ON ' . $this->getSqlName() . ' (' . implode(',', $columnNames) . ');'); - $ddl->query(); + $ddl->execute(); } @@ -139,7 +139,7 @@ class Table // Oracle doesn't support "ON DELETE RESTRICT"-Statements, but its the default. $ddl = $this->db->sql('ALTER TABLE ' . $this->getSqlName() . ' ADD CONSTRAINT ' . $constraintName . ' FOREIGN KEY (' . $columnName . ') REFERENCES ' . $targetTablename . ' (' . $targetColumnName . ') ON DELETE RESTRICT ON UPDATE RESTRICT;'); - $ddl->query(); + $ddl->execute(); } @@ -148,7 +148,7 @@ class Table $table = $this->getSqlName(); $ddl = $this->db->sql('DROP TABLE ' . $table . ';'); - $ddl->query(); + $ddl->execute(); } function dropIndex($columnNames) @@ -159,7 +159,7 @@ class Table $indexName = $this->tablePrefix . self::INDEX_PREFIX . '_' . $this->name . '_' . implode('_', $columnNames) . $this->tableSuffix; $ddl = $this->db->sql('DROP INDEX ' . $indexName . ' ON ' . $this->getSqlName() . ';'); - $ddl->query(); + $ddl->execute(); } public function dropUniqueIndex($indexName) @@ -175,14 +175,14 @@ class Table $columnNames = explode(',', $columnNames); $ddl = $this->db->sql('ALTER TABLE ' . $table . ' DROP PRIMARY KEY(' . implode(',', $columnNames) . ')'); - $ddl->query(); + $ddl->execute(); } public function dropConstraint($constraintName) { $ddl = $this->db->sql('DROP CONSTRAINT ' . $constraintName . ';'); - $ddl->query(); + $ddl->execute(); } } \ No newline at end of file diff --git a/modules/database/driver/PDODriver.class.php b/modules/database/driver/PDODriver.class.php @@ -167,7 +167,7 @@ class PDODriver * @param $query Sql * @return PDOStatement */ - public function query($stmt,$query) + public function execute($stmt, $query) { $erg = $stmt->execute(); @@ -180,14 +180,67 @@ class PDODriver /** * @param $stmt PDOStatement - * @return mixed Row + * @return array Row */ - public function fetchRow($stmt) + public function fetchAssocRow($stmt) { return $stmt->fetch( PDO::FETCH_ASSOC ); } - + + /** + * Fetches all rows from the resultset + * @param $stmt PDOStatement + * @return array Row + */ + public function fetchAllRows($stmt) + { + return $stmt->fetchAll( PDO::FETCH_ASSOC ); + } + + + /** + * Fetches the next row with a numbered-based array. + * @param $stmt PDOStatement + * @return array Row + */ + public function fetchIndexedRow($stmt) + { + return $stmt->fetch( PDO::FETCH_NUM ); + } + + + + /** + * Fetches the first column of the next row. + * + * @param $stmt PDOStatement + * @return mixed Row + */ + public function fetchFirstColumn($stmt) { + return $stmt->fetchColumn(); + } + + + /** + * Fetches all first columns from the result set + * + * @param $stmt PDOStatement + * @return array + */ + public function fetchAllFirstColumn($stmt) { + return $stmt->fetchAll( PDO::FETCH_COLUMN ); + } + + + /** + * Prepares a SQL query and gets the Statement. + * + * @param $query string SQL-query + * @param $param array parameters + * @return PDOStatement + * @throws DatabaseException + */ public function prepare( $query,$param) { $offset = 0; @@ -279,5 +332,3 @@ class PDODriver } } - -?>- \ No newline at end of file