Fix some SQLite problems, thanks to Costa!

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 3bf79fc609f073841b535ee619bfbd1d76d0feff..1b2379dca24557ff3f95ffd496b74d4075464cb1 100644 (file)
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -207,11 +207,12 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
         return array();
     }
 
-    $total_query = "SELECT count(DISTINCT i.id)
-                           $basequery";
-    $total_rs = serendipity_db_query($total_query, true, 'num');
+    $total_query = "SELECT count(i.id)
+                           $basequery
+                           GROUP BY i.id";
+    $total_rs = serendipity_db_query($total_query, false, 'num');
     if (is_array($total_rs)) {
-        $total = $total_rs[0];
+        $total = count($total_rs);
     }
 
     return $rs;

diff --git a/sql/db.sql b/sql/db.sql
index c9c0cf289f83863bae1a6b6e3375c953f4769ae0..197dab6f373189d7e19776ca9583bce859c55226 100644 (file)
--- a/sql/db.sql
+++ b/sql/db.sql
@@ -121,7 +121,7 @@ create table {PREFIX}references (
   entry_id int(10) {UNSIGNED} not null default '0',
   link text,
   name text,
-  type varchar(128' not null default ''
+  type varchar(128) not null default ''
 ) {UTF_8};
 
 CREATE INDEX refentry_idx ON {PREFIX}references (entry_id);
@@ -140,7 +140,7 @@ CREATE TABLE {PREFIX}exits (
   port varchar(5),
   path varchar(255),
   query varchar(255),
-  PRIMARY KEY  (host(64),path(64),day,entry_id)
+  PRIMARY KEY  (host,path,day,entry_id)
 ) {UTF_8};
 
 CREATE INDEX exits_idx ON {PREFIX}exits (entry_id,day,host);

diff --git a/sql/db_update_1.1-alpha5_1.1-alpha6_postgres.sql b/sql/db_update_1.1-alpha5_1.1-alpha6_postgres.sql
index 34836338efc1f79ad1f4713f56cdc67ce8465882..f9e1afd4a0607fbb7beb81454941921d35a60291 100644 (file)
--- a/sql/db_update_1.1-alpha5_1.1-alpha6_postgres.sql
+++ b/sql/db_update_1.1-alpha5_1.1-alpha6_postgres.sql
@@ -1,3 +1,3 @@
 @ALTER TABLE {PREFIX}exits DROP PRIMARY KEY;
 @ALTER TABLE {PREFIX}exits DROP CONSTRAINT "{prefix}exits_pkey";
-@ALTER TABLE {PREFIX}exits ADD PRIMARY KEY (entry_id, day, host(64), path(64));
+@ALTER TABLE {PREFIX}exits ADD PRIMARY KEY (entry_id, day, host, path);