[open-ils-commits] r16521 - in trunk/Open-ILS: examples src/sql/Pg src/sql/Pg/upgrade (scottmk)
svn at svn.open-ils.org
svn at svn.open-ils.org
Thu May 27 12:10:53 EDT 2010
Author: scottmk
Date: 2010-05-27 12:10:50 -0400 (Thu, 27 May 2010)
New Revision: 16521
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0280.schema.query-xser.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 new expression type 'xser' to represent series expressions,
i.e. a series of expressions separated by operators, such as a
chain of ANDed conditions.
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/0280.schema.query-xser.sql
M Open-ILS/examples/fm_IDL.xml
Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml 2010-05-27 16:06:43 UTC (rev 16520)
+++ trunk/Open-ILS/examples/fm_IDL.xml 2010-05-27 16:10:50 UTC (rev 16521)
@@ -6864,7 +6864,7 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
<link field="subquery" reltype="has_a" key="id" map="" class="qsq"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
@@ -6899,8 +6899,8 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="function_id" reltype="might_have" key="id" map="" class="qfs"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="function_id" reltype="has_a" key="id" map="" class="qfs"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
@@ -6917,9 +6917,9 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="left_operand" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="subquery" reltype="might_have" key="id" map="" class="qsq"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="left_operand" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="subquery" reltype="has_a" key="id" map="" class="qsq"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
@@ -6935,8 +6935,8 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="left_operand" reltype="might_have" key="id" map="" class="qxp"/>
+ <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>
@@ -6951,7 +6951,7 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
@@ -6966,7 +6966,7 @@
<field reporter:label="Literal" name="literal" reporter:datatype="text"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
@@ -6984,14 +6984,30 @@
<field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="left_operand" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="right_operand" reltype="might_have" key="id" map="" class="qxp"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="left_operand" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="right_operand" reltype="has_a" key="id" map="" class="qxp"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
</class>
+ <class id="xser" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="query::expr_xser" oils_persist:tablename="query.expr_xser" reporter:label="Operator Expression">
+ <fields oils_persist:primary="id" oils_persist:sequence="expression_id_seq">
+ <field reporter:label="Expression ID" name="id" reporter:datatype="id"/>
+ <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="Operator" name="operator" reporter:datatype="text"/>
+ <field reporter:label="Negate?" name="negate" reporter:datatype="bool"/>
+ </fields>
+ <links>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+ </links>
+ <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+ </permacrud>
+ </class>
+
<class id="xstr" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="query::expr_xstr" oils_persist:tablename="query.expr_xstr" reporter:label="String Expression">
<fields oils_persist:primary="id" oils_persist:sequence="expression_id_seq">
<field reporter:label="Expression ID" name="id" reporter:datatype="id"/>
@@ -7001,7 +7017,7 @@
<field reporter:label="Literal" name="literal" reporter:datatype="text"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
</links>
<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
</permacrud>
@@ -7016,8 +7032,8 @@
<field reporter:label="Subquery" name="subquery" reporter:datatype="link"/>
</fields>
<links>
- <link field="parent_expr" reltype="might_have" key="id" map="" class="qxp"/>
- <link field="subquery" reltype="might_have" key="id" map="" class="qsq"/>
+ <link field="parent_expr" reltype="has_a" key="id" map="" class="qxp"/>
+ <link field="subquery" reltype="has_a" key="id" map="" class="qsq"/>
</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-05-27 16:06:43 UTC (rev 16520)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2010-05-27 16:10:50 UTC (rev 16521)
@@ -65,7 +65,7 @@
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0279'); -- atz / senator
+INSERT INTO config.upgrade_log (version) VALUES ('0280'); -- 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-05-27 16:06:43 UTC (rev 16520)
+++ trunk/Open-ILS/src/sql/Pg/008.schema.query.sql 2010-05-27 16:10:50 UTC (rev 16521)
@@ -138,6 +138,7 @@
'xnull', -- null
'xnum', -- number
'xop', -- operator
+ 'xser', -- series
'xstr', -- string
'xsubq' -- subquery
) ),
@@ -1085,6 +1086,61 @@
DO INSTEAD
DELETE FROM query.expression WHERE id = OLD.id;
+-- Create updatable view for series expressions,
+-- i.e. series of expressions separated by operators
+
+CREATE OR REPLACE VIEW query.expr_xser AS
+ SELECT
+ id,
+ parenthesize,
+ parent_expr,
+ seq_no,
+ operator,
+ negate
+ FROM
+ query.expression
+ WHERE
+ type = 'xser';
+
+CREATE OR REPLACE RULE query_expr_xser_insert_rule AS
+ ON INSERT TO query.expr_xser
+ DO INSTEAD
+ INSERT INTO query.expression (
+ id,
+ type,
+ parenthesize,
+ parent_expr,
+ seq_no,
+ operator,
+ negate
+ ) VALUES (
+ COALESCE(NEW.id, NEXTVAL('query.expression_id_seq'::REGCLASS)),
+ 'xser',
+ COALESCE(NEW.parenthesize, FALSE),
+ NEW.parent_expr,
+ COALESCE(NEW.seq_no, 1),
+ NEW.operator,
+ NEW.negate
+ );
+
+CREATE OR REPLACE RULE query_expr_xser_update_rule AS
+ ON UPDATE TO query.expr_xser
+ DO INSTEAD
+ UPDATE query.expression SET
+ id = NEW.id,
+ parenthesize = NEW.parenthesize,
+ parent_expr = NEW.parent_expr,
+ seq_no = NEW.seq_no,
+ operator = NEW.operator,
+ negate = NEW.negate
+ WHERE
+ id = OLD.id;
+
+CREATE OR REPLACE RULE query_expr_xser_delete_rule AS
+ ON DELETE TO query.expr_xser
+ DO INSTEAD
+ DELETE FROM query.expression WHERE id = OLD.id;
+
-- Create updatable view for string literal expressions
CREATE OR REPLACE VIEW query.expr_xstr AS
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0280.schema.query-xser.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0280.schema.query-xser.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0280.schema.query-xser.sql 2010-05-27 16:10:50 UTC (rev 16521)
@@ -0,0 +1,87 @@
+BEGIN;
+
+-- Create new expression type 'xser' for serial expressions,
+-- i.e. series of expressions separated by operators
+
+INSERT INTO config.upgrade_log (version) VALUES ('0280'); -- Scott McKellar
+
+ALTER TABLE query.expression
+ DROP CONSTRAINT expression_type;
+
+ALTER TABLE query.expression
+ ADD CONSTRAINT expression_type CHECK
+ ( type IN (
+ 'xbet', -- between
+ 'xbind', -- bind variable
+ 'xbool', -- boolean
+ 'xcase', -- case
+ 'xcast', -- cast
+ 'xcol', -- column
+ 'xex', -- exists
+ 'xfld', -- field
+ 'xfunc', -- function
+ 'xin', -- in
+ 'xisnull', -- is null
+ 'xnull', -- null
+ 'xnum', -- number
+ 'xop', -- operator
+ 'xser', -- series
+ 'xstr', -- string
+ 'xsubq' -- subquery
+ ) );
+
+-- Create updatable view for series expressions
+
+CREATE OR REPLACE VIEW query.expr_xser AS
+ SELECT
+ id,
+ parenthesize,
+ parent_expr,
+ seq_no,
+ operator,
+ negate
+ FROM
+ query.expression
+ WHERE
+ type = 'xser';
+
+CREATE OR REPLACE RULE query_expr_xser_insert_rule AS
+ ON INSERT TO query.expr_xser
+ DO INSTEAD
+ INSERT INTO query.expression (
+ id,
+ type,
+ parenthesize,
+ parent_expr,
+ seq_no,
+ operator,
+ negate
+ ) VALUES (
+ COALESCE(NEW.id, NEXTVAL('query.expression_id_seq'::REGCLASS)),
+ 'xser',
+ COALESCE(NEW.parenthesize, FALSE),
+ NEW.parent_expr,
+ COALESCE(NEW.seq_no, 1),
+ NEW.operator,
+ NEW.negate
+ );
+
+CREATE OR REPLACE RULE query_expr_xser_update_rule AS
+ ON UPDATE TO query.expr_xser
+ DO INSTEAD
+ UPDATE query.expression SET
+ id = NEW.id,
+ parenthesize = NEW.parenthesize,
+ parent_expr = NEW.parent_expr,
+ seq_no = NEW.seq_no,
+ operator = NEW.operator,
+ negate = NEW.negate
+ WHERE
+ id = OLD.id;
+
+CREATE OR REPLACE RULE query_expr_xser_delete_rule AS
+ ON DELETE TO query.expr_xser
+ DO INSTEAD
+ DELETE FROM query.expression WHERE id = OLD.id;
+
+COMMIT;
More information about the open-ils-commits
mailing list