From 93a14c834d2db281077e915b1a7b032d69d71d87 Mon Sep 17 00:00:00 2001 From: miker Date: Mon, 1 Nov 2010 20:59:01 +0000 Subject: [PATCH] Backporting r18561 from trunk: Make vandelay.add_field smarter about applying add rules when no target field exists before hand git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18563 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 1 + Open-ILS/src/sql/Pg/1.6.1-1.6.2-upgrade-db.sql | 1 + 2 files changed, 2 insertions(+) diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql index a9581dbb9f..a43dcbd3f4 100644 --- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql +++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql @@ -232,6 +232,7 @@ CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT for my $from_field ($source_r->field( $f )) { my @tos = $target_r->field( $f ); if (!@tos) { + next if (exists($fields{$f}{match})); my @new_fields = map { $_->clone } $source_r->field( $f ); $target_r->insert_fields_ordered( @new_fields ); } else { diff --git a/Open-ILS/src/sql/Pg/1.6.1-1.6.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/1.6.1-1.6.2-upgrade-db.sql index 7fea23c471..717184ce24 100644 --- a/Open-ILS/src/sql/Pg/1.6.1-1.6.2-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/1.6.1-1.6.2-upgrade-db.sql @@ -171,6 +171,7 @@ CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT for my $from_field ($source_r->field( $f )) { my @tos = $target_r->field( $f ); if (!@tos) { + next if (exists($fields{$f}{match})); my @new_fields = map { $_->clone } $source_r->field( $f ); $target_r->insert_fields_ordered( @new_fields ); } else { -- 2.11.0