Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19713
Modified Files:
Tag: branch-smarty
NEWS serendipity_db_mysql.inc.php
serendipity_db_mysqli.inc.php serendipity_db_postgres.inc.php
serendipity_db_sqlite.inc.php
Log Message:
MFH
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.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- serendipity_db_mysqli.inc.php 26 Aug 2004 10:51:28 -0000 1.4
+++ serendipity_db_mysqli.inc.php 2 Nov 2004 09:08:31 -0000 1.4.2.1
@@ -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_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -u -d -r1.22.2.3 -r1.22.2.4
--- serendipity_db_mysql.inc.php 12 Oct 2004 21:00:11 -0000 1.22.2.3
+++ serendipity_db_mysql.inc.php 2 Nov 2004 09:08:31 -0000 1.22.2.4
@@ -104,9 +104,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.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- serendipity_db_sqlite.inc.php 30 Aug 2004 09:29:23 -0000 1.10
+++ serendipity_db_sqlite.inc.php 2 Nov 2004 09:08:31 -0000 1.10.2.1
@@ -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.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- serendipity_db_postgres.inc.php 13 Oct 2004 09:31:15 -0000 1.18.2.1
+++ serendipity_db_postgres.inc.php 2 Nov 2004 09:08:31 -0000 1.18.2.2
@@ -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));
}
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.42
retrieving revision 1.214.2.43
diff -u -d -r1.214.2.42 -r1.214.2.43
--- NEWS 29 Oct 2004 11:37:36 -0000 1.214.2.42
+++ NEWS 2 Nov 2004 09:08:31 -0000 1.214.2.43
@@ -56,6 +56,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)
|
