From 7fa7c0ac5289340b91d7faa13bed8d1483eaf922 Mon Sep 17 00:00:00 2001
From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 21 May 2010 13:04:16 +0000
Subject: [PATCH] Fixing a typo in the previous changeset (a missing comma that
led to nonsense instead of an obvious error).
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/0270.schema.query-xisnull-correction.sql
git-svn-id: svn://svn.open-ils.org/ILS/trunk@16469 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/008.schema.query.sql | 2 +-
.../0270.schema.query-xisnull-correction.sql | 31 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0270.schema.query-xisnull-correction.sql
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2e1cdd6501..970af1832d 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -65,7 +65,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0269'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0270'); -- Scott McKellar
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/008.schema.query.sql b/Open-ILS/src/sql/Pg/008.schema.query.sql
index 5c627148cd..dccb1a66ef 100644
--- a/Open-ILS/src/sql/Pg/008.schema.query.sql
+++ b/Open-ILS/src/sql/Pg/008.schema.query.sql
@@ -134,7 +134,7 @@ CREATE TABLE query.expression (
'xfld', -- field
'xfunc', -- function
'xin', -- in
- 'xisnull' -- is null
+ 'xisnull', -- is null
'xnull', -- null
'xnum', -- number
'xop', -- operator
diff --git a/Open-ILS/src/sql/Pg/upgrade/0270.schema.query-xisnull-correction.sql b/Open-ILS/src/sql/Pg/upgrade/0270.schema.query-xisnull-correction.sql
new file mode 100644
index 0000000000..4bb11d99c9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0270.schema.query-xisnull-correction.sql
@@ -0,0 +1,31 @@
+BEGIN;
+
+-- Create new expression type for IS [NOT] NULL
+
+INSERT INTO config.upgrade_log (version) VALUES ('0270'); -- 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
+ 'xstr', -- string
+ 'xsubq' -- subquery
+ ) );
+
+COMMIT;
--
2.11.0