[open-ils-commits] r16619 - in trunk/Open-ILS: examples src/sql/Pg src/sql/Pg/upgrade (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-06-07 15:31:05 -0400 (Mon, 07 Jun 2010)
New Revision: 16619

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0298.schema.xbet-left-operand.sql
Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/008.schema.query.sql
Log:
Add the left_operand column to the query.expr_xbet view
(correcting an oversight).

M    Open-ILS/src/sql/Pg/002.schema.config.sql
M    Open-ILS/src/sql/Pg/008.schema.query.sql
A    Open-ILS/src/sql/Pg/upgrade/0298.schema.xbet-left-operand.sql
M    Open-ILS/examples/fm_IDL.xml


Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2010-06-07 18:41:21 UTC (rev 16618)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2010-06-07 19:31:05 UTC (rev 16619)
@@ -6988,10 +6988,12 @@
 			<field reporter:label="Is Parenthesized" name="parenthesize" reporter:datatype="bool"/>
 			<field reporter:label="Parent Expression" name="parent_expr" reporter:datatype="link"/>
 			<field reporter:label="Sequence Number" name="seq_no" reporter:datatype="int"/>
+			<field reporter:label="Left Operand" name="left_operand" reporter:datatype="link"/>
 			<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
 		</fields>
 		<links>
 			<link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+			<link field="left_operand" reltype="has_a" key="id" map="" class="qxp"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 		</permacrud>

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-06-07 18:41:21 UTC (rev 16618)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-06-07 19:31:05 UTC (rev 16619)
@@ -65,7 +65,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0297'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0298'); -- Scott McKellar
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/008.schema.query.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/008.schema.query.sql	2010-06-07 18:41:21 UTC (rev 16618)
+++ trunk/Open-ILS/src/sql/Pg/008.schema.query.sql	2010-06-07 19:31:05 UTC (rev 16619)
@@ -284,6 +284,7 @@
 		parenthesize,
 		parent_expr,
 		seq_no,
+		left_operand,
 		negate
     FROM
         query.expression
@@ -299,6 +300,7 @@
 		parenthesize,
 		parent_expr,
 		seq_no,
+		left_operand,
 		negate
     ) VALUES (
         COALESCE(NEW.id, NEXTVAL('query.expression_id_seq'::REGCLASS)),
@@ -306,6 +308,7 @@
         COALESCE(NEW.parenthesize, FALSE),
         NEW.parent_expr,
         COALESCE(NEW.seq_no, 1),
+		NEW.left_operand,
 		COALESCE(NEW.negate, false)
     );
 
@@ -317,6 +320,7 @@
         parenthesize = NEW.parenthesize,
         parent_expr = NEW.parent_expr,
         seq_no = NEW.seq_no,
+		left_operand = NEW.left_operand,
 		negate = NEW.negate
     WHERE
         id = OLD.id;

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0298.schema.xbet-left-operand.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0298.schema.xbet-left-operand.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0298.schema.xbet-left-operand.sql	2010-06-07 19:31:05 UTC (rev 16619)
@@ -0,0 +1,61 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0298'); -- Scott McKellar
+
+-- Create updatable view for BETWEEN expressions
+
+DROP VIEW query.expr_xbet CASCADE;
+
+CREATE OR REPLACE VIEW query.expr_xbet AS
+    SELECT
+		id,
+		parenthesize,
+		parent_expr,
+		seq_no,
+		left_operand,
+		negate
+    FROM
+        query.expression
+    WHERE
+        type = 'xbet';
+
+CREATE OR REPLACE RULE query_expr_xbet_insert_rule AS
+    ON INSERT TO query.expr_xbet
+    DO INSTEAD
+    INSERT INTO query.expression (
+		id,
+		type,
+		parenthesize,
+		parent_expr,
+		seq_no,
+		left_operand,
+		negate
+    ) VALUES (
+        COALESCE(NEW.id, NEXTVAL('query.expression_id_seq'::REGCLASS)),
+        'xbet',
+        COALESCE(NEW.parenthesize, FALSE),
+        NEW.parent_expr,
+        COALESCE(NEW.seq_no, 1),
+		NEW.left_operand,
+		COALESCE(NEW.negate, false)
+    );
+
+CREATE OR REPLACE RULE query_expr_xbet_update_rule AS
+    ON UPDATE TO query.expr_xbet
+    DO INSTEAD
+    UPDATE query.expression SET
+        id = NEW.id,
+        parenthesize = NEW.parenthesize,
+        parent_expr = NEW.parent_expr,
+        seq_no = NEW.seq_no,
+		left_operand = NEW.left_operand,
+		negate = NEW.negate
+    WHERE
+        id = OLD.id;
+
+CREATE OR REPLACE RULE query_expr_xbet_delete_rule AS
+    ON DELETE TO query.expr_xbet
+    DO INSTEAD
+    DELETE FROM query.expression WHERE id = OLD.id;
+
+COMMIT;