[open-ils-commits] r18364 - in trunk/Open-ILS/src: perlmods/OpenILS/Application perlmods/OpenILS/Application/Storage/Publisher sql/Pg sql/Pg/upgrade (miker)
svn at svn.open-ils.org
svn at svn.open-ils.org
Sat Oct 16 11:32:35 EDT 2010
Author: miker
Date: 2010-10-16 11:32:32 -0400 (Sat, 16 Oct 2010)
New Revision: 18364
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0439.schema.function-bytea-index-label.sql
Modified:
trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
trunk/Open-ILS/src/sql/Pg/002.functions.config.sql
trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql
trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
Log:
use a function to wrap up escaping of solidus and casting to bytea, propogate to indexing and where/order_by
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/asset.pm 2010-10-16 15:32:32 UTC (rev 18364)
@@ -230,9 +230,9 @@
$table cn
where
not deleted
- and (cast(upper(label) as bytea) > ? or ( cn.id > ? and cast(upper(label) as bytea) = ? ))
+ and (oils_text_as_bytea(upper(label)) > ? or ( cn.id > ? and oils_text_as_bytea(upper(label)) = ? ))
and owning_lib in ($orgs)
- order by cast(upper(label) as bytea), 4, 2
+ order by oils_text_as_bytea(upper(label)), 4, 2
limit $size;
SQL
@@ -285,9 +285,9 @@
$table cn
where
not deleted
- and (cast(upper(label) as bytea) < ? or ( cn.id < ? and cast(upper(label) as bytea) = ? ))
+ and (oils_text_as_bytea(upper(label)) < ? or ( cn.id < ? and oils_text_as_bytea(upper(label)) = ? ))
and owning_lib in ($orgs)
- order by cast(upper(label) as bytea) desc, 4 desc, 2 desc
+ order by oils_text_as_bytea(upper(label)) desc, 4 desc, 2 desc
limit $size
) as bar
order by 1,4,2;
@@ -343,9 +343,9 @@
$table cn
where
not deleted
- and cast(upper(label) as bytea) < ?
+ and oils_text_as_bytea(upper(label)) < ?
and owning_lib in ($orgs)
- order by cast(upper(label) as bytea) desc, 4 desc, 2 desc
+ order by oils_text_as_bytea(upper(label)) desc, 4 desc, 2 desc
limit $topsize
) as bar
order by 1,4,2;
@@ -361,9 +361,9 @@
$table cn
where
not deleted
- and cast(upper(label) as bytea) >= ?
+ and oils_text_as_bytea(upper(label)) >= ?
and owning_lib in ($orgs)
- order by cast(upper(label) as bytea),4,2
+ order by oils_text_as_bytea(upper(label)),4,2
limit $bottomsize;
SQL
Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm 2010-10-16 15:32:32 UTC (rev 18364)
@@ -305,7 +305,7 @@
},
{ flesh => 1,
flesh_fields => { acn => [qw/record owning_lib/] },
- order_by => { acn => "cast(label_sortkey as bytea) desc, upper(label) desc, id desc, owning_lib desc" },
+ order_by => { acn => "oils_text_as_bytea(label_sortkey) desc, upper(label) desc, id desc, owning_lib desc" },
limit => $before_limit,
offset => abs($page) * $page_size - $before_offset,
}
@@ -323,7 +323,7 @@
},
{ flesh => 1,
flesh_fields => { acn => [qw/record owning_lib/] },
- order_by => { acn => "cast(label_sortkey as bytea), upper(label), id, owning_lib" },
+ order_by => { acn => "oils_text_as_bytea(label_sortkey), upper(label), id, owning_lib" },
limit => $after_limit,
offset => abs($page) * $page_size - $after_offset,
}
@@ -428,7 +428,7 @@
},
{ flesh => 1,
flesh_fields => { acn => [qw/record owning_lib/] },
- order_by => { acn => "cast(label_sortkey as bytea) desc, upper(label) desc, id desc, owning_lib desc" },
+ order_by => { acn => "oils_text_as_bytea(label_sortkey) desc, upper(label) desc, id desc, owning_lib desc" },
limit => $limit,
offset => $offset,
}
@@ -446,7 +446,7 @@
},
{ flesh => 1,
flesh_fields => { acn => [qw/record owning_lib/] },
- order_by => { acn => "cast(label_sortkey as bytea), upper(label), id, owning_lib" },
+ order_by => { acn => "oils_text_as_bytea(label_sortkey), upper(label), id, owning_lib" },
limit => $limit,
offset => $offset,
}
Modified: trunk/Open-ILS/src/sql/Pg/002.functions.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.functions.config.sql 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/sql/Pg/002.functions.config.sql 2010-10-16 15:32:32 UTC (rev 18364)
@@ -597,5 +597,9 @@
return;
$func$ LANGUAGE PLPERLU;
+CREATE OR REPLACE FUNCTION oils_text_as_bytea (TEXT) RETURNS BYTEA AS $_$
+ SELECT CAST(REGEXP_REPLACE($1, $$\\$$, $$\\\\$$, 'g') AS BYTEA);
+$_$ LANGUAGE SQL IMMUTABLE;
+
COMMIT;
Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-10-16 15:32:32 UTC (rev 18364)
@@ -70,7 +70,7 @@
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0438'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0439'); -- miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
Modified: trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/sql/Pg/040.schema.asset.sql 2010-10-16 15:32:32 UTC (rev 18364)
@@ -293,8 +293,8 @@
CREATE INDEX asset_call_number_creator_idx ON asset.call_number (creator);
CREATE INDEX asset_call_number_editor_idx ON asset.call_number (editor);
CREATE INDEX asset_call_number_dewey_idx ON asset.call_number (public.call_number_dewey(label));
-CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (cast(upper(label) as bytea),id,owning_lib);
-CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(cast(label_sortkey as bytea));
+CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(upper(label)),id,owning_lib);
+CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(oils_text_as_bytea(label_sortkey));
CREATE UNIQUE INDEX asset_call_number_label_once_per_lib ON asset.call_number (record, owning_lib, label) WHERE deleted = FALSE OR deleted IS FALSE;
CREATE RULE protect_cn_delete AS ON DELETE TO asset.call_number DO INSTEAD UPDATE asset.call_number SET deleted = TRUE WHERE OLD.id = asset.call_number.id;
CREATE TRIGGER asset_label_sortkey_trigger
Modified: trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql 2010-10-16 07:08:01 UTC (rev 18363)
+++ trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql 2010-10-16 15:32:32 UTC (rev 18364)
@@ -17770,7 +17770,7 @@
ADD COLUMN label_sortkey TEXT;
CREATE INDEX asset_call_number_label_sortkey
- ON asset.call_number(cast(label_sortkey as bytea));
+ ON asset.call_number(oils_text_as_bytea(label_sortkey));
ALTER TABLE auditor.asset_call_number_history
ADD COLUMN label_class BIGINT;
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0439.schema.function-bytea-index-label.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0439.schema.function-bytea-index-label.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0439.schema.function-bytea-index-label.sql 2010-10-16 15:32:32 UTC (rev 18364)
@@ -0,0 +1,17 @@
+
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0439'); -- miker
+
+CREATE OR REPLACE FUNCTION oils_text_as_bytea (TEXT) RETURNS BYTEA AS $_$
+ SELECT CAST(REGEXP_REPLACE($1, $$\\$$, $$\\\\$$, 'g') AS BYTEA);
+$_$ LANGUAGE SQL IMMUTABLE;
+
+
+DROP INDEX asset.asset_call_number_upper_label_id_owning_lib_idx;
+CREATE INDEX asset_call_number_upper_label_id_owning_lib_idx ON asset.call_number (oils_text_as_bytea(label),id,owning_lib);
+
+DROP INDEX asset.asset_call_number_label_sortkey;
+CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(oils_text_as_bytea(label_sortkey));
+
+COMMIT;
More information about the open-ils-commits
mailing list