[php-blog-cvs] serendipity serendipity_db_mysqli.inc.php,1.4,1.5 serendipity_db_mysql.inc.php,1.22,1.23 serendipity_db_postgres.inc.php,1.19,1.20 serendipity_db_sqlite.inc.php,1.10,1.11 NEWS,1.246,1.247

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19153

Modified Files:
	serendipity_db_mysqli.inc.php serendipity_db_mysql.inc.php 
	serendipity_db_postgres.inc.php serendipity_db_sqlite.inc.php 
	NEWS 
Log Message:
PGSql does not allow unlimited text-indices or duplicate index names on ANY
table of a database. Isn't that sweet? :-)
As I don't know a cool method to fix existing keys (apart from jtates method
of using the 0.7 update file) I'll leave it fixed only for fresh or > 0.6.9
update installations. CVS users should have means to fix it themselves; for
MySQL the index names impose no problem.


Index: serendipity_db_mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysqli.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_db_mysqli.inc.php	26 Aug 2004 10:51:28 -0000	1.4
+++ serendipity_db_mysqli.inc.php	2 Nov 2004 09:07:03 -0000	1.5
@@ -100,9 +100,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- NEWS	29 Oct 2004 11:37:23 -0000	1.246
+++ NEWS	2 Nov 2004 09:07:03 -0000	1.247
@@ -3,6 +3,10 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed PostgreSQL index key names (names are now unique, and
+      combined indizes on the entries text-columns are no longer set)
+      (jtate, garvinhicking)
+
     * Fixed karma plugin to not track clicks when previewing an entry
       (garvinhicking)
 

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_db_mysql.inc.php	26 Aug 2004 10:51:28 -0000	1.22
+++ serendipity_db_mysql.inc.php	2 Nov 2004 09:07:03 -0000	1.23
@@ -100,9 +100,9 @@
 
 function serendipity_db_schema_import($query) {
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}',
-        '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
+        '{UNSIGNED}', '{FULLTEXT}', '{FULLTEXT_MYSQL}', '{BOOLEAN}');
     static $replace = array('int(11) not null auto_increment', 'primary key',
-        'unsigned'  , 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
+        'unsigned'  , 'FULLTEXT', 'FULLTEXT', 'enum (\'true\', \'false\') NOT NULL default \'true\'');
 
     return serendipity_db_query(str_replace($search, $replace, $query));
 }

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_db_sqlite.inc.php	30 Aug 2004 09:29:23 -0000	1.10
+++ serendipity_db_sqlite.inc.php	2 Nov 2004 09:07:03 -0000	1.11
@@ -154,6 +154,10 @@
     static $search  = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
     static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }
 

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_db_postgres.inc.php	13 Oct 2004 08:57:52 -0000	1.19
+++ serendipity_db_postgres.inc.php	2 Nov 2004 09:07:03 -0000	1.20
@@ -122,6 +122,10 @@
     static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
         'int4', 'int4', 'int4');
 
+    if (stristr($query, '{FULLTEXT_MYSQL}')) {
+        return true;
+    }
+
     return serendipity_db_query(str_replace($search, $replace, $query));
 }