[open-ils-commits] r18334 - in branches/rel_2_0/Open-ILS/src: perlmods/OpenILS/Application sql/Pg sql/Pg/upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-10-14 15:18:58 -0400 (Thu, 14 Oct 2010)
New Revision: 18334

Added:
   branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0437.schema.bytea-index-label_sortkey.sql
Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
   branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql
   branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
Log:
cast label_sortkey to bytea in order to get ascii-betical sorting in any locale, even C. stupid glibc ...

Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-10-14 19:18:11 UTC (rev 18333)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-10-14 19:18:58 UTC (rev 18334)
@@ -305,7 +305,7 @@
 			},
 			{ flesh		=> 1,
 			  flesh_fields	=> { acn => [qw/record owning_lib/] },
-			  order_by	=> { acn => "label_sortkey desc, upper(label) desc, id desc, owning_lib desc" },
+			  order_by	=> { acn => "cast(label_sortkey as bytea) 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 => "label_sortkey, upper(label), id, owning_lib" },
+			  order_by	=> { acn => "cast(label_sortkey as bytea), 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 => "label_sortkey, upper(label) desc, id desc, owning_lib desc" },
+			  order_by	=> { acn => "cast(label_sortkey as bytea) 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 => "label_sortkey, upper(label), id, owning_lib" },
+			  order_by	=> { acn => "cast(label_sortkey as bytea), upper(label), id, owning_lib" },
 			  limit		=> $limit,
 			  offset	=> $offset,
 			}

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-10-14 19:18:11 UTC (rev 18333)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-10-14 19:18:58 UTC (rev 18334)
@@ -70,7 +70,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0436'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0437'); -- miker
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql	2010-10-14 19:18:11 UTC (rev 18333)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/040.schema.asset.sql	2010-10-14 19:18:58 UTC (rev 18334)
@@ -294,7 +294,7 @@
 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 (upper(label),id,owning_lib);
-CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(label_sortkey);
+CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(cast(label_sortkey as bytea));
 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: branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-10-14 19:18:11 UTC (rev 18333)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-10-14 19:18:58 UTC (rev 18334)
@@ -17770,7 +17770,7 @@
 	ADD COLUMN label_sortkey TEXT;
 
 CREATE INDEX asset_call_number_label_sortkey
-	ON asset.call_number(label_sortkey);
+	ON asset.call_number(cast(label_sortkey as bytea));
 
 ALTER TABLE auditor.asset_call_number_history
 	ADD COLUMN label_class BIGINT;

Copied: branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0437.schema.bytea-index-label_sortkey.sql (from rev 18333, trunk/Open-ILS/src/sql/Pg/upgrade/0437.schema.bytea-index-label_sortkey.sql)
===================================================================
--- branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0437.schema.bytea-index-label_sortkey.sql	                        (rev 0)
+++ branches/rel_2_0/Open-ILS/src/sql/Pg/upgrade/0437.schema.bytea-index-label_sortkey.sql	2010-10-14 19:18:58 UTC (rev 18334)
@@ -0,0 +1,9 @@
+
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0437'); -- miker
+
+DROP INDEX asset.asset_call_number_label_sortkey;
+CREATE INDEX asset_call_number_label_sortkey ON asset.call_number(cast(label_sortkey as bytea));
+
+COMMIT;