mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Autoincrement for sqlite3 (#180)

Browse Source
This commit is contained in:
onli
2014-06-09 21:56:43 +02:00
parent 48f820cc33
commit 7b21150c10
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@ -3,6 +3,9 @@
Version 2.0-beta3 () Version 2.0-beta3 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Support added in serendipity_db_schema_import for sqlite
autoincrement
* Remove Google Reader button from syndication plugin options * Remove Google Reader button from syndication plugin options
* Add subToMe-button to syndication plugin and change its defaults * Add subToMe-button to syndication plugin and change its defaults

3
include/db/pdo-sqlite.inc.php
View File

@ -290,13 +290,14 @@ function &serendipity_db_query($sql, $single = false, $result_type = "both", $re
*/ */
function serendipity_db_schema_import($query) { function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}'); static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT'); static $replace = array('INTEGER AUTOINCREMENT', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');
if (stristr($query, '{FULLTEXT_MYSQL}')) { if (stristr($query, '{FULLTEXT_MYSQL}')) {
return true; return true;
} }
$query = trim(str_replace($search, $replace, $query)); $query = trim(str_replace($search, $replace, $query));
$query = str_replace('INTEGER AUTOINCREMENT PRIMARY KEY', 'INTEGER PRIMARY KEY AUTOINCREMENT', $query);
if ($query[0] == '@') { if ($query[0] == '@') {
// Errors are expected to happen (like duplicate index creation) // Errors are expected to happen (like duplicate index creation)
return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true);

3
include/db/sqlite3.inc.php
View File

@ -343,13 +343,14 @@ function serendipity_db_probe($hash, &$errs)
function serendipity_db_schema_import($query) function serendipity_db_schema_import($query)
{ {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}'); static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}', '{UTF_8}', '{TEXT}');
static $replace = array('INTEGER', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT'); static $replace = array('INTEGER AUTOINCREMENT', 'PRIMARY KEY', '', '', 'BOOLEAN NOT NULL', '', 'LONGTEXT');
if (stristr($query, '{FULLTEXT_MYSQL}')) { if (stristr($query, '{FULLTEXT_MYSQL}')) {
return true; return true;
} }
$query = trim(str_replace($search, $replace, $query)); $query = trim(str_replace($search, $replace, $query));
$query = str_replace('INTEGER AUTOINCREMENT PRIMARY KEY', 'INTEGER PRIMARY KEY AUTOINCREMENT', $query);
if ($query[0] == '@') { if ($query[0] == '@') {
// Errors are expected to happen (like duplicate index creation) // Errors are expected to happen (like duplicate index creation)
return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true); return serendipity_db_query(substr($query, 1), false, 'both', false, false, false, true);