Fix the upgrade script that adds ingest normalizer schema changes

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14397 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/upgrade/0032.ingest-normalizers.sql b/Open-ILS/src/sql/Pg/upgrade/0032.ingest-normalizers.sql
deleted file mode 100644 (file)
index 2fdd6cd..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/0032.ingest-normalizers.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('0032'); -- miker
-
--- Some handy functions, based on existing ones, to provide optional ingest normalization
-
-CREATE OR REPLACE FUNCTION public.left_trunc( TEXT, INT ) RETURNS TEXT AS $func$
-       SELECT SUBSTRING($1,$2);
-$func$ LANGUAGE SQL STRICT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION public.right_trunc( TEXT, INT ) RETURNS TEXT AS $func$
-       SELECT SUBSTRING($1,1,$2);
-$func$ LANGUAGE SQL STRICT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION public.naco_normalize_keep_comma( TEXT ) RETURNS TEXT AS $func$
-       SELECT public.naco_normalize($1,'a');
-$func$ LANGUAGE SQL STRICT IMMUTABLE;
-
-CREATE OR REPLACE FUNCTION public.split_date_range( TEXT ) RETURNS TEXT AS $func$
-       SELECT REGEXP_REPLACE( $1, E'(\\d{4})-(\\d{4})', E'\\1 \\2', 'g' );
-$func$ LANGUAGE SQL STRICT IMMUTABLE;
-
--- And ... a table in which to register them
-
-CREATE TABLE config.index_normalizer (
-       id              SERIAL  PRIMARY KEY,
-       name            TEXT    UNIQUE NOT NULL,
-       func            TEXT    NOT NULL,
-       param_count     INT     NOT NULL DEFAULT 0
-);
-
-CREATE TABLE config.metabib_field_index_norm_map (
-       id      SERIAL  PRIMARY KEY,
-       field   INT     NOT NULL REFERENCES config.metabib_field (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       norm    INT     NOT NULL REFERENCES config.index_normalizer (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-       params  TEXT,
-       pos     INT     NOT NULL DEFAULT 0
-);
-
-COMMIT;
-

diff --git a/Open-ILS/src/sql/Pg/upgrade/0032.schema.ingest-normalizers.sql b/Open-ILS/src/sql/Pg/upgrade/0032.schema.ingest-normalizers.sql
new file mode 100644 (file)
index 0000000..8412ccf
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0032.schema.ingest-normalizers.sql
@@ -0,0 +1,45 @@
+-- ARG! need to rid ourselves of the broken table definition ... this mechanism is not ideal, sorry.
+DROP TABLE config.index_normalizer CASCADE;
+
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0032'); -- miker
+
+-- Some handy functions, based on existing ones, to provide optional ingest normalization
+
+CREATE OR REPLACE FUNCTION public.left_trunc( TEXT, INT ) RETURNS TEXT AS $func$
+       SELECT SUBSTRING($1,$2);
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION public.right_trunc( TEXT, INT ) RETURNS TEXT AS $func$
+       SELECT SUBSTRING($1,1,$2);
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION public.naco_normalize_keep_comma( TEXT ) RETURNS TEXT AS $func$
+       SELECT public.naco_normalize($1,'a');
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
+
+CREATE OR REPLACE FUNCTION public.split_date_range( TEXT ) RETURNS TEXT AS $func$
+       SELECT REGEXP_REPLACE( $1, E'(\\d{4})-(\\d{4})', E'\\1 \\2', 'g' );
+$func$ LANGUAGE SQL STRICT IMMUTABLE;
+
+-- And ... a table in which to register them
+
+CREATE TABLE config.index_normalizer (
+       id              SERIAL  PRIMARY KEY,
+       name            TEXT    UNIQUE NOT NULL,
+       name            TEXT    UNIQUE NOT NULL,
+       func            TEXT    NOT NULL,
+       param_count     INT     NOT NULL DEFAULT 0
+);
+
+CREATE TABLE config.metabib_field_index_norm_map (
+       id      SERIAL  PRIMARY KEY,
+       field   INT     NOT NULL REFERENCES config.metabib_field (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+       norm    INT     NOT NULL REFERENCES config.index_normalizer (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+       params  TEXT,
+       pos     INT     NOT NULL DEFAULT 0
+);
+
+COMMIT;
+