claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert from timestamp to datetime. Datetime is consistent between mysql 4.0x and newer

Browse Source 
versions and is faster for date/time computations. Modify object creation methods to specify
any time fields that were previously updated with timestamp properties.
This commit is contained in:
Chris Morgan
2007-07-31 23:48:22 +00:00
committed by WineHQ
parent 8b7fdf606c
commit b94a2a392b
22 changed files with 96 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/appData.php
View File

@@ -153,7 +153,7 @@ class appData
$sLink,
$oRow->type,
$oRow->description,
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))),
($i % 2) ? "color0" : "color1");
}
@@ -500,7 +500,7 @@ class appData
$oUser = new User($this->iSubmitterId);
$oTableRow = new TableRow();
$oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell($oUser->objectMakeLink());
$oTableRow->AddTextCell($oApp->objectMakeLink());
$oTableRow->AddTextCell($this->iVersionId ? $oVersion->objectMakeLink() : "N/A");

14
include/application.php
View File

@@ -121,12 +121,14 @@ class Application {
if(!$_SESSION['current']->canCreateApplication())
return;
$hResult = query_parameters("INSERT INTO appFamily (appName, description, keywords, ".
"webPage, vendorId, catId, submitterId, queued) VALUES (".
"'?', '?', '?', '?', '?', '?', '?', '?')",
$hResult = query_parameters("INSERT INTO appFamily (appName, description, ".
"keywords, webPage, vendorId, catId, ".
"submitTime, submitterId, ".
"queued) VALUES (".
"'?', '?', '?', '?', '?', '?', ?, '?', '?')",
$this->sName, $this->sDescription, $this->sKeywords,
$this->sWebpage, $this->iVendorId, $this->iCatId,
$_SESSION['current']->iUserId,
"NOW()", $_SESSION['current']->iUserId,
$this->mustBeQueued() ? "true" : "false");
if($hResult)
{
@@ -804,7 +806,7 @@ class Application {
$oTableRow->AddTextCell($oApp->objectMakeLink());
$oTableRow->AddTextCell($oRow->description);
$oTableRow->AddTextCell($oVendor->objectMakeLink());
$oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime)));
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime)));
$oTableRow->SetClass(($i % 2) ? "color0" : "color1");
$oTable->AddRow($oTableRow);
@@ -902,7 +904,7 @@ class Application {
$sVendor = $oVendor->objectMakeLink();
$oTableRow = new TableRow();
$oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell($oUser->objectMakeLink());
$oTableRow->AddTextCell($sVendor);
$oTableRow->AddTextCell($this->sName);

2
include/browse_newest_apps.php
View File

@@ -77,7 +77,7 @@ class browse_newest_apps
$oTableRow = new TableRow();
$oTableCell = new TableCell(print_short_date(mysqltimestamp_to_unixtimestamp($oApp->sSubmitTime)));
$oTableCell = new TableCell(print_short_date(mysqldatetime_to_unixtimestamp($oApp->sSubmitTime)));
$oTableCell->SetWidth("20%");
$oTableRow->AddCell($oTableCell);
$oTableRow->AddTextCell($oApp->objectMakeLink());

12
include/bugs.php
View File

@@ -120,11 +120,13 @@ class Bug {
/* passed the checks so lets insert the puppy! */
$hResult = query_parameters("INSERT INTO buglinks (versionId, bug_id, queued, submitterId) ".
"VALUES('?', '?', '?', '?')",
$hResult = query_parameters("INSERT INTO buglinks (versionId, bug_id, ".
"submitTime, submitterId, queued) ".
"VALUES('?', '?', ?, '?', '?')",
$this->iVersionId, $this->iBug_id,
$this->bQueued ? "true":"false",
$_SESSION['current']->iUserId);
"NOW()",
$_SESSION['current']->iUserId,
$this->bQueued ? "true":"false");
if($hResult)
{
$this->iLinkId = mysql_insert_id();
@@ -279,7 +281,7 @@ class Bug {
$oBug->sBug_status,
$oBug->sResolution,
$oBug->sShort_desc,
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))),
($i % 2) ? "color0" : "color1");
}

8
include/distribution.php
View File

@@ -99,9 +99,11 @@ class distribution {
}
}
$hResult = query_parameters("INSERT INTO distributions (name, url, submitterId, queued) ".
"VALUES ('?', '?', '?', '?')",
$hResult = query_parameters("INSERT INTO distributions (name, url, submitTime, ".
"submitterId, queued) ".
"VALUES ('?', '?', ?, '?', '?')",
$this->sName, $this->sUrl,
"NOW()",
$_SESSION['current']->iUserId,
$this->mustBeQueued() ? "true" : "false");
if($hResult)
@@ -570,7 +572,7 @@ class distribution {
else
echo $oSubmitter->sRealname;
echo '</td>',"\n";
echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n";
echo '<td>'.date("M d Y", mysqldatetime_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n";
echo '<td>'.$oTest->sTestedRelease.'&nbsp</td>',"\n";
echo '<td>'.$oTest->sInstalls.'&nbsp</td>',"\n";
echo '<td>'.$oTest->sRuns.'&nbsp</td>',"\n";

10
include/downloadurl.php
View File

@@ -297,11 +297,13 @@ class downloadurl
return FALSE;
$hResult = query_parameters("INSERT INTO appData (versionId, type,
description, url, queued, submitterId)
VALUES('?','?','?','?','?','?')",
description, url, queued, submitTime, submitterId)
VALUES('?', '?', '?', '?', '?', ?, '?')",
$this->iVersionId, "downloadurl", $this->sDescription,
$this->sUrl, downloadurl::canEdit($this->iVersionId) ?
"false" : "true", $_SESSION['current']->iUserId);
$this->sUrl,
downloadurl::canEdit($this->iVersionId) ? "false" : "true",
"NOW()",
$_SESSION['current']->iUserId);
$this->iId = mysql_insert_id();
if(!$hResult)

8
include/monitor.php
View File

@@ -75,9 +75,11 @@ class Monitor {
return FALSE;
// create the new monitor entry
$hResult = query_parameters("INSERT INTO appMonitors (versionId, appId, userId) ".
"VALUES ('?', '?', '?')",
$this->iVersionId, $this->iAppId, $this->iUserId);
$hResult = query_parameters("INSERT INTO appMonitors (versionId, appId,".
"submitTime, userId) ".
"VALUES ('?', '?', ?, '?')",
$this->iVersionId, $this->iAppId,
"NOW()", $this->iUserId);
if($hResult)
{

12
include/note.php
View File

@@ -53,11 +53,14 @@ class Note {
*/
function create()
{
$hResult = query_parameters("INSERT INTO appNotes (versionId, noteTitle, noteDesc, submitterId) ".
"VALUES('?', '?', '?', '?')",
$hResult = query_parameters("INSERT INTO appNotes (versionId, ".
"noteTitle, noteDesc, submitterId, ".
"submitTime) ".
"VALUES('?', '?', '?', '?', ?)",
$this->iVersionId, $this->sTitle,
$this->shDescription,
$_SESSION['current']->iUserId);
$_SESSION['current']->iUserId,
"NOW()");
if($hResult)
{
@@ -154,7 +157,8 @@ class Note {
$oSubmitter = new User($this->iSubmitterId);
$sSubject = "Note $this->sTitle for $sAppName has been deleted by ".
$_SESSION['current']->sRealname;
$sMsg .= "This note was made on ".print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))." by ".$oSubmitter->sRealname."\n";
$sMsg .= "This note was made on ".print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)).
" by ".$oSubmitter->sRealname."\n";
$sMsg .= "\n";
$sMsg .= "Subject: ".$this->sTitle."\n";
$sMsg .= "\n";

5
include/screenshot.php
View File

@@ -71,11 +71,12 @@ class screenshot
function create()
{
$hResult = query_parameters("INSERT INTO appData
(versionId, type, description, queued, submitterId)
VALUES('?', '?', '?', '?', '?')",
(versionId, type, description, queued, submitTime, submitterId)
VALUES('?', '?', '?', '?', ?, '?')",
$this->iVersionId, "screenshot",
$this->sDescription,
$this->mustBeQueued() ? "true" : "false",
"NOW()",
$_SESSION['current']->iUserId);
if($hResult)
{

13
include/testData.php
View File

@@ -65,9 +65,11 @@ class testData{
{
$hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,".
"whatNotTested, testedDate, distributionId, testedRelease,".
"installs, runs, testedRating, comments, submitterId, queued)".
" VALUES('?', '?', '?', '?', '?', '?', '?', '?', '?', '?', '?',".
"'?', '?')",
"installs, runs, testedRating, comments,".
"submitTime, submitterId, queued)".
"VALUES('?', '?', '?', '?', '?', '?', '?',".
"'?', '?', '?', '?',".
"?, '?', '?')",
$this->iVersionId, $this->shWhatWorks,
$this->shWhatDoesnt,
$this->shWhatNotTested, $this->sTestedDate,
@@ -75,6 +77,7 @@ class testData{
$this->sTestedRelease, $this->sInstalls,
$this->sRuns,
$this->sTestedRating, $this->sComments,
"NOW()",
$_SESSION['current']->iUserId,
$this->mustBeQueued() ? "true" : "false");
@@ -812,7 +815,7 @@ class testData{
version::fullNameLink($oRow->versionId),
$oRow->testedRating,
$oRow->testedRelease,
print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime))),
print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))),
$oRow->testedRating);
$sReturn .= html_table_end();
@@ -1014,7 +1017,7 @@ class testData{
$bHasMaintainer = (mysql_num_rows($hMaintainers) == 0) ? false : true;
$oTableRow = new TableRow();
$oTableRow->AddCell(new TableCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime))));
$oTableRow->AddCell(new TableCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime))));
$oTableRow->AddCell(new TableCell($oUser->objectMakeLink()));
$oTableRow->AddCell(new TableCell($oApp->objectMakeLink()));
$oTableRow->AddCell(new TableCell($oVersion->objectMakeLink()));

9
include/url.php
View File

@@ -54,7 +54,8 @@ class Url {
/**
* Creates a new url.
*/
function create($sDescription = null, $sUrl = null, $iVersionId = null, $iAppId = null, $bSilent = false)
function create($sDescription = null, $sUrl = null, $iVersionId = null,
$iAppId = null, $bSilent = false)
{
global $aClean;
@@ -64,11 +65,11 @@ class Url {
$this->bQueued = true;
$hResult = query_parameters("INSERT INTO appData (appId, versionId, type,
description, queued, submitterId, url)
VALUES ('?', '?', '?', '?', '?', '?', '?')",
description, queued, submitTime, submitterId, url)
VALUES ('?', '?', '?', '?', '?', ?, '?', '?')",
$iAppId, $iVersionId, "url", $sDescription,
$this->bQueued ? "true" : "false",
$_SESSION['current']->iUserId, $sUrl);
"NOW()", $_SESSION['current']->iUserId, $sUrl);
if(!$hResult)
{

7
include/util.php
View File

@@ -44,7 +44,6 @@ function build_urlarg($vars)
return implode("&", $arr);
}
/*
* return all values of a mapping as an array
*/
@@ -56,7 +55,6 @@ function values($arr)
return $res;
}
// print the month, day, year, hour, minute, second
function print_date($sTimestamp)
{
@@ -99,10 +97,7 @@ function mysqltimestamp_to_unixtimestamp($sTimestamp)
function mysqldatetime_to_unixtimestamp($sDatetime)
{
sscanf($sDatetime, "%4s-%2s-%2s %2s:%2s:%2s",
&$y, &$m, &$d,
&$hours, &$minutes, &$seconds);
return mktime($hours,$minutes,$seconds,$m, $d, $y);
return strtotime($sDatetime);
}
function get_remote()

11
include/version.php
View File

@@ -86,10 +86,11 @@ class version {
$hResult = query_parameters("INSERT INTO appVersion
(versionName, description, maintainer_release,
maintainer_rating, appId, submitterId, queued, license)
VALUES ('?', '?', '?', '?', '?', '?', '?', '?')",
maintainer_rating, appId, submitTime, submitterId,
queued, license)
VALUES ('?', '?', '?', '?', '?', ?, '?', '?', '?')",
$this->sName, $this->sDescription, $this->sTestedRelease,
$this->sTestedRating, $this->iAppId,
$this->sTestedRating, $this->iAppId, "NOW()",
$_SESSION['current']->iUserId, $this->sQueued,
$this->sLicense);
@@ -1216,7 +1217,7 @@ class version {
$oTableRow = new TableRow();
$oTableRow->AddTextCell(version::fullNameLink($oRow->versionId));
$oTableRow->AddTextCell($oRow->description);
$oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($oRow->submitTime)));
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime)));
$oTableRow->SetClass(($i % 2) ? "color0" : "color1");
$oTable->AddRow($oTableRow);
@@ -1515,7 +1516,7 @@ class version {
$oVendor = new vendor($oApp->iVendorId);
$oTableRow = new TableRow();
$oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($this->sSubmitTime)));
$oTableRow->AddTextCell($oUser->objectMakeLink());
$oTableRow->AddTextCell($oVendor->objectMakeLink());
$oTableRow->AddTextCell($oApp->objectMakeLink());

2
include/vote.php
View File

@@ -68,7 +68,7 @@ function vote_add($iVersionId, $iSlot, $iUserId = null)
vote_remove($iSlot, $iUserId);
query_parameters("INSERT INTO appVotes (id, time, versionId, userId, slot)
VALUES (?, ?, '?', '?', '?')", "null", "null",
VALUES (?, ?, '?', '?', '?')", "null", "NOW()",
$iVersionId, $iUserId, $iSlot);
}

16
tables/appdb_tables.sql
View File

@@ -39,7 +39,7 @@ create table appFamily (
description text,
webPage varchar(100),
catId int,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false','rejected') NOT NULL default 'false',
key(appId)
@@ -56,7 +56,7 @@ create table appVersion (
description text,
maintainer_rating text,
maintainer_release text,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false','rejected') NOT NULL default 'false',
license enum('Retail','Open Source','Freeware','Demo','Shareware'),
@@ -93,7 +93,7 @@ create table appBundle (
*/
create table appHitStats (
appHitId int not null auto_increment,
time timestamp,
time datetime,
ip varchar(16),
appId int not null,
count int,
@@ -102,7 +102,7 @@ create table appHitStats (
create table catHitStats (
catHitId int not null auto_increment,
time timestamp,
time datetime,
ip varchar(16),
catId int not null,
count int,
@@ -138,7 +138,7 @@ create table appData (
type enum('screenshot', 'url', 'bug','downloadurl'),
description text,
url varchar(255) default NULL,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false','rejected') NOT NULL default 'false',
KEY id (id),
@@ -152,7 +152,7 @@ create table appData (
*/
create table appVotes (
id int not null auto_increment,
time timestamp,
time datetime,
versionId int not null,
userId int not null,
slot int not null,
@@ -171,7 +171,7 @@ create table appNotes (
noteDesc text,
versionId int not null,
submitterId int not null,
submitTime timestamp not null,
submitTime datetime not null,
key(noteId)
);
@@ -181,7 +181,7 @@ create table appNotes (
*/
create table sessionMessages (
id int not null auto_increment,
time timestamp,
time datetime,
sessionId varchar(32),
message text,
key(id),

2
tables/banner.sql
View File

@@ -6,7 +6,7 @@ CREATE TABLE banner (
alt varchar(255),
imp int not null,
clk int not null,
lastmod timestamp,
lastmod datetime,
primary key(id)
)

2
tables/buglinks.sql
View File

@@ -9,7 +9,7 @@ create table buglinks (
linkId int not null auto_increment,
bug_id int not null,
versionId int not null,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false') NOT NULL default 'false',
key(linkId),

2
tables/distributions.sql
View File

@@ -9,7 +9,7 @@ create table distributions (
distributionId int not null auto_increment,
name varchar(255) default NULL,
url varchar(255) default NULL,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false','rejected') NOT NULL default 'false',
key(distributionId),

2
tables/monitors.sql
View File

@@ -9,7 +9,7 @@ create table appMonitors (
monitorId int not null auto_increment,
appId int not null,
versionId int not null,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
userId int(11) NOT NULL default '0',
key(monitorId),
index(appid),

2
tables/session_list.sql
View File

@@ -8,6 +8,6 @@ CREATE TABLE session_list (
ip varchar(64) default NULL,
data text,
messages text,
stamp timestamp(14) NOT NULL,
stamp datetime NOT NULL,
PRIMARY KEY (session_id)
) TYPE=MyISAM;

2
tables/testResults.sql
View File

@@ -18,7 +18,7 @@ create table testResults (
runs enum('Yes','No','Not Installable') NOT NULL default 'Yes',
testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL,
comments text,
submitTime timestamp(14) NOT NULL,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
queued enum('true','false','rejected') NOT NULL default 'false',
key(testingId)

4
tables/user_list.sql
View File

@@ -3,13 +3,13 @@ use apidb;
drop table if exists user_list;
create table user_list (
stamp timestamp not null,
stamp datetime not null,
userid int not null auto_increment,
password text not null,
realname text not null,
email varchar(255) not null,
created datetime not null,
inactivity_warn_stamp timestamp not null, /* the time we warned the user */
inactivity_warn_stamp datetime not null, /* the time we warned the user */
inactivity_warned enum('true','false') NOT NULL default 'false', /* if true, we warned the user */
CVSrelease text,
unique key(userid),