#32825 作業一覧画面改善（Android） コミットミス修正

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/LContentPageReadingLog.java

@@ -23,7 +23,7 @@ public class LContentPageReadingLog extends SQLiteTableScript {
 		sql.append("      , reading_log_id INTEGER NOT NULL ");
 		sql.append("      , reading_log_id INTEGER NOT NULL ");
 		sql.append("      , content_id BIGINT NOT NULL ");
 		sql.append("      , content_id BIGINT NOT NULL ");
 		sql.append("      , page_num INTEGER NOT NULL ");
 		sql.append("      , page_num INTEGER NOT NULL ");
-		sql.append("      , status CHAR(1) NOT NULL REPORT_TYPE '1' ");
+		sql.append("      , status CHAR(1) NOT NULL DEFAULT '1' ");
 		sql.append("      , start_date DATETIME NOT NULL ");
 		sql.append("      , start_date DATETIME NOT NULL ");
 		sql.append("      , resume_date DATETIME ");
 		sql.append("      , resume_date DATETIME ");
 		sql.append("      , end_date DATETIME ");
 		sql.append("      , end_date DATETIME ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/LContentReadingLog.java

@@ -21,7 +21,7 @@ public class LContentReadingLog extends SQLiteTableScript {
 		sql.append(" CREATE TABLE l_content_reading_log ( ");
 		sql.append(" CREATE TABLE l_content_reading_log ( ");
 		sql.append("        reading_log_id INTEGER NOT NULL ");
 		sql.append("        reading_log_id INTEGER NOT NULL ");
 		sql.append("      , content_id BIGINT NOT NULL ");
 		sql.append("      , content_id BIGINT NOT NULL ");
-		sql.append("      , status CHAR(1) NOT NULL REPORT_TYPE '1' ");
+		sql.append("      , status CHAR(1) NOT NULL DEFAULT '1' ");
 		sql.append("      , start_date DATETIME NOT NULL ");
 		sql.append("      , start_date DATETIME NOT NULL ");
 		sql.append("      , resume_date DATETIME ");
 		sql.append("      , resume_date DATETIME ");
 		sql.append("      , end_date DATETIME ");
 		sql.append("      , end_date DATETIME ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MGroup.java

@@ -33,7 +33,7 @@ public class MGroup extends SQLiteTableScript {
 		sql.append("      , group_level INTEGER NOT NULL ");
 		sql.append("      , group_level INTEGER NOT NULL ");
 		sql.append("      , group_name VARCHAR(64) NOT NULL ");
 		sql.append("      , group_name VARCHAR(64) NOT NULL ");
 		sql.append("      , group_path TEXT NOT NULL ");	//	path enumaerationパターンを適用する。since DatabaseVersions.Ver1_5_0
 		sql.append("      , group_path TEXT NOT NULL ");	//	path enumaerationパターンを適用する。since DatabaseVersions.Ver1_5_0
-		sql.append("      , user_group_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");	//	since DatabaseVersions.Plus_1_1_0
+		sql.append("      , user_group_flg BOOLEAN NOT NULL DEFAULT 0 ");	//	since DatabaseVersions.Plus_1_1_0
 		sql.append("      , PRIMARY KEY (group_relation_id) ");
 		sql.append("      , PRIMARY KEY (group_relation_id) ");
 		sql.append(" ) ");
 		sql.append(" ) ");
 		
 		

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MMemberInfo.java

@@ -25,7 +25,7 @@ public class MMemberInfo extends SQLiteTableScript {
 		sql.append("      , sid VARCHAR(64) ");
 		sql.append("      , sid VARCHAR(64) ");
 		//sql.append("      , contract_id INTEGER ");	//	1.5.0から削除
 		//sql.append("      , contract_id INTEGER ");	//	1.5.0から削除
 		sql.append("      , login_status INTEGER ");
 		sql.append("      , login_status INTEGER ");
-		sql.append("      , invalid_password_count SMALLINT REPORT_TYPE 0 ");
+		sql.append("      , invalid_password_count SMALLINT DEFAULT 0 ");
 		sql.append("      , last_login_date DATETIME ");
 		sql.append("      , last_login_date DATETIME ");
 		sql.append("      , last_change_password_date DATETIME ");
 		sql.append("      , last_change_password_date DATETIME ");
 		sql.append("      , last_cms_access_date DATETIME ");
 		sql.append("      , last_cms_access_date DATETIME ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/MPasswordLockInfo.java

@@ -20,7 +20,7 @@ public class MPasswordLockInfo extends SQLiteTableScript {
 		//	since 1.5.0
 		//	since 1.5.0
 		sql.append(" CREATE TABLE m_password_lock_info ( ");
 		sql.append(" CREATE TABLE m_password_lock_info ( ");
 		sql.append("        id INTEGER NOT NULL ");
 		sql.append("        id INTEGER NOT NULL ");
-		sql.append("      , invalid_password_count SMALLINT REPORT_TYPE 0 ");
+		sql.append("      , invalid_password_count SMALLINT DEFAULT 0 ");
 		sql.append("      , password_lock_date DATETIME ");
 		sql.append("      , password_lock_date DATETIME ");
 		sql.append("      , PRIMARY KEY (id) ");
 		sql.append("      , PRIMARY KEY (id) ");
 		sql.append(" ) ");
 		sql.append(" ) ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/ROperationContent.java

@@ -23,7 +23,7 @@ public class ROperationContent extends SQLiteTableScript {
         sql.append(" CREATE TABLE r_operation_content ( ");
         sql.append(" CREATE TABLE r_operation_content ( ");
         sql.append("        operation_id BIGINT NOT NULL ");
         sql.append("        operation_id BIGINT NOT NULL ");
         sql.append("      , content_id BIGINT NOT NULL ");
         sql.append("      , content_id BIGINT NOT NULL ");
-        sql.append("      , operation_content_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , operation_content_flg BOOLEAN NOT NULL DEFAULT 0 ");
         sql.append("      , PRIMARY KEY (operation_id, content_id)      ");
         sql.append("      , PRIMARY KEY (operation_id, content_id)      ");
         sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
         sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
         sql.append("      , FOREIGN KEY (content_id) REFERENCES t_content (content_id)");
         sql.append("      , FOREIGN KEY (content_id) REFERENCES t_content (content_id)");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TContentMemo.java

@@ -24,8 +24,8 @@ public class TContentMemo extends SQLiteTableScript {
 		sql.append("      , axis_x SMALLINT NOT NULL ");
 		sql.append("      , axis_x SMALLINT NOT NULL ");
 		sql.append("      , axis_y SMALLINT NOT NULL ");
 		sql.append("      , axis_y SMALLINT NOT NULL ");
 		sql.append("      , memo TEXT NOT NULL ");
 		sql.append("      , memo TEXT NOT NULL ");
-		sql.append("      , copy_flg BOOLEAN REPORT_TYPE false ");	//	since 1.5.2.01
-		sql.append("      , del_flg BOOLEAN REPORT_TYPE false ");	//	since 1.5.2.01
+		sql.append("      , copy_flg BOOLEAN DEFAULT false ");	//	since 1.5.2.01
+		sql.append("      , del_flg BOOLEAN DEFAULT false ");	//	since 1.5.2.01
 		sql.append("      , insert_date DATETIME NOT NULL ");
 		sql.append("      , insert_date DATETIME NOT NULL ");
 		sql.append("      , update_date DATETIME NOT NULL ");	//	since ABook Plus 1.2(1.2以前のアプリはUNIQUE INDEXのみ作成)
 		sql.append("      , update_date DATETIME NOT NULL ");	//	since ABook Plus 1.2(1.2以前のアプリはUNIQUE INDEXのみ作成)
 		sql.append("      , PRIMARY KEY (memo_id) ");
 		sql.append("      , PRIMARY KEY (memo_id) ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TOperation.java

@@ -30,14 +30,14 @@ public class TOperation extends SQLiteTableScript {
         sql.append("      , operation_end_date DATE NOT NULL ");
         sql.append("      , operation_end_date DATE NOT NULL ");
         sql.append("      , last_edit_date DATE NOT NULL ");
         sql.append("      , last_edit_date DATE NOT NULL ");
         sql.append("      , content_creating_flg INTEGER NOT NULL ");
         sql.append("      , content_creating_flg INTEGER NOT NULL ");
-        sql.append("      , edit_lock_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , need_sync_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , report_update_type INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , report_type INTEGER NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , edit_lock_flg BOOLEAN NOT NULL DEFAULT 0 ");
+        sql.append("      , need_sync_flg BOOLEAN NOT NULL DEFAULT 0 ");
+        sql.append("      , report_update_type INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , report_type INTEGER NOT NULL DEFAULT 0 ");
 
 
-        sql.append("      , report_cycle INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , enable_report_update INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , enable_report_history SMALLINT NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , report_cycle INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , enable_report_update INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , enable_report_history SMALLINT NOT NULL DEFAULT 0 ");
         sql.append("      , PRIMARY KEY (operation_id) ");
         sql.append("      , PRIMARY KEY (operation_id) ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());
@@ -54,13 +54,13 @@ public class TOperation extends SQLiteTableScript {
 //        }
 //        }
 //
 //
 //        if (oldVersion < DatabaseVersions.Plus_1_9_3_5) { // カラムの追加
 //        if (oldVersion < DatabaseVersions.Plus_1_9_3_5) { // カラムの追加
-//            ddl.add(" ALTER TABLE t_operation ADD COLUMN report_update_type INTEGER NOT NULL REPORT_TYPE 0 ");
+//            ddl.add(" ALTER TABLE t_operation ADD COLUMN report_update_type INTEGER NOT NULL DEFAULT 0 ");
 //        }
 //        }
 //
 //
 //        if (oldVersion < DatabaseVersions.Plus_1_9_4) { // カラムの追加
 //        if (oldVersion < DatabaseVersions.Plus_1_9_4) { // カラムの追加
-//            ddl.add(" ALTER TABLE t_operation ADD COLUMN project_report_type INTEGER NOT NULL REPORT_TYPE 0 ");
-//            ddl.add(" ALTER TABLE t_operation ADD COLUMN report_cycle INTEGER NOT NULL REPORT_TYPE 0 ");
-//            ddl.add(" ALTER TABLE t_operation ADD COLUMN enable_report_update INTEGER NOT NULL REPORT_TYPE 0 ");
+//            ddl.add(" ALTER TABLE t_operation ADD COLUMN project_report_type INTEGER NOT NULL DEFAULT 0 ");
+//            ddl.add(" ALTER TABLE t_operation ADD COLUMN report_cycle INTEGER NOT NULL DEFAULT 0 ");
+//            ddl.add(" ALTER TABLE t_operation ADD COLUMN enable_report_update INTEGER NOT NULL DEFAULT 0 ");
 //        }
 //        }
 //        return ddl;
 //        return ddl;
         return null;
         return null;

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TPushMessage.java

@@ -25,7 +25,7 @@ public class TPushMessage extends SQLiteTableScript {
         sql.append("      , push_send_login_id VARCHAR(128) ");
         sql.append("      , push_send_login_id VARCHAR(128) ");
         sql.append("      , push_send_date DATE NOT NULL ");
         sql.append("      , push_send_date DATE NOT NULL ");
         sql.append("      , push_message TEXT ");
         sql.append("      , push_message TEXT ");
-        sql.append("      , reading_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , reading_flg BOOLEAN NOT NULL DEFAULT 0 ");
         sql.append("      , PRIMARY KEY (push_message_id) ");
         sql.append("      , PRIMARY KEY (push_message_id) ");
         sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
         sql.append("      , FOREIGN KEY (operation_id) REFERENCES t_operation (operation_id) ");
         sql.append(" ) ");
         sql.append(" ) ");

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TRoutineTaskReport.java

@@ -23,16 +23,16 @@ public class TRoutineTaskReport extends SQLiteTableScript {
 
 
         sql.append(" CREATE TABLE IF NOT EXISTS t_inspect_task_report ( ");
         sql.append(" CREATE TABLE IF NOT EXISTS t_inspect_task_report ( ");
         sql.append("        task_key TEXT NOT NULL ");
         sql.append("        task_key TEXT NOT NULL ");
-        sql.append("      , task_report_id INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , task_report_info_id INTEGER NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , task_report_id INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , task_report_info_id INTEGER NOT NULL DEFAULT 0 ");
         sql.append("      , report_start_date DATETIME NOT NULL ");
         sql.append("      , report_start_date DATETIME NOT NULL ");
         sql.append("      , report_end_date DATETIME ");
         sql.append("      , report_end_date DATETIME ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
         sql.append("      , json_data TEXT ");
         sql.append("      , json_data TEXT ");
-        sql.append("      , data_send_flag BOOLEAN REPORT_TYPE 0 ");
-        sql.append("      , attached_file_send_flag BOOLEAN REPORT_TYPE 0 ");
-        sql.append("      , reported_flag BOOLEAN REPORT_TYPE 0 ");
+        sql.append("      , data_send_flag BOOLEAN DEFAULT 0 ");
+        sql.append("      , attached_file_send_flag BOOLEAN DEFAULT 0 ");
+        sql.append("      , reported_flag BOOLEAN DEFAULT 0 ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());
 
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTask.java

@@ -28,7 +28,7 @@ public class TTask extends SQLiteTableScript {
         sql.append("      , task_code VARCHAR(64) ");
         sql.append("      , task_code VARCHAR(64) ");
         sql.append("      , task_status INTEGER ");
         sql.append("      , task_status INTEGER ");
         sql.append("      , task_hotspot_info TEXT ");
         sql.append("      , task_hotspot_info TEXT ");
-        sql.append("      , del_flg BOOLEAN REPORT_TYPE 0 ");
+        sql.append("      , del_flg BOOLEAN DEFAULT 0 ");
         sql.append("      , PRIMARY KEY (task_key) ");
         sql.append("      , PRIMARY KEY (task_key) ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskDirections.java

@@ -26,8 +26,8 @@ public class TTaskDirections extends SQLiteTableScript {
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
-        sql.append("      , attached_file_send_flg BOOLEAN REPORT_TYPE 0 ");
-        sql.append("      , data_send_flg BOOLEAN REPORT_TYPE 0 ");
+        sql.append("      , attached_file_send_flg BOOLEAN DEFAULT 0 ");
+        sql.append("      , data_send_flg BOOLEAN DEFAULT 0 ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());
 
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReport.java

@@ -26,19 +26,19 @@ public class TTaskReport extends SQLiteTableScript {
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
         sql.append("      , local_attached_file_name TEXT ");
-        sql.append("      , attached_file_send_flg BOOLEAN REPORT_TYPE 0 ");
-        sql.append("      , data_send_flg BOOLEAN REPORT_TYPE 0 ");
+        sql.append("      , attached_file_send_flg BOOLEAN DEFAULT 0 ");
+        sql.append("      , data_send_flg BOOLEAN DEFAULT 0 ");
         // #32782 指示者テーブル関連削除 start
         // #32782 指示者テーブル関連削除 start
         // TODO append
         // TODO append
-//        sql.append("      , reporter_flag BOOLEAN REPORT_TYPE 0 ");
+//        sql.append("      , reporter_flag BOOLEAN DEFAULT 0 ");
         // #32782 指示者テーブル関連削除 end
         // #32782 指示者テーブル関連削除 end
 
 
         sql.append("      , report_start_date DATETIME ");
         sql.append("      , report_start_date DATETIME ");
         sql.append("      , report_end_date DATETIME ");
         sql.append("      , report_end_date DATETIME ");
-        sql.append("      , task_report_id INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , task_report_info_id INTEGER NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , enable_report SMALLINT NOT NULL REPORT_TYPE 0 ");
-        sql.append("      , task_report_level SMALLINT NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , task_report_id INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , task_report_info_id INTEGER NOT NULL DEFAULT 0 ");
+        sql.append("      , enable_report SMALLINT NOT NULL DEFAULT 0 ");
+        sql.append("      , task_report_level SMALLINT NOT NULL DEFAULT 0 ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());
 
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReportSend.java

@@ -31,11 +31,11 @@ public class TTaskReportSend extends SQLiteTableScript {
         sql.append(" CREATE TABLE t_task_report_send ( ");
         sql.append(" CREATE TABLE t_task_report_send ( ");
         sql.append("        task_report_send_id INTEGER NOT NULL ");
         sql.append("        task_report_send_id INTEGER NOT NULL ");
         sql.append("      , task_key TEXT NOT NULL ");
         sql.append("      , task_key TEXT NOT NULL ");
-        sql.append("      , task_report_id INTEGER REPORT_TYPE 0 ");
+        sql.append("      , task_report_id INTEGER DEFAULT 0 ");
         sql.append("      , report_start_date DATETIME ");
         sql.append("      , report_start_date DATETIME ");
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , json_data TEXT NOT NULL ");
         sql.append("      , save_date DATE NOT NULL ");
         sql.append("      , save_date DATE NOT NULL ");
-        sql.append("      , delete_flg BOOLEAN NOT NULL REPORT_TYPE 0 ");
+        sql.append("      , delete_flg BOOLEAN NOT NULL DEFAULT 0 ");
         sql.append(" ) ");
         sql.append(" ) ");
         ddl.add(sql.toString());
         ddl.add(sql.toString());