blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add workaround for psql 8.3 stricter typechecking on SUBSTRING() (refs #201)

Browse source
This commit is contained in:
Andrew Dolgov 2008-04-21 05:53:19 +01:00
parent f8232151a0
commit fc2b26a6a2
12 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend.php
View file

@ -359,11 +359,11 @@
print "<div class='infoBoxContents'>"; print "<div class='infoBoxContents'>";
$result = db_query($link, "SELECT login, $result = db_query($link, "SELECT login,
SUBSTRING(last_login,1,16) AS last_login, ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
access_level, access_level,
(SELECT COUNT(int_id) FROM ttrss_user_entries (SELECT COUNT(int_id) FROM ttrss_user_entries
WHERE owner_uid = id) AS stored_articles, WHERE owner_uid = id) AS stored_articles,
SUBSTRING(created,1,16) AS created ".SUBSTRING_FOR_DATE."(created,1,16) AS created
FROM ttrss_users FROM ttrss_users
WHERE id = '$uid'"); WHERE id = '$uid'");

28
functions.php
View file

@ -8,6 +8,12 @@
require_once 'config.php'; require_once 'config.php';
if (DB_TYPE == "pgsql") {
define('SUBSTRING_FOR_DATE', 'SUBSTRING_FOR_DATE');
} else {
define('SUBSTRING_FOR_DATE', 'SUBSTRING');
}
/** /**
* Return available translations names. * Return available translations names.
* *
@ -329,7 +335,7 @@
} }
$result = db_query($link, "SELECT feed_url,id, $result = db_query($link, "SELECT feed_url,id,
SUBSTRING(last_updated,1,19) AS last_updated, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated,
update_interval FROM ttrss_feeds WHERE owner_uid = '$user_id' update_interval FROM ttrss_feeds WHERE owner_uid = '$user_id'
ORDER BY $q_order"); ORDER BY $q_order");
@ -2605,7 +2611,7 @@
$old_counters = $_SESSION["fctr_last_value"]; $old_counters = $_SESSION["fctr_last_value"];
/* $result = db_query($link, "SELECT id,last_error,parent_feed, /* $result = db_query($link, "SELECT id,last_error,parent_feed,
SUBSTRING(last_updated,1,19) AS last_updated, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated,
(SELECT count(id) (SELECT count(id)
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND WHERE feed_id = ttrss_feeds.id AND
@ -2616,7 +2622,7 @@
$query = "SELECT ttrss_feeds.id, $query = "SELECT ttrss_feeds.id,
ttrss_feeds.title, ttrss_feeds.title,
SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated, ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
last_error, last_error,
COUNT(ttrss_entries.id) AS count COUNT(ttrss_entries.id) AS count
FROM ttrss_feeds FROM ttrss_feeds
@ -3259,10 +3265,10 @@
ttrss_entries.id,ttrss_entries.title, ttrss_entries.id,ttrss_entries.title,
updated, updated,
unread,feed_id,marked,published,link,last_read, unread,feed_id,marked,published,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
$content_query_part $content_query_part
SUBSTRING(updated,1,19) as updated_noms, ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms,
author author
FROM FROM
ttrss_entries,ttrss_user_entries,ttrss_feeds ttrss_entries,ttrss_user_entries,ttrss_feeds
@ -3291,10 +3297,10 @@
updated, updated,
unread,feed_id, unread,feed_id,
marked,link,last_read, marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
$content_query_part $content_query_part
SUBSTRING(updated,1,19) as updated_noms ".SUBSTRING_FOR_DATE."(updated,1,19) as updated_noms
FROM FROM
ttrss_entries,ttrss_user_entries,ttrss_tags ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE WHERE
@ -3533,7 +3539,7 @@
ttrss_user_entries.ref_id, ttrss_user_entries.ref_id,
link, link,
SUBSTRING(content, 1, 120) AS excerpt, SUBSTRING(content, 1, 120) AS excerpt,
SUBSTRING(last_updated,1,19) AS last_updated ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM FROM
ttrss_user_entries,ttrss_entries,ttrss_feeds ttrss_user_entries,ttrss_entries,ttrss_feeds
WHERE WHERE
@ -4165,7 +4171,7 @@
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
$result = db_query($link, "SELECT ttrss_feeds.*, $result = db_query($link, "SELECT ttrss_feeds.*,
SUBSTRING(last_updated,1,19) AS last_updated_noms, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND unread = true WHERE feed_id = ttrss_feeds.id AND unread = true
AND $age_qpart AND $age_qpart
@ -4497,7 +4503,7 @@
} }
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id, $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
SUBSTRING(updated,1,16) as updated, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
num_comments, num_comments,
author author
@ -5338,7 +5344,7 @@
// We search for feed needing update. // We search for feed needing update.
$result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid, $result = db_query($link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id, ttrss_feeds.owner_uid,
SUBSTRING(ttrss_feeds.last_updated,1,19) AS last_updated, ".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
ttrss_feeds.update_interval ttrss_feeds.update_interval
FROM FROM
ttrss_feeds, ttrss_users, ttrss_user_prefs ttrss_feeds, ttrss_users, ttrss_user_prefs

4
mobile/functions.php
View file

@ -113,7 +113,7 @@
} }
$result = db_query($link, "SELECT ttrss_feeds.*, $result = db_query($link, "SELECT ttrss_feeds.*,
SUBSTRING(last_updated,1,19) AS last_updated_noms, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,
(SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries
WHERE feed_id = ttrss_feeds.id AND WHERE feed_id = ttrss_feeds.id AND
ttrss_user_entries.ref_id = ttrss_entries.id AND ttrss_user_entries.ref_id = ttrss_entries.id AND
@ -601,7 +601,7 @@
$result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id, $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id,
marked,published, marked,published,
SUBSTRING(updated,1,16) as updated, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
num_comments, num_comments,
author author

2
modules/pref-feed-browser.php
View file

@ -16,7 +16,7 @@
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
feed_url,site_url, feed_url,site_url,
SUBSTRING(last_updated,1,19) AS last_updated ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE id = '$id' AND FROM ttrss_feeds WHERE id = '$id' AND
auth_login = '' AND auth_pass = '' AND private IS NOT true"); auth_login = '' AND auth_pass = '' AND private IS NOT true");

2
modules/pref-feeds.php
View file

@ -804,7 +804,7 @@
if ($_GET["slat"] == "true") { if ($_GET["slat"] == "true") {
$show_last_article_info = true; $show_last_article_info = true;
$show_last_article_checked = "checked"; $show_last_article_checked = "checked";
$show_last_article_qpart = ", (SELECT SUBSTRING(MAX(updated),1,16) FROM ttrss_user_entries, $show_last_article_qpart = ", (SELECT ".SUBSTRING_FOR_DATE."(MAX(updated),1,16) FROM ttrss_user_entries,
ttrss_entries WHERE ref_id = ttrss_entries.id ttrss_entries WHERE ref_id = ttrss_entries.id
AND feed_id = F1.id) AS last_article"; AND feed_id = F1.id) AS last_article";
} else if ($feeds_sort == "last_article") { } else if ($feeds_sort == "last_article") {

2
modules/pref-users.php
View file

@ -197,7 +197,7 @@
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id,login,access_level,email, id,login,access_level,email,
SUBSTRING(last_login,1,16) as last_login ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login
FROM FROM
ttrss_users ttrss_users
ORDER BY $sort"); ORDER BY $sort");

2
sanity_check.php
View file

@ -2,7 +2,7 @@
require_once "functions.php"; require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 15); define('EXPECTED_CONFIG_VERSION', 15);
define('SCHEMA_VERSION', 34); define('SCHEMA_VERSION', 35);
if (!file_exists("config.php")) { if (!file_exists("config.php")) {
print __("<b>Fatal Error</b>: You forgot to copy print __("<b>Fatal Error</b>: You forgot to copy

2
schema/ttrss_schema_mysql.sql
View file

@ -205,7 +205,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) TYPE=InnoDB; create table ttrss_version (schema_version int not null) TYPE=InnoDB;
insert into ttrss_version values (34); insert into ttrss_version values (35);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,

5
schema/ttrss_schema_pgsql.sql
View file

@ -18,6 +18,7 @@ drop table ttrss_feed_categories;
drop table ttrss_users; drop table ttrss_users;
drop table ttrss_themes; drop table ttrss_themes;
drop table ttrss_sessions; drop table ttrss_sessions;
drop function SUBSTRING_FOR_DATE(timestamp, int, int);
begin; begin;
@ -184,7 +185,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid);
create table ttrss_version (schema_version int not null); create table ttrss_version (schema_version int not null);
insert into ttrss_version values (34); insert into ttrss_version values (35);
create table ttrss_enclosures (id serial not null primary key, create table ttrss_enclosures (id serial not null primary key,
content_url text not null, content_url text not null,
@ -317,4 +318,6 @@ create table ttrss_sessions (id varchar(250) unique not null primary key,
create index ttrss_sessions_expire_index on ttrss_sessions(expire); create index ttrss_sessions_expire_index on ttrss_sessions(expire);
create function SUBSTRING_FOR_DATE(timestamp, int, int) RETURNS text AS 'SELECT SUBSTRING(CAST($1 AS text), $2, $3)' LANGUAGE 'sql';
commit; commit;

1
schema/versions/mysql/35.sql Normal file
View file

@ -0,0 +1 @@
update ttrss_version set schema_version = 35;

3
schema/versions/pgsql/35.sql Normal file
View file

@ -0,0 +1,3 @@
create function SUBSTRING_FOR_DATE(timestamp, int, int) RETURNS text AS 'SELECT SUBSTRING(CAST($1 AS text), $2, $3)' LANGUAGE 'sql';
update ttrss_version set schema_version = 35;

4
xml-rpc.php
View file

@ -175,7 +175,7 @@
if (authenticate_user($link, $login, $pass)) { if (authenticate_user($link, $login, $pass)) {
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, feed_url, cat_id, title, SUBSTRING(last_updated,1,19) AS last_updated id, feed_url, cat_id, title, ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE owner_uid = " . FROM ttrss_feeds WHERE owner_uid = " .
$_SESSION["uid"]); $_SESSION["uid"]);
@ -341,7 +341,7 @@
$query = "SELECT title,link,content,feed_id,comments,int_id, $query = "SELECT title,link,content,feed_id,comments,int_id,
marked,unread, marked,unread,
SUBSTRING(updated,1,16) as updated, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
author author
FROM ttrss_entries,ttrss_user_entries FROM ttrss_entries,ttrss_user_entries
WHERE id = '$article_id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"] ; WHERE id = '$article_id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"] ;