【update】 修改代码生成器代码，适配oracle数据库，提交oracle基础脚本

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -26,13 +26,14 @@ import java.util.Map;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("gen_table")
+@KeySequence(value = "seq_gen_table")
 public class GenTable implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 编号
      */
-    @TableId(value = "table_id", type = IdType.AUTO)
+    @TableId(value = "table_id", type = IdType.INPUT)
     private Long tableId;
 
     /**

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java

@@ -22,13 +22,14 @@ import java.util.Map;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("gen_table_column")
+@KeySequence(value = "seq_gen_table_column")
 public class GenTableColumn implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 编号
      */
-    @TableId(value = "column_id", type = IdType.AUTO)
+    @TableId(value = "column_id", type = IdType.INPUT)
     private Long columnId;
 
     /**

ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -30,9 +30,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
+        select
-		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+            lower(temp.column_name) as column_name,
-		order by ordinal_position
+            (case when (temp.nullable = 'N'  and  temp.constraint_type != 'P') then '1' else null end) as is_required,
+            (case when temp.constraint_type = 'P' then '1' else '0' end) as is_pk,
+            temp.column_id as sort,
+            temp.comments as column_comment,
+            (case when temp.constraint_type = 'P' then '1' else '0' end) as is_increment,
+            lower(temp.data_type) as column_type
+        from (
+            select col.column_id, col.column_name,col.nullable, col.data_type, colc.comments, uc.constraint_type
+            , row_number() over (partition by col.column_name order by uc.constraint_type desc) as row_flg
+            from user_tab_columns col
+            left join user_col_comments colc on colc.table_name = col.table_name and colc.column_name = col.column_name
+            left join user_cons_columns ucc on ucc.table_name = col.table_name and ucc.column_name = col.column_name
+            left join user_constraints uc on uc.constraint_name = ucc.constraint_name
+            where col.table_name = upper(#{tableName})
+            ) temp
+        WHERE temp.row_flg = 1
+        ORDER BY temp.column_id
 	</select>
 
 </mapper>

ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -61,36 +61,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="genTable.tableName != null and genTable.tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{genTable.tableName}, '%'))
+				AND lower(table_name) like lower(concat(concat('%', #{genTable.tableName}), '%'))
 			</if>
 			<if test="genTable.tableComment != null and genTable.tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
+				AND lower(table_comment) like lower(concat(concat('%', #{genTable.tableComment}), '%'))
 			</if>
 			<if test="genTable.params.beginTime != null and genTable.params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{genTable.params.beginTime},'%y%m%d')
+				AND create_time &gt;= to_date(#{genTable.params.beginTime},'yyyy-MM-dd HH24:mi:ss')
 			</if>
 			<if test="genTable.params.endTime != null and genTable.params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{genTable.params.endTime},'%y%m%d')
+                AND create_time &lt;= to_date(#{genTable.params.endTime},'yyyy-MM-dd HH24:mi:ss')
 			</if>
 		</where>
 	</select>
 
 	<select id="selectPageDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select
-		where table_schema = (select database())
+            lower(dt.table_name) as table_name,
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+            dtc.comments as table_comment,
-		AND table_name NOT IN (select table_name from gen_table)
+            uo.created as create_time,
+            uo.last_ddl_time as update_time
+        from
+            user_tables dt,
+            user_tab_comments dtc,
+            user_objects uo
+        where
+            dt.table_name = dtc.table_name
+            and dt.table_name = uo.object_name
+            and uo.object_type = 'TABLE'
+            AND dt.table_name NOT LIKE 'QRTZ_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND lower(dt.table_name) NOT IN (select table_name from gen_table)
 		<if test="genTable.tableName != null and genTable.tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{genTable.tableName}, '%'))
+            AND lower(dt.table_name) like lower(concat(concat('%', #{genTable.tableName}), '%'))
 		</if>
 		<if test="genTable.tableComment != null and genTable.tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
+			AND lower(dtc.table_comment) like lower(concat(concat('%', #{genTable.tableComment}), '%'))
 		</if>
 		<if test="genTable.params.beginTime != null and genTable.params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{genTable.params.beginTime},'%y%m%d')
+			AND uo.created &gt;= to_date(#{genTable.params.beginTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 		<if test="genTable.params.endTime != null and genTable.params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{genTable.params.endTime},'%y%m%d')
+			AND uo.created &lt;= to_date(#{genTable.params.endTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 	</select>
 
@@ -99,52 +110,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectGenTableVo"/>
 		<where>
 			<if test="tableName != null and tableName != ''">
-				AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+				AND lower(table_name) like lower(concat(concat('%', #{tableName}), '%'))
 			</if>
 			<if test="tableComment != null and tableComment != ''">
-				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+				AND lower(table_comment) like lower(concat(concat('%', #{tableComment}), '%'))
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                AND create_time &gt;= to_date(#{params.beginTime},'yyyy-MM-dd HH24:mi:ss')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                AND create_time &lt;= to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss')
 			</if>
 		</where>
 	</select>
 
 	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select
-		where table_schema = (select database())
+            lower(dt.table_name) as table_name,
-		AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%'
+            dtc.comments as table_comment,
-		AND table_name NOT IN (select table_name from gen_table)
+            uo.created as create_time,
-		<if test="tableName != null and tableName != ''">
+            uo.last_ddl_time as update_time
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
+        from
+            user_tables dt,
+            user_tab_comments dtc,
+            user_objects uo
+        where
+            dt.table_name = dtc.table_name
+            and dt.table_name = uo.object_name
+            and uo.object_type = 'TABLE'
+            AND dt.table_name NOT LIKE 'QRTZ_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND lower(dt.table_name) NOT IN (select table_name from gen_table)
+
+        <if test="tableName != null and tableName != ''">
+			AND lower(dt.table_name) like lower(concat(concat('%', #{tableName}), '%'))
 		</if>
 		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
+			AND lower(dt.table_comment) like lower(concat(concat('%', #{tableComment}), '%'))
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			AND uo.created &gt;= to_date(#{params.beginTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			AND uo.created &lt;= to_date(#{params.endTime},'yyyy-MM-dd HH24:mi:ss')
 		</if>
 	</select>
 
 	<select id="selectDbTableListByNames" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select
-		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
+            lower(dt.table_name) as table_name,
-		and table_name in
+            dtc.comments as table_comment,
+            uo.created as create_time,
+            uo.last_ddl_time as update_time
+        from
+            user_tables dt,
+            user_tab_comments dtc,
+            user_objects uo
+        where
+            dt.table_name = dtc.table_name
+            and dt.table_name = uo.object_name
+            and uo.object_type = 'TABLE'
+            AND dt.table_name NOT LIKE 'QRTZ_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND dt.table_name NOT IN (select table_name from gen_table)
+            and lower(dt.table_name) in
 	    <foreach collection="array" item="name" open="(" separator="," close=")">
  			#{name}
         </foreach>
 	</select>
 
 	<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
-		select table_name, table_comment, create_time, update_time from information_schema.tables
+        select
-		where table_comment <![CDATA[ <> ]]> '' and table_schema = (select database())
+            lower(dt.table_name) as table_name,
-		and table_name = #{tableName}
+            dtc.comments as table_comment,
+            uo.created as create_time,
+            uo.last_ddl_time as update_time
+        from
+            user_tables dt,
+            user_tab_comments dtc,
+            user_objects uo
+        where
+            dt.table_name = dtc.table_name
+            and dt.table_name = uo.object_name
+            and uo.object_type = 'TABLE'
+            AND dt.table_name NOT LIKE 'QRTZ_%' AND dt.table_name NOT LIKE 'GEN_%'
+            AND dt.table_name NOT IN (select table_name from gen_table)
+            and lower(dt.table_name) = #{tableName}
 	</select>
 
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -19,6 +19,7 @@ import com.ruoyi.common.annotation.Excel;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("${tableName}")
+@KeySequence(value = "seq_${tableName}")
 public class ${ClassName} implements Serializable {
 
     private static final long serialVersionUID=1L;
@@ -39,7 +40,7 @@ public class ${ClassName} implements Serializable {
     @Version
 #end
 #if($column.isPk==1)
-    @TableId(value = "$column.columnName")
+    @TableId(value = "$column.columnName", type = IdType.INPUT)
 #end
     private $column.javaType $column.javaField;
 #end

ruoyi-generator/src/main/resources/vm/sql/sql.vm

@@ -1,22 +1,34 @@
+-- 需要手动执行sql指定父节点id
+-- start
 -- 菜单 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+values(${table.menuId}, '${functionName}', '${parentMenuId}', '1', '/${moduleName}/${businessName}', 'C', '0', '${permissionPrefix}:view', '#', 'admin', sysdate, '', null, '${functionName}菜单');
-
--- 按钮父菜单ID
-SELECT @parentId := LAST_INSERT_ID();
 
 -- 按钮 SQL
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}查询', @parentId, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 'admin', sysdate(), '', null, '');
+values(seq_sys_menu.nextval, '${functionName}查询', ${table.menuId}, '1',  '#',  'F', '0', '${permissionPrefix}:list',         '#', 'admin', sysdate, '', null, '');
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}新增', @parentId, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate(), '', null, '');
+values(seq_sys_menu.nextval, '${functionName}新增', ${table.menuId}, '2',  '#',  'F', '0', '${permissionPrefix}:add',          '#', 'admin', sysdate, '', null, '');
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}修改', @parentId, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate(), '', null, '');
+values(seq_sys_menu.nextval, '${functionName}修改', ${table.menuId}, '3',  '#',  'F', '0', '${permissionPrefix}:edit',         '#', 'admin', sysdate, '', null, '');
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}删除', @parentId, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate(), '', null, '');
+values(seq_sys_menu.nextval, '${functionName}删除', ${table.menuId}, '4',  '#',  'F', '0', '${permissionPrefix}:remove',       '#', 'admin', sysdate, '', null, '');
 
-insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
-values('${functionName}导出', @parentId, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate(), '', null, '');
+values(seq_sys_menu.nextval, '${functionName}导出', ${table.menuId}, '5',  '#',  'F', '0', '${permissionPrefix}:export',       '#', 'admin', sysdate, '', null, '');
+
+-- end
+
+-- 在系统中使用还需要执行以下创建序列
+#if($pkColumn.increment)
+-- ${tableName}主键序列
+create sequence seq_${tableName}
+increment by 1
+start with 10
+nomaxvalue
+nominvalue
+cache 20;
+#end

sql/oracle/quartz.sql

@@ -0,0 +1,189 @@
+-- ----------------------------
+-- 1、存储每一个已配置的 jobDetail 的详细信息
+-- ----------------------------
+create table qrtz_job_details (
+    sched_name varchar2(120) not null,
+    job_name  varchar2(200) not null,
+    job_group varchar2(200) not null,
+    description varchar2(250) null,
+    job_class_name   varchar2(250) not null,
+    is_durable varchar2(1) not null,
+    is_nonconcurrent varchar2(1) not null,
+    is_update_data varchar2(1) not null,
+    requests_recovery varchar2(1) not null,
+    job_data blob null,
+    constraint qrtz_job_details_pk primary key (sched_name,job_name,job_group)
+);
+
+-- ----------------------------
+-- 2、 存储已配置的 Trigger 的信息
+-- ----------------------------
+create table qrtz_triggers (
+    sched_name varchar2(120) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    job_name  varchar2(200) not null,
+    job_group varchar2(200) not null,
+    description varchar2(250) null,
+    next_fire_time number(13) null,
+    prev_fire_time number(13) null,
+    priority number(13) null,
+    trigger_state varchar2(16) not null,
+    trigger_type varchar2(8) not null,
+    start_time number(13) not null,
+    end_time number(13) null,
+    calendar_name varchar2(200) null,
+    misfire_instr number(2) null,
+    job_data blob null,
+    constraint qrtz_triggers_pk primary key (sched_name,trigger_name,trigger_group),
+    constraint qrtz_trigger_to_jobs_fk foreign key (sched_name,job_name,job_group)
+      references qrtz_job_details(sched_name,job_name,job_group)
+);
+
+-- ----------------------------
+-- 3、 存储简单的 Trigger，包括重复次数，间隔，以及已触发的次数
+-- ----------------------------
+create table qrtz_simple_triggers (
+    sched_name varchar2(120) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    repeat_count number(7) not null,
+    repeat_interval number(12) not null,
+    times_triggered number(10) not null,
+    constraint qrtz_simple_trig_pk primary key (sched_name,trigger_name,trigger_group),
+    constraint qrtz_simple_trig_to_trig_fk foreign key (sched_name,trigger_name,trigger_group)
+      references qrtz_triggers(sched_name,trigger_name,trigger_group)
+);
+
+-- ----------------------------
+-- 4、 存储 Cron Trigger，包括 Cron 表达式和时区信息
+-- ----------------------------
+create table qrtz_cron_triggers (
+    sched_name varchar2(120) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    cron_expression varchar2(120) not null,
+    time_zone_id varchar2(80),
+    constraint qrtz_cron_trig_pk primary key (sched_name,trigger_name,trigger_group),
+    constraint qrtz_cron_trig_to_trig_fk foreign key (sched_name,trigger_name,trigger_group)
+      references qrtz_triggers(sched_name,trigger_name,trigger_group)
+);
+
+-- ----------------------------
+-- 5、 Trigger 作为 Blob 类型存储(用于 Quartz 用户用 JDBC 创建他们自己定制的 Trigger 类型，JobStore 并不知道如何存储实例的时候)
+-- ----------------------------
+create table qrtz_blob_triggers (
+    sched_name varchar2(120) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    blob_data blob null,
+    constraint qrtz_blob_trig_pk primary key (sched_name,trigger_name,trigger_group),
+    constraint qrtz_blob_trig_to_trig_fk foreign key (sched_name,trigger_name,trigger_group)
+      references qrtz_triggers(sched_name,trigger_name,trigger_group)
+);
+
+-- ----------------------------
+-- 6、 以 Blob 类型存储存放日历信息， quartz可配置一个日历来指定一个时间范围
+-- ----------------------------
+create table qrtz_calendars (
+    sched_name varchar2(120) not null,
+    calendar_name  varchar2(200) not null,
+    calendar blob not null,
+    constraint qrtz_calendars_pk primary key (sched_name,calendar_name)
+);
+
+-- ----------------------------
+-- 7、 存储已暂停的 Trigger 组的信息
+-- ----------------------------
+create table qrtz_paused_trigger_grps (
+    sched_name varchar2(120) not null,
+    trigger_group  varchar2(200) not null,
+    constraint qrtz_paused_trig_grps_pk primary key (sched_name,trigger_group)
+);
+
+-- ----------------------------
+-- 8、 存储与已触发的 Trigger 相关的状态信息，以及相联 Job 的执行信息
+-- ----------------------------
+create table qrtz_fired_triggers (
+    sched_name varchar2(120) not null,
+    entry_id varchar2(95) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    instance_name varchar2(200) not null,
+    fired_time number(13) not null,
+    sched_time number(13) not null,
+    priority number(13) not null,
+    state varchar2(16) not null,
+    job_name varchar2(200) null,
+    job_group varchar2(200) null,
+    is_nonconcurrent varchar2(1) null,
+    requests_recovery varchar2(1) null,
+    constraint qrtz_fired_trigger_pk primary key (sched_name,entry_id)
+);
+
+-- ----------------------------
+-- 9、 存储少量的有关 Scheduler 的状态信息，假如是用于集群中，可以看到其他的 Scheduler 实例
+-- ----------------------------
+create table qrtz_scheduler_state (
+    sched_name varchar2(120) not null,
+    instance_name varchar2(200) not null,
+    last_checkin_time number(13) not null,
+    checkin_interval number(13) not null,
+    constraint qrtz_scheduler_state_pk primary key (sched_name,instance_name)
+);
+
+-- ----------------------------
+-- 10、 存储程序的悲观锁的信息(假如使用了悲观锁)
+-- ----------------------------
+create table qrtz_locks (
+    sched_name varchar2(120) not null,
+    lock_name  varchar2(40) not null,
+    constraint qrtz_locks_pk primary key (sched_name,lock_name)
+);
+
+create table qrtz_simprop_triggers (
+    sched_name varchar2(120) not null,
+    trigger_name varchar2(200) not null,
+    trigger_group varchar2(200) not null,
+    str_prop_1 varchar2(512) null,
+    str_prop_2 varchar2(512) null,
+    str_prop_3 varchar2(512) null,
+    int_prop_1 number(10) null,
+    int_prop_2 number(10) null,
+    long_prop_1 number(13) null,
+    long_prop_2 number(13) null,
+    dec_prop_1 numeric(13,4) null,
+    dec_prop_2 numeric(13,4) null,
+    bool_prop_1 varchar2(1) null,
+    bool_prop_2 varchar2(1) null,
+    constraint qrtz_simprop_trig_pk primary key (sched_name,trigger_name,trigger_group),
+    constraint qrtz_simprop_trig_to_trig_fk foreign key (sched_name,trigger_name,trigger_group)
+      references qrtz_triggers(sched_name,trigger_name,trigger_group)
+);
+
+
+create index idx_qrtz_j_req_recovery on qrtz_job_details(sched_name,requests_recovery);
+create index idx_qrtz_j_grp on qrtz_job_details(sched_name,job_group);
+
+create index idx_qrtz_t_j on qrtz_triggers(sched_name,job_name,job_group);
+create index idx_qrtz_t_jg on qrtz_triggers(sched_name,job_group);
+create index idx_qrtz_t_c on qrtz_triggers(sched_name,calendar_name);
+create index idx_qrtz_t_g on qrtz_triggers(sched_name,trigger_group);
+create index idx_qrtz_t_state on qrtz_triggers(sched_name,trigger_state);
+create index idx_qrtz_t_n_state on qrtz_triggers(sched_name,trigger_name,trigger_group,trigger_state);
+create index idx_qrtz_t_n_g_state on qrtz_triggers(sched_name,trigger_group,trigger_state);
+create index idx_qrtz_t_next_fire_time on qrtz_triggers(sched_name,next_fire_time);
+create index idx_qrtz_t_nft_st on qrtz_triggers(sched_name,trigger_state,next_fire_time);
+create index idx_qrtz_t_nft_misfire on qrtz_triggers(sched_name,misfire_instr,next_fire_time);
+create index idx_qrtz_t_nft_st_misfire on qrtz_triggers(sched_name,misfire_instr,next_fire_time,trigger_state);
+create index idx_qrtz_t_nft_st_misfire_grp on qrtz_triggers(sched_name,misfire_instr,next_fire_time,trigger_group,trigger_state);
+
+create index idx_qrtz_ft_trig_inst_name on qrtz_fired_triggers(sched_name,instance_name);
+create index idx_qrtz_ft_inst_job_req_rcvry on qrtz_fired_triggers(sched_name,instance_name,requests_recovery);
+create index idx_qrtz_ft_j_g on qrtz_fired_triggers(sched_name,job_name,job_group);
+create index idx_qrtz_ft_jg on qrtz_fired_triggers(sched_name,job_group);
+create index idx_qrtz_ft_t_g on qrtz_fired_triggers(sched_name,trigger_name,trigger_group);
+
+create index idx_qrtz_ft_tg on qrtz_fired_triggers(sched_name,trigger_group);
+
+commit;