diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-11-14 21:57:49 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-11-14 21:57:49 +0000 |
| commit | 46fee741b5769d755a9441fdb75d1b45f62ab186 (patch) | |
| tree | f016637f360e9fa2ae921809e56e7dec6cfc608e | |
| parent | ad74b700c49b3c6ad46a2c1a3c6fed2528fea6cf (diff) | |
| download | brdo-46fee741b5769d755a9441fdb75d1b45f62ab186.tar.gz brdo-46fee741b5769d755a9441fdb75d1b45f62ab186.tar.bz2 | |
- Patch #37589 by Cvgbe: make prefix.sh work with PostgreSQL: prefix indices properly.
| -rw-r--r-- | database/database.pgsql | 2 | ||||
| -rw-r--r-- | database/updates.inc | 2 | ||||
| -rw-r--r-- | scripts/prefix.sh | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/database/database.pgsql b/database/database.pgsql index eed12dba0..2c7e45b9c 100644 --- a/database/database.pgsql +++ b/database/database.pgsql @@ -580,7 +580,7 @@ CREATE TABLE search_dataset ( type varchar(16) default NULL, data text NOT NULL default '' ); -CREATE INDEX search_dataset_sid_type_idx on search_dataset(sid, type); +CREATE INDEX search_dataset_sid_type_idx ON search_dataset(sid, type); -- -- Table structure for search_index diff --git a/database/updates.inc b/database/updates.inc index ec6faf022..20e11e835 100644 --- a/database/updates.inc +++ b/database/updates.inc @@ -1005,7 +1005,7 @@ function update_150() { sid integer NOT NULL default '0', type varchar(16) default NULL, data text NOT NULL default '')"); - $ret[] = update_sql("CREATE INDEX {search_dataset}_sid_type_idx on {search_dataset}(sid, type)"); + $ret[] = update_sql("CREATE INDEX {search_dataset}_sid_type_idx ON {search_dataset}(sid, type)"); $ret[] = update_sql("CREATE TABLE {search_index} ( word varchar(50) NOT NULL default '', diff --git a/scripts/prefix.sh b/scripts/prefix.sh index bc5fa9631..f33ff7b07 100644 --- a/scripts/prefix.sh +++ b/scripts/prefix.sh @@ -14,13 +14,13 @@ EOH exit 1; fi -PRFX=$1; -sed "s/^CREATE TABLE /CREATE TABLE $PRFX/; - s/^INSERT INTO /INSERT INTO $PRFX/; - s/^REPLACE /REPLACE $PRFX/; - s/^ALTER TABLE /ALTER TABLE $PRFX/; - s/^CREATE SEQUENCE /CREATE SEQUENCE $PRFX/; - s/^ALTER SEQUENCE /ALTER SEQUENCE $PRFX/; - s/^CREATE INDEX \(.*\) ON /CREATE INDEX \\1 ON $PRFX/; +PREFIX=$1; +sed "s/^CREATE TABLE /CREATE TABLE $PREFIX/; + s/^INSERT INTO /INSERT INTO $PREFIX/; + s/^REPLACE /REPLACE $PREFIX/; + s/^ALTER TABLE /ALTER TABLE $PREFIX/; + s/^CREATE SEQUENCE /CREATE SEQUENCE $PREFIX/; + s/^ALTER SEQUENCE /ALTER SEQUENCE $PREFIX/; + s/^CREATE INDEX \(.*\) ON /CREATE INDEX $PREFIX\\1 ON $PREFIX/; " $2 |