From 8fd72747fcf1fd6a0c413168d9c98c7658d83b22 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 8 Oct 2024 21:08:09 +0900
Subject: [PATCH] Add is_strict and options columns to document_extra_keys
 table

---
 modules/document/document.class.php           | 14 ++++++++
 .../document/queries/getDocumentExtraKeys.xml |  4 ++-
 .../queries/insertDocumentExtraKey.xml        | 30 ++++++++--------
 .../queries/updateDocumentExtraKey.xml        | 34 ++++++++++---------
 .../document/schemas/document_extra_keys.xml  |  2 ++
 5 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index 5a2fe043c..a359851d1 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -109,6 +109,10 @@ class Document extends ModuleObject
 		if(!$oDB->isColumnExists('document_categories', 'is_default')) return true;
 		if(!$oDB->isIndexExists('document_categories', 'idx_list_order')) return true;
 
+		// 2024.10.08 Add columns to document_extra_keys table
+		if(!$oDB->isColumnExists('document_extra_keys', 'var_is_strict')) return true;
+		if(!$oDB->isColumnExists('document_extra_keys', 'var_options')) return true;
+
 		return false;
 	}
 
@@ -219,6 +223,16 @@ class Document extends ModuleObject
 		{
 			$oDB->addIndex('document_categories', 'idx_list_order', array('list_order'));
 		}
+
+		// 2024.10.08 Add columns to document_extra_keys table
+		if(!$oDB->isColumnExists('document_extra_keys', 'var_is_strict'))
+		{
+			$oDB->addColumn('document_extra_keys', 'var_is_strict', 'char', '1', 'N', true, 'var_is_required');
+		}
+		if(!$oDB->isColumnExists('document_extra_keys', 'var_options'))
+		{
+			$oDB->addColumn('document_extra_keys', 'var_options', 'text', '', '', false, 'var_default');
+		}
 	}
 
 	/**
diff --git a/modules/document/queries/getDocumentExtraKeys.xml b/modules/document/queries/getDocumentExtraKeys.xml
index bd0ad59cb..c708322ea 100644
--- a/modules/document/queries/getDocumentExtraKeys.xml
+++ b/modules/document/queries/getDocumentExtraKeys.xml
@@ -8,10 +8,12 @@
         <column name="var_name" alias="name" />
         <column name="var_type" alias="type" />
         <column name="var_is_required" alias="is_required" />
+        <column name="var_is_strict" alias="is_strict" />
         <column name="var_search" alias="search" />
         <column name="var_default" alias="default" />
+        <column name="var_options" alias="options" />
         <column name="var_desc" alias="desc" />
-		<column name="eid" alias="eid" />
+        <column name="eid" alias="eid" />
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
diff --git a/modules/document/queries/insertDocumentExtraKey.xml b/modules/document/queries/insertDocumentExtraKey.xml
index e9c4878ab..6c0983add 100644
--- a/modules/document/queries/insertDocumentExtraKey.xml
+++ b/modules/document/queries/insertDocumentExtraKey.xml
@@ -1,16 +1,18 @@
 <query id="insertDocumentExtraKey" action="insert">
-    <tables>
-        <table name="document_extra_keys" />
-    </tables>
-    <columns>
-        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <column name="var_idx" var="var_idx" filter="number" notnull="notnull" />
-        <column name="var_name" var="var_name" notnull="notnull" />
-        <column name="var_type" var="var_type" notnull="notnull" />
-        <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
-        <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" />
-        <column name="var_desc" var="var_desc" />
-        <column name="eid" var="eid" notnull="notnull" />
-    </columns>
+	<tables>
+		<table name="document_extra_keys" />
+	</tables>
+	<columns>
+		<column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<column name="var_idx" var="var_idx" filter="number" notnull="notnull" />
+		<column name="var_name" var="var_name" notnull="notnull" />
+		<column name="var_type" var="var_type" notnull="notnull" />
+		<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
+		<column name="var_is_strict" var="var_is_strict" default="N" notnull="notnull" />
+		<column name="var_search" var="var_search" default="N" notnull="notnull" />
+		<column name="var_default" var="var_default" />
+		<column name="var_options" var="var_options" />
+		<column name="var_desc" var="var_desc" />
+		<column name="eid" var="eid" notnull="notnull" />
+	</columns>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraKey.xml b/modules/document/queries/updateDocumentExtraKey.xml
index c4d693f15..ce470af09 100644
--- a/modules/document/queries/updateDocumentExtraKey.xml
+++ b/modules/document/queries/updateDocumentExtraKey.xml
@@ -1,18 +1,20 @@
 <query id="updateDocumentExtraKey" action="update">
-    <tables>
-        <table name="document_extra_keys" />
-    </tables>
-    <columns>
-        <column name="var_name" var="var_name" notnull="notnull" />
-        <column name="var_type" var="var_type" notnull="notnull" />
-        <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
-        <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" default="" />
-        <column name="var_desc" var="var_desc" />
-        <column name="eid" var="eid" notnull="notnull" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
-    </conditions>
+	<tables>
+		<table name="document_extra_keys" />
+	</tables>
+	<columns>
+		<column name="var_name" var="var_name" notnull="notnull" />
+		<column name="var_type" var="var_type" notnull="notnull" />
+		<column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
+		<column name="var_is_strict" var="var_is_strict" default="N" notnull="notnull" />
+		<column name="var_search" var="var_search" default="N" notnull="notnull" />
+		<column name="var_default" var="var_default" default="" />
+		<column name="var_options" var="var_options" default="" />
+		<column name="var_desc" var="var_desc" />
+		<column name="eid" var="eid" notnull="notnull" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<condition operation="equal" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
+	</conditions>
 </query>
diff --git a/modules/document/schemas/document_extra_keys.xml b/modules/document/schemas/document_extra_keys.xml
index 5334e1882..e54a5c544 100644
--- a/modules/document/schemas/document_extra_keys.xml
+++ b/modules/document/schemas/document_extra_keys.xml
@@ -4,8 +4,10 @@
     <column name="var_name" type="varchar" size="250" notnull="notnull" />
     <column name="var_type" type="varchar" size="50" notnull="notnull" />
     <column name="var_is_required" type="char" size="1" default="N" notnull="notnull" />
+    <column name="var_is_strict" type="char" size="1" default="N" notnull="notnull" />
     <column name="var_search" type="char" size="1" default="N" notnull="notnull" />
     <column name="var_default" type="text" />
+    <column name="var_options" type="text" />
     <column name="var_desc" type="text" />
     <column name="eid" type="varchar" size="40" />
 </table>