diff --git a/pom.xml b/pom.xml index f24e4dd5d..68abe242f 100644 --- a/pom.xml +++ b/pom.xml @@ -200,7 +200,7 @@ io.ebean.test ebean-test-docker - 3.1.3 + 3.1.5 test diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java b/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java index aa3ed1b2e..e13155f3f 100644 --- a/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/Oracle11Platform.java @@ -1,6 +1,7 @@ package io.ebean.config.dbplatform.oracle; import io.ebean.annotation.Platform; +import io.ebean.config.dbplatform.IdType; /** * Oracle 11 platform using rownum sql limiting. @@ -12,5 +13,6 @@ public class Oracle11Platform extends OraclePlatform { this.platform = Platform.ORACLE11; this.columnAliasPrefix = "c"; this.sqlLimiter = new OracleRownumSqlLimiter(); + dbIdentity.setIdType(IdType.SEQUENCE); } } diff --git a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java index 9300fbcc4..68766dfe9 100644 --- a/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/oracle/OraclePlatform.java @@ -30,7 +30,7 @@ public class OraclePlatform extends DatabasePlatform { this.basicSqlLimiter = new BasicSqlAnsiLimiter(); this.historySupport = new OracleDbHistorySupport(); this.truncateTable = "truncate table %s cascade"; - dbIdentity.setIdType(IdType.SEQUENCE); + dbIdentity.setIdType(IdType.IDENTITY); dbIdentity.setSupportsSequence(true); dbIdentity.setSupportsIdentity(true); dbIdentity.setSupportsGetGeneratedKeys(true); diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java similarity index 83% rename from src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java rename to src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java index c09a95108..ea7d50d62 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10Ddl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdl.java @@ -6,9 +6,9 @@ import io.ebean.config.dbplatform.DatabasePlatform; /** * Oracle platform specific DDL. */ -public class Oracle10Ddl extends PlatformDdl { +public class OracleDdl extends PlatformDdl { - public Oracle10Ddl(DatabasePlatform platform) { + public OracleDdl(DatabasePlatform platform) { super(platform); this.dropTableIfExists = "drop table "; this.dropSequenceIfExists = "drop sequence "; @@ -48,4 +48,12 @@ public class Oracle10Ddl extends PlatformDdl { } } + /** + * Modify and return the column definition for autoincrement or identity definition. + */ + @Override + public String asIdentityColumn(String columnDefn, DdlIdentity identity) { + return asIdentityStandardOptions(columnDefn, identity); + } + } diff --git a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java index 191a433dc..43e64ca34 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java +++ b/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java @@ -195,7 +195,6 @@ public class PlatformDdl { * SQl2003 standard identity definition. */ protected String asIdentityStandardOptions(String columnDefn, DdlIdentity identity) { - StringBuilder sb = new StringBuilder(columnDefn.length() + 60); sb.append(columnDefn).append(identity.optionGenerated()); sb.append(identity.identityOptions(identityStartWith, identityIncrementBy, identityCache)); diff --git a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java index 5da023a25..1c39dbbb8 100644 --- a/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java +++ b/src/main/java/io/ebeaninternal/server/core/PlatformDdlBuilder.java @@ -9,7 +9,7 @@ import io.ebeaninternal.dbmigration.ddlgeneration.platform.HanaColumnStoreDdl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.HsqldbDdl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.MySqlDdl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.NuoDbDdl; -import io.ebeaninternal.dbmigration.ddlgeneration.platform.Oracle10Ddl; +import io.ebeaninternal.dbmigration.ddlgeneration.platform.OracleDdl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PlatformDdl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.Postgres9Ddl; import io.ebeaninternal.dbmigration.ddlgeneration.platform.PostgresDdl; @@ -40,7 +40,7 @@ public class PlatformDdlBuilder { return new NuoDbDdl(platform); case ORACLE: case ORACLE11: - return new Oracle10Ddl(platform); + return new OracleDdl(platform); case SQLITE: return new SQLiteDdl(platform); case POSTGRES9: diff --git a/src/test/ddl-review/oracle-create-all.sql b/src/test/ddl-review/oracle-create-all.sql index 4fe3c8ea2..6c3b054cf 100644 --- a/src/test/ddl-review/oracle-create-all.sql +++ b/src/test/ddl-review/oracle-create-all.sql @@ -1,57 +1,51 @@ --- Generated by ebean unknown at 2020-03-17T09:21:18.938357Z +-- Generated by ebean unknown at 2020-03-17T09:34:02.384264Z create table asimple_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_asimple_bean primary key (id) ); -create sequence asimple_bean_seq increment by 1; create table bar ( bar_type varchar2(31) not null, - bar_id number(10) not null, + bar_id number(10) generated by default as identity not null, foo_id number(10) not null, version number(10) not null, constraint pk_bar primary key (bar_id) ); -create sequence bar_seq increment by 1; create table block ( case_type number(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, notes varchar2(255), constraint pk_block primary key (id) ); -create sequence block_seq increment by 1; create table oto_account ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_oto_account primary key (id) ); -create sequence oto_account_seq increment by 1; create table acl ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_acl primary key (id) ); -create sequence acl_seq increment by 1; create table acl_container_relation ( - id number(19) not null, + id number(19) generated by default as identity not null, container_id number(19) not null, acl_entry_id number(19) not null, constraint pk_acl_container_relation primary key (id) ); -create sequence acl_container_relation_seq increment by 1; create table addr ( - id number(19) not null, + id number(19) generated by default as identity not null, employee_id number(19), name varchar2(255), address_line1 varchar2(255), @@ -60,18 +54,16 @@ create table addr ( version number(19) not null, constraint pk_addr primary key (id) ); -create sequence addr_seq increment by 1; create table address ( - oid number(19) not null, + oid number(19) generated by default as identity not null, street varchar2(255), version number(10) not null, constraint pk_address primary key (oid) ); -create sequence address_seq increment by 1; create table o_address ( - id number(10) not null, + id number(10) generated by default as identity not null, line_1 varchar2(100), line_2 varchar2(100), city varchar2(100), @@ -80,10 +72,9 @@ create table o_address ( updtime timestamp not null, constraint pk_o_address primary key (id) ); -create sequence o_address_seq increment by 1; create table album ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), cover_id number(19), deleted number(1) default 0 not null, @@ -92,11 +83,10 @@ create table album ( constraint uq_album_cover_id unique (cover_id), constraint pk_album primary key (id) ); -create sequence album_seq increment by 1; create table animal ( species varchar2(255) not null, - id number(19) not null, + id number(19) generated by default as identity not null, shelter_id number(19), version number(19) not null, name varchar2(255), @@ -105,18 +95,16 @@ create table animal ( dog_size varchar2(255), constraint pk_animal primary key (id) ); -create sequence animal_seq increment by 1; create table animal_shelter ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_animal_shelter primary key (id) ); -create sequence animal_shelter_seq increment by 1; create table article ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), author varchar2(255), cretime timestamp not null, @@ -124,53 +112,47 @@ create table article ( version number(19) not null, constraint pk_article primary key (id) ); -create sequence article_seq increment by 1; create table attribute ( option_type number(31) not null, - id number(10) not null, + id number(10) generated by default as identity not null, attribute_holder_id number(10), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_attribute primary key (id) ); -create sequence attribute_seq increment by 1; create table attribute_holder ( - id number(10) not null, + id number(10) generated by default as identity not null, cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_attribute_holder primary key (id) ); -create sequence attribute_holder_seq increment by 1; create table audit_log ( - id number(19) not null, + id number(19) generated by default as identity (start with 1000 cache 100) not null, description varchar2(255), modified_description varchar2(255), constraint pk_audit_log primary key (id) ); -create sequence audit_log_seq start with 1000 increment by 1 cache 100; create table bbookmark ( - id number(10) not null, + id number(10) generated by default as identity not null, bookmark_reference varchar2(255), user_id number(10), constraint pk_bbookmark primary key (id) ); -create sequence bbookmark_seq increment by 1; create table bbookmark_org ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_bbookmark_org primary key (id) ); -create sequence bbookmark_org_seq increment by 1; create table bbookmark_user ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), password varchar2(255), email_address varchar2(255), @@ -178,14 +160,12 @@ create table bbookmark_user ( org_id number(10), constraint pk_bbookmark_user primary key (id) ); -create sequence bbookmark_user_seq increment by 1; create table bsimple_with_gen ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_bsimple_with_gen primary key (id) ); -create sequence bsimple_with_gen_seq increment by 1; create table bsite ( id varchar2(40) not null, @@ -240,37 +220,34 @@ create table buser ( ); create table bwith_qident ( - id number(10) not null, + id number(10) generated by default as identity not null, "Name" varchar2(191), "CODE" varchar2(255), last_updated timestamp not null, constraint uq_bwith_qident_name unique ("Name"), constraint pk_bwith_qident primary key (id) ); -create sequence bwith_qident_seq increment by 1; create table basic_draftable_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_basic_draftable_bean primary key (id) ); -create sequence basic_draftable_bean_seq increment by 1; create table basic_draftable_bean_draft ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_basic_draftable_bean_draft primary key (id) ); -create sequence basic_draftable_bean_draft_seq increment by 1; create table basic_joda_entity ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), period varchar2(50), local_date date, @@ -279,15 +256,13 @@ create table basic_joda_entity ( version timestamp not null, constraint pk_basic_joda_entity primary key (id) ); -create sequence basic_joda_entity_seq increment by 1; create table bean_with_time_zone ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), timezone varchar2(20), constraint pk_bean_with_time_zone primary key (id) ); -create sequence bean_with_time_zone_seq increment by 1; create table drel_booking ( id number(19) not null, @@ -303,29 +278,26 @@ create table drel_booking ( create sequence drel_booking_seq increment by 1; create table bw_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), flags number(10) not null, version number(19) not null, constraint pk_bw_bean primary key (id) ); -create sequence bw_bean_seq increment by 1; create table cepcategory ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_cepcategory primary key (id) ); -create sequence cepcategory_seq increment by 1; create table cepproduct ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_cepproduct primary key (id) ); -create sequence cepproduct_seq increment by 1; create table cepproduct_category ( customer_id number(19) not null, @@ -336,43 +308,39 @@ create table cepproduct_category ( ); create table ciaddress ( - id number(19) not null, + id number(19) generated by default as identity not null, street_id number(19), constraint pk_ciaddress primary key (id) ); -create sequence ciaddress_seq increment by 1; create table cicustomer_parent ( dtype number(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, address_id number(19), notes varchar2(255), constraint pk_cicustomer_parent primary key (id) ); -create sequence cicustomer_parent_seq increment by 1; create table cistreet_parent ( dtype number(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), num varchar2(255), constraint pk_cistreet_parent primary key (id) ); -create sequence cistreet_parent_seq increment by 1; create table cinh_ref ( - id number(10) not null, + id number(10) generated by default as identity not null, ref_id number(10), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_cinh_ref primary key (id) ); -create sequence cinh_ref_seq increment by 1; create table cinh_root ( dtype varchar2(3) not null, - id number(10) not null, + id number(10) generated by default as identity not null, license_number varchar2(255), cretime timestamp not null, updtime timestamp not null, @@ -382,23 +350,20 @@ create table cinh_root ( action varchar2(255), constraint pk_cinh_root primary key (id) ); -create sequence cinh_root_seq increment by 1; create table ckey_assoc ( - id number(10) not null, + id number(10) generated by default as identity not null, assoc_one varchar2(255), constraint pk_ckey_assoc primary key (id) ); -create sequence ckey_assoc_seq increment by 1; create table ckey_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, something varchar2(255), one_key number(10), two_key varchar2(127), constraint pk_ckey_detail primary key (id) ); -create sequence ckey_detail_seq increment by 1; create table ckey_parent ( one_key number(10) not null, @@ -410,38 +375,34 @@ create table ckey_parent ( ); create table coone ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_coone primary key (id) ); -create sequence coone_seq increment by 1; create table coone_many ( - id number(19) not null, + id number(19) generated by default as identity not null, coone_id number(19) not null, name varchar2(255), deleted number(1) default 0 not null, constraint pk_coone_many primary key (id) ); -create sequence coone_many_seq increment by 1; create table coroot ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), one_id number(19), constraint uq_coroot_one_id unique (one_id), constraint pk_coroot primary key (id) ); -create sequence coroot_seq increment by 1; create table calculation_result ( - id number(10) not null, + id number(10) generated by default as identity not null, charge number(19,4) not null, product_configuration_id number(10), group_configuration_id number(10), constraint pk_calculation_result primary key (id) ); -create sequence calculation_result_seq increment by 1; create table cao_bean ( x_cust_id number(10) not null, @@ -481,7 +442,7 @@ create table sa_car ( create sequence sa_car_seq increment by 1; create table car_accessory ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), fuse_id number(19) not null, car_id number(10), @@ -490,36 +451,32 @@ create table car_accessory ( version number(19) not null, constraint pk_car_accessory primary key (id) ); -create sequence car_accessory_seq increment by 1; create table car_fuse ( - id number(19) not null, + id number(19) generated by default as identity not null, location_code varchar2(255), constraint pk_car_fuse primary key (id) ); -create sequence car_fuse_seq increment by 1; create table category ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), surveyobjectid number(19), sequence_number number(10) not null, constraint pk_category primary key (id) ); -create sequence category_seq increment by 1; create table e_save_test_d ( - id number(19) not null, + id number(19) generated by default as identity not null, parent_id number(19), test_property number(1) default 0 not null, version number(19) not null, constraint uq_e_save_test_d_parent_id unique (parent_id), constraint pk_e_save_test_d primary key (id) ); -create sequence e_save_test_d_seq increment by 1; create table child_person ( - identifier number(10) not null, + identifier number(10) generated by default as identity not null, name varchar2(255), age number(10), some_bean_id number(10), @@ -528,7 +485,6 @@ create table child_person ( address varchar2(255), constraint pk_child_person primary key (identifier) ); -create sequence child_person_seq increment by 1; create table cke_client ( cod_cpny number(10) not null, @@ -547,10 +503,9 @@ create table cke_user ( create table class_super ( dtype varchar2(31) not null, - sid number(19) not null, + sid number(19) generated by default as identity not null, constraint pk_class_super primary key (sid) ); -create sequence class_super_seq increment by 1; create table class_super_monkey ( class_super_sid number(19) not null, @@ -561,24 +516,22 @@ create table class_super_monkey ( create table configuration ( type varchar2(21) not null, - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), configurations_id number(10), group_name varchar2(255), product_name varchar2(255), constraint pk_configuration primary key (id) ); -create sequence configuration_seq increment by 1; create table configurations ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_configurations primary key (id) ); -create sequence configurations_seq increment by 1; create table contact ( - id number(10) not null, + id number(10) generated by default as identity not null, first_name varchar2(127), last_name varchar2(127), phone varchar2(255), @@ -591,20 +544,18 @@ create table contact ( updtime timestamp not null, constraint pk_contact primary key (id) ); -create sequence contact_seq increment by 1; create table contact_group ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_contact_group primary key (id) ); -create sequence contact_group_seq increment by 1; create table contact_note ( - id number(10) not null, + id number(10) generated by default as identity not null, contact_id number(10), title varchar2(255), note clob, @@ -613,25 +564,22 @@ create table contact_note ( version number(19) not null, constraint pk_contact_note primary key (id) ); -create sequence contact_note_seq increment by 1; create table contract ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_contract primary key (id) ); -create sequence contract_seq increment by 1; create table contract_costs ( - id number(19) not null, + id number(19) generated by default as identity not null, status varchar2(255), position_id number(19) not null, constraint pk_contract_costs primary key (id) ); -create sequence contract_costs_seq increment by 1; create table c_conversation ( - id number(19) not null, + id number(19) generated by default as identity not null, title varchar2(255), isopen number(1) default 0 not null, group_id number(19), @@ -640,7 +588,6 @@ create table c_conversation ( when_modified timestamp not null, constraint pk_c_conversation primary key (id) ); -create sequence c_conversation_seq increment by 1; create table o_country ( code varchar2(2) not null, @@ -649,15 +596,14 @@ create table o_country ( ); create table cover ( - id number(19) not null, + id number(19) generated by default as identity not null, s3_url varchar2(255), deleted number(1) default 0 not null, constraint pk_cover primary key (id) ); -create sequence cover_seq increment by 1; create table o_customer ( - id number(10) not null, + id number(10) generated by default as identity not null, status varchar2(1), name varchar2(40) not null, smallnote varchar2(100), @@ -674,14 +620,12 @@ comment on table o_customer is 'Holds external customers'; comment on column o_customer.status is 'status of the customer'; comment on column o_customer.smallnote is 'Short notes regarding the customer'; comment on column o_customer.anniversary is 'Join date of the customer'; -create sequence o_customer_seq increment by 1; create table dcredit ( - id number(19) not null, + id number(19) generated by default as identity not null, credit varchar2(255), constraint pk_dcredit primary key (id) ); -create sequence dcredit_seq increment by 1; create table dcredit_drol ( dcredit_id number(19) not null, @@ -690,34 +634,31 @@ create table dcredit_drol ( ); create table dexh_entity ( - oid number(19) not null, + oid number(19) generated by default as identity not null, exhange varchar2(255), an_enum_type varchar2(255), last_updated timestamp not null, constraint pk_dexh_entity primary key (oid) ); -create sequence dexh_entity_seq increment by 1; create table dint_parent ( type number(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, val number(10), more varchar2(255), constraint pk_dint_parent primary key (id) ); -create sequence dint_parent_seq increment by 1; create table dmachine ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), organisation_id number(19), version number(19) not null, constraint pk_dmachine primary key (id) ); -create sequence dmachine_seq increment by 1; create table d_machine_aux_use ( - id number(19) not null, + id number(19) generated by default as identity not null, machine_id number(19) not null, name varchar2(255), edate date, @@ -726,10 +667,9 @@ create table d_machine_aux_use ( version number(19) not null, constraint pk_d_machine_aux_use primary key (id) ); -create sequence d_machine_aux_use_seq increment by 1; create table d_machine_stats ( - id number(19) not null, + id number(19) generated by default as identity not null, machine_id number(19) not null, edate date, total_kms number(19) not null, @@ -739,10 +679,9 @@ create table d_machine_stats ( version number(19) not null, constraint pk_d_machine_stats primary key (id) ); -create sequence d_machine_stats_seq increment by 1; create table d_machine_use ( - id number(19) not null, + id number(19) generated by default as identity not null, machine_id number(19) not null, edate date, distance_kms number(19) not null, @@ -751,38 +690,33 @@ create table d_machine_use ( version number(19) not null, constraint pk_d_machine_use primary key (id) ); -create sequence d_machine_use_seq increment by 1; create table dorg ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_dorg primary key (id) ); -create sequence dorg_seq increment by 1; create table dperson ( - id number(19) not null, + id number(19) generated by default as identity not null, first_name varchar2(255), last_name varchar2(255), salary number(16,3), constraint pk_dperson primary key (id) ); -create sequence dperson_seq increment by 1; create table drol ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_drol primary key (id) ); -create sequence drol_seq increment by 1; create table drot ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_drot primary key (id) ); -create sequence drot_seq increment by 1; create table drot_drol ( drot_id number(19) not null, @@ -791,11 +725,10 @@ create table drot_drol ( ); create table rawinherit_data ( - id number(19) not null, + id number(19) generated by default as identity not null, val number(10), constraint pk_rawinherit_data primary key (id) ); -create sequence rawinherit_data_seq increment by 1; create table data_container ( id varchar2(40) not null, @@ -804,59 +737,52 @@ create table data_container ( ); create table dc_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, master_id number(19), description varchar2(255), version number(19) not null, constraint pk_dc_detail primary key (id) ); -create sequence dc_detail_seq increment by 1; create table dc_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_dc_master primary key (id) ); -create sequence dc_master_seq increment by 1; create table dfk_cascade ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), one_id number(19), constraint pk_dfk_cascade primary key (id) ); -create sequence dfk_cascade_seq increment by 1; create table dfk_cascade_one ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_dfk_cascade_one primary key (id) ); -create sequence dfk_cascade_one_seq increment by 1; create table dfk_none ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), one_id number(19), constraint pk_dfk_none primary key (id) ); -create sequence dfk_none_seq increment by 1; create table dfk_none_via_join ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), one_id number(19), constraint pk_dfk_none_via_join primary key (id) ); -create sequence dfk_none_via_join_seq increment by 1; create table dfk_none_via_mto_m ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_dfk_none_via_mto_m primary key (id) ); -create sequence dfk_none_via_mto_m_seq increment by 1; create table dfk_none_via_mto_m_dfk_one ( dfk_none_via_mto_m_id number(19) not null, @@ -865,29 +791,26 @@ create table dfk_none_via_mto_m_dfk_one ( ); create table dfk_one ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_dfk_one primary key (id) ); -create sequence dfk_one_seq increment by 1; create table dfk_set_null ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), one_id number(19), constraint pk_dfk_set_null primary key (id) ); -create sequence dfk_set_null_seq increment by 1; create table doc ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_doc primary key (id) ); -create sequence doc_seq increment by 1; create table doc_link ( doc_id number(19) not null, @@ -902,17 +825,16 @@ create table doc_link_draft ( ); create table doc_draft ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_doc_draft primary key (id) ); -create sequence doc_draft_seq increment by 1; create table document ( - id number(19) not null, + id number(19) generated by default as identity not null, title varchar2(127), body varchar2(255), organisation_id number(19), @@ -922,10 +844,9 @@ create table document ( constraint uq_document_title unique (title), constraint pk_document primary key (id) ); -create sequence document_seq increment by 1; create table document_draft ( - id number(19) not null, + id number(19) generated by default as identity not null, title varchar2(127), body varchar2(255), when_publish timestamp, @@ -936,10 +857,9 @@ create table document_draft ( constraint uq_document_draft_title unique (title), constraint pk_document_draft primary key (id) ); -create sequence document_draft_seq increment by 1; create table document_media ( - id number(19) not null, + id number(19) generated by default as identity not null, document_id number(19), name varchar2(255), description varchar2(255), @@ -948,10 +868,9 @@ create table document_media ( when_modified timestamp not null, constraint pk_document_media primary key (id) ); -create sequence document_media_seq increment by 1; create table document_media_draft ( - id number(19) not null, + id number(19) generated by default as identity not null, document_id number(19), name varchar2(255), description varchar2(255), @@ -960,7 +879,6 @@ create table document_media_draft ( when_modified timestamp not null, constraint pk_document_media_draft primary key (id) ); -create sequence document_media_draft_seq increment by 1; create table sp_car_door ( id number(19) not null, @@ -971,7 +889,7 @@ create table sp_car_door ( create sequence sp_car_door_seq increment by 1; create table earray_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, foo number(10), name varchar2(255), phone_numbers varchar(300), @@ -986,10 +904,9 @@ create table earray_bean ( constraint ck_earray_bean_foo check ( foo in (100,101,102)), constraint pk_earray_bean primary key (id) ); -create sequence earray_bean_seq increment by 1; create table earray_set_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), phone_numbers varchar(300), uids varchar(1000), @@ -998,10 +915,9 @@ create table earray_set_bean ( version number(19) not null, constraint pk_earray_set_bean primary key (id) ); -create sequence earray_set_bean_seq increment by 1; create table e_basic ( - id number(10) not null, + id number(10) generated by default as identity not null, status varchar2(1), name varchar2(127), description varchar2(255), @@ -1009,10 +925,9 @@ create table e_basic ( constraint ck_e_basic_status check ( status in ('N','A','I')), constraint pk_e_basic primary key (id) ); -create sequence e_basic_seq increment by 1; create table ebasic_change_log ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(20), short_description varchar2(50), long_description varchar2(100), @@ -1023,38 +938,34 @@ create table ebasic_change_log ( version number(19) not null, constraint pk_ebasic_change_log primary key (id) ); -create sequence ebasic_change_log_seq increment by 1; create table ebasic_clob ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), title varchar2(255), description clob, last_update timestamp not null, constraint pk_ebasic_clob primary key (id) ); -create sequence ebasic_clob_seq increment by 1; create table ebasic_clob_fetch_eager ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), title varchar2(255), description clob, last_update timestamp not null, constraint pk_ebasic_clob_fetch_eager primary key (id) ); -create sequence ebasic_clob_fetch_eager_seq increment by 1; create table ebasic_clob_no_ver ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), description clob, constraint pk_ebasic_clob_no_ver primary key (id) ); -create sequence ebasic_clob_no_ver_seq increment by 1; create table e_basicenc ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description raw(80), dob raw(20), @@ -1062,10 +973,9 @@ create table e_basicenc ( last_update timestamp, constraint pk_e_basicenc primary key (id) ); -create sequence e_basicenc_seq increment by 1; create table e_basicenc_bin ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), data blob, @@ -1073,10 +983,9 @@ create table e_basicenc_bin ( last_update timestamp not null, constraint pk_e_basicenc_bin primary key (id) ); -create sequence e_basicenc_bin_seq increment by 1; create table e_basicenc_client ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), description raw(80), dob raw(20), @@ -1084,15 +993,13 @@ create table e_basicenc_client ( version number(19) not null, constraint pk_e_basicenc_client primary key (id) ); -create sequence e_basicenc_client_seq increment by 1; create table e_basicenc_relate ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), other_id number(10), constraint pk_e_basicenc_relate primary key (id) ); -create sequence e_basicenc_relate_seq increment by 1; create table e_basic_enum_id ( status varchar2(1) not null, @@ -1103,7 +1010,7 @@ create table e_basic_enum_id ( ); create table e_basic_eni ( - id number(10) not null, + id number(10) generated by default as identity not null, status number(10), name varchar2(255), description varchar2(255), @@ -1111,19 +1018,17 @@ create table e_basic_eni ( constraint ck_e_basic_eni_status check ( status in (1,2,3)), constraint pk_e_basic_eni primary key (id) ); -create sequence e_basic_eni_seq increment by 1; create table ebasic_hstore ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), map varchar2(800), version number(19) not null, constraint pk_ebasic_hstore primary key (id) ); -create sequence ebasic_hstore_seq increment by 1; create table ebasic_json_jackson ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), value_set varchar2(700), value_list clob, @@ -1132,10 +1037,9 @@ create table ebasic_json_jackson ( version number(19) not null, constraint pk_ebasic_json_jackson primary key (id) ); -create sequence ebasic_json_jackson_seq increment by 1; create table ebasic_json_jackson2 ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), value_set varchar2(700), value_list clob, @@ -1144,10 +1048,9 @@ create table ebasic_json_jackson2 ( version number(19) not null, constraint pk_ebasic_json_jackson2 primary key (id) ); -create sequence ebasic_json_jackson2_seq increment by 1; create table ebasic_json_list ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), bean_set varchar2(700), bean_list clob, @@ -1158,126 +1061,112 @@ create table ebasic_json_list ( version number(19) not null, constraint pk_ebasic_json_list primary key (id) ); -create sequence ebasic_json_list_seq increment by 1; create table ebasic_json_map ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_map primary key (id) ); -create sequence ebasic_json_map_seq increment by 1; create table ebasic_json_map_blob ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content blob, version number(19) not null, constraint pk_ebasic_json_map_blob primary key (id) ); -create sequence ebasic_json_map_blob_seq increment by 1; create table ebasic_json_map_clob ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_map_clob primary key (id) ); -create sequence ebasic_json_map_clob_seq increment by 1; create table ebasic_json_map_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, owner_id number(19), name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_map_detail primary key (id) ); -create sequence ebasic_json_map_detail_seq increment by 1; create table ebasic_json_map_json_b ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_map_json_b primary key (id) ); -create sequence ebasic_json_map_json_b_seq increment by 1; create table ebasic_json_map_varchar ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content varchar2(3000), version number(19) not null, constraint pk_ebasic_json_map_varchar primary key (id) ); -create sequence ebasic_json_map_varchar_seq increment by 1; create table ebasic_json_node ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_node primary key (id) ); -create sequence ebasic_json_node_seq increment by 1; create table ebasic_json_node_blob ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content blob, version number(19) not null, constraint pk_ebasic_json_node_blob primary key (id) ); -create sequence ebasic_json_node_blob_seq increment by 1; create table ebasic_json_node_json_b ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content clob, version number(19) not null, constraint pk_ebasic_json_node_json_b primary key (id) ); -create sequence ebasic_json_node_json_b_seq increment by 1; create table ebasic_json_node_varchar ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content varchar2(1000), version number(19) not null, constraint pk_ebasic_json_node_varchar primary key (id) ); -create sequence ebasic_json_node_varchar_seq increment by 1; create table ebasic_json_unmapped ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ebasic_json_unmapped primary key (id) ); -create sequence ebasic_json_unmapped_seq increment by 1; create table e_basic_ndc ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_e_basic_ndc primary key (id) ); -create sequence e_basic_ndc_seq increment by 1; create table ebasic_no_sdchild ( - id number(19) not null, + id number(19) generated by default as identity not null, owner_id number(19) not null, child_name varchar2(255), amount number(19) not null, version number(19) not null, constraint pk_ebasic_no_sdchild primary key (id) ); -create sequence ebasic_no_sdchild_seq increment by 1; create table ebasic_sdchild ( - id number(19) not null, + id number(19) generated by default as identity not null, owner_id number(19) not null, child_name varchar2(255), amount number(19) not null, @@ -1285,48 +1174,43 @@ create table ebasic_sdchild ( deleted number(1) default 0 not null, constraint pk_ebasic_sdchild primary key (id) ); -create sequence ebasic_sdchild_seq increment by 1; create table ebasic_soft_delete ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), description varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_ebasic_soft_delete primary key (id) ); -create sequence ebasic_soft_delete_seq increment by 1; create table e_basicver ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), other varchar2(255), last_update timestamp not null, constraint pk_e_basicver primary key (id) ); -create sequence e_basicver_seq increment by 1; create table e_basic_withlife ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), other varchar2(255), deleted number(1) default 0 not null, version number(19) not null, constraint pk_e_basic_withlife primary key (id) ); -create sequence e_basic_withlife_seq increment by 1; create table e_basic_with_ex ( - id number(19) not null, + id number(19) generated by default as identity not null, deleted number(1) default 0 not null, version number(19) not null, constraint pk_e_basic_with_ex primary key (id) ); -create sequence e_basic_with_ex_seq increment by 1; create table e_basicverucon ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(127), other varchar2(127), other_one varchar2(127), @@ -1336,7 +1220,6 @@ create table e_basicverucon ( constraint uq_e_bscvrcn_thr_thr_n unique (other,other_one), constraint pk_e_basicverucon primary key (id) ); -create sequence e_basicverucon_seq increment by 1; create table ecache_child ( id varchar2(40) not null, @@ -1352,12 +1235,11 @@ create table ecache_root ( ); create table e_col_ab ( - id number(19) not null, + id number(19) generated by default as identity not null, column_a varchar2(255), column_b varchar2(255), constraint pk_e_col_ab primary key (id) ); -create sequence e_col_ab_seq increment by 1; create table ecustom_id ( id varchar2(127) not null, @@ -1366,32 +1248,29 @@ create table ecustom_id ( ); create table edefault_prop ( - id number(10) not null, + id number(10) generated by default as identity not null, e_simple_usertypeid number(10), name varchar2(255), constraint uq_edflt_prp__smpl_srtypd unique (e_simple_usertypeid), constraint pk_edefault_prop primary key (id) ); -create sequence edefault_prop_seq increment by 1; create table eemb_inner ( - id number(10) not null, + id number(10) generated by default as identity not null, nome_inner varchar2(255), outer_id number(10), update_count number(10) not null, constraint pk_eemb_inner primary key (id) ); -create sequence eemb_inner_seq increment by 1; create table eemb_outer ( - id number(10) not null, + id number(10) generated by default as identity not null, nome_outer varchar2(255), date1 timestamp, date2 timestamp, update_count number(10) not null, constraint pk_eemb_outer primary key (id) ); -create sequence eemb_outer_seq increment by 1; create table efile2_no_fk ( file_name varchar2(64) not null, @@ -1419,7 +1298,7 @@ create table efile_no_fk_euser_no_fk_soft_d ( ); create table egen_props ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, @@ -1438,19 +1317,17 @@ create table egen_props ( long_updated number(19) not null, constraint pk_egen_props primary key (id) ); -create sequence egen_props_seq increment by 1; create table eid_uid_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, uuid varchar2(40) not null, name varchar2(255), constraint uq_eid_uid_bean_uuid unique (uuid), constraint pk_eid_uid_bean primary key (id) ); -create sequence eid_uid_bean_seq increment by 1; create table einvoice ( - id number(19) not null, + id number(19) generated by default as identity not null, invoice_date timestamp, state number(10), person_id number(19), @@ -1468,34 +1345,30 @@ create table einvoice ( constraint ck_einvoice_bill_status check ( bill_status in ('ONE','TWO')), constraint pk_einvoice primary key (id) ); -create sequence einvoice_seq increment by 1; create table e_main ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), version number(19) not null, constraint pk_e_main primary key (id) ); -create sequence e_main_seq increment by 1; create table enull_collection ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_enull_collection primary key (id) ); -create sequence enull_collection_seq increment by 1; create table enull_collection_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, enull_collection_id number(10) not null, something varchar2(255), constraint pk_enull_collection_detail primary key (id) ); -create sequence enull_collection_detail_seq increment by 1; create table eopt_one_a ( - id number(10) not null, + id number(10) generated by default as identity not null, name_for_a varchar2(255), b_id number(10), cretime timestamp not null, @@ -1503,10 +1376,9 @@ create table eopt_one_a ( version number(19) not null, constraint pk_eopt_one_a primary key (id) ); -create sequence eopt_one_a_seq increment by 1; create table eopt_one_b ( - id number(10) not null, + id number(10) generated by default as identity not null, name_for_b varchar2(255), c_id number(10) not null, cretime timestamp not null, @@ -1514,20 +1386,18 @@ create table eopt_one_b ( version number(19) not null, constraint pk_eopt_one_b primary key (id) ); -create sequence eopt_one_b_seq increment by 1; create table eopt_one_c ( - id number(10) not null, + id number(10) generated by default as identity not null, name_for_c varchar2(255), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_eopt_one_c primary key (id) ); -create sequence eopt_one_c_seq increment by 1; create table eper_addr ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), ma_street varchar2(255), ma_suburb varchar2(255), @@ -1536,10 +1406,9 @@ create table eper_addr ( version number(19) not null, constraint pk_eper_addr primary key (id) ); -create sequence eper_addr_seq increment by 1; create table eperson ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), notes varchar2(255), street varchar2(255), @@ -1550,17 +1419,15 @@ create table eperson ( constraint ck_eperson_addr_status check ( addr_status in ('ONE','TWO')), constraint pk_eperson primary key (id) ); -create sequence eperson_seq increment by 1; create table e_person_online ( - id number(19) not null, + id number(19) generated by default as identity not null, email varchar2(127), online_status number(1) default 0 not null, when_updated timestamp not null, constraint uq_e_person_online_email unique (email), constraint pk_e_person_online primary key (id) ); -create sequence e_person_online_seq increment by 1; create table esimple ( usertypeid number(10) generated by default as identity not null, @@ -1569,14 +1436,13 @@ create table esimple ( ); create table esoft_del_book ( - id number(19) not null, + id number(19) generated by default as identity not null, book_title varchar2(255), lend_by_id number(19), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_book primary key (id) ); -create sequence esoft_del_book_seq increment by 1; create table esoft_del_book_esoft_del_user ( esoft_del_book_id number(19) not null, @@ -1585,17 +1451,16 @@ create table esoft_del_book_esoft_del_user ( ); create table esoft_del_down ( - id number(19) not null, + id number(19) generated by default as identity not null, esoft_del_mid_id number(19) not null, down varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_down primary key (id) ); -create sequence esoft_del_down_seq increment by 1; create table esoft_del_mid ( - id number(19) not null, + id number(19) generated by default as identity not null, top_id number(19), mid varchar2(255), up_id number(19), @@ -1603,10 +1468,9 @@ create table esoft_del_mid ( deleted number(1) default 0 not null, constraint pk_esoft_del_mid primary key (id) ); -create sequence esoft_del_mid_seq increment by 1; create table esoft_del_one_a ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), oneb_id number(19), deleted number(1) default 0 not null, @@ -1614,24 +1478,21 @@ create table esoft_del_one_a ( constraint uq_esoft_del_one_a_oneb_id unique (oneb_id), constraint pk_esoft_del_one_a primary key (id) ); -create sequence esoft_del_one_a_seq increment by 1; create table esoft_del_one_b ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_esoft_del_one_b primary key (id) ); -create sequence esoft_del_one_b_seq increment by 1; create table esoft_del_role ( - id number(19) not null, + id number(19) generated by default as identity not null, role_name varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_role primary key (id) ); -create sequence esoft_del_role_seq increment by 1; create table esoft_del_role_esoft_del_user ( esoft_del_role_id number(19) not null, @@ -1640,31 +1501,28 @@ create table esoft_del_role_esoft_del_user ( ); create table esoft_del_top ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_top primary key (id) ); -create sequence esoft_del_top_seq increment by 1; create table esoft_del_up ( - id number(19) not null, + id number(19) generated by default as identity not null, up varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_up primary key (id) ); -create sequence esoft_del_up_seq increment by 1; create table esoft_del_user ( - id number(19) not null, + id number(19) generated by default as identity not null, user_name varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esoft_del_user primary key (id) ); -create sequence esoft_del_user_seq increment by 1; create table esoft_del_user_esoft_del_role ( esoft_del_user_id number(19) not null, @@ -1673,69 +1531,61 @@ create table esoft_del_user_esoft_del_role ( ); create table esome_convert_type ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), money number(16,3), constraint pk_esome_convert_type primary key (id) ); -create sequence esome_convert_type_seq increment by 1; create table esome_type ( - id number(10) not null, + id number(10) generated by default as identity not null, currency varchar2(3), locale varchar2(20), time_zone varchar2(20), constraint pk_esome_type primary key (id) ); -create sequence esome_type_seq increment by 1; create table etrans_many ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_etrans_many primary key (id) ); -create sequence etrans_many_seq increment by 1; create table rawinherit_uncle ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), parent_id number(19) not null, version number(19) not null, constraint pk_rawinherit_uncle primary key (id) ); -create sequence rawinherit_uncle_seq increment by 1; create table euser_no_fk ( - user_id number(10) not null, + user_id number(10) generated by default as identity not null, user_name varchar2(255), constraint pk_euser_no_fk primary key (user_id) ); -create sequence euser_no_fk_seq increment by 1; create table euser_no_fk_soft_del ( - user_id number(10) not null, + user_id number(10) generated by default as identity not null, user_name varchar2(255), constraint pk_euser_no_fk_soft_del primary key (user_id) ); -create sequence euser_no_fk_soft_del_seq increment by 1; create table evanilla_collection ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_evanilla_collection primary key (id) ); -create sequence evanilla_collection_seq increment by 1; create table evanilla_collection_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, evanilla_collection_id number(10) not null, something varchar2(255), constraint pk_evanilla_collection_detail primary key (id) ); -create sequence evanilla_collection_detail_seq increment by 1; create table ewho_props ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, @@ -1744,10 +1594,9 @@ create table ewho_props ( who_modified varchar2(255) not null, constraint pk_ewho_props primary key (id) ); -create sequence ewho_props_seq increment by 1; create table e_withinet ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), inet_address varchar2(50), inet2 varchar2(255), @@ -1755,15 +1604,13 @@ create table e_withinet ( version number(19) not null, constraint pk_e_withinet primary key (id) ); -create sequence e_withinet_seq increment by 1; create table ec_enum_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ec_enum_person primary key (id) ); -create sequence ec_enum_person_seq increment by 1; create table ec_enum_person_tags ( ec_enum_person_id number(19) not null, @@ -1772,12 +1619,11 @@ create table ec_enum_person_tags ( ); create table ec_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ec_person primary key (id) ); -create sequence ec_person_seq increment by 1; create table ec_person_phone ( owner_id number(19) not null, @@ -1785,13 +1631,12 @@ create table ec_person_phone ( ); create table ec_top ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), person_id number(19), version number(19) not null, constraint pk_ec_top primary key (id) ); -create sequence ec_top_seq increment by 1; create table ec_top_ecs_person ( ec_top_id number(19) not null, @@ -1800,12 +1645,11 @@ create table ec_top_ecs_person ( ); create table ecbl_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecbl_person primary key (id) ); -create sequence ecbl_person_seq increment by 1; create table ecbl_person_phone_numbers ( person_id number(19) not null, @@ -1815,12 +1659,11 @@ create table ecbl_person_phone_numbers ( ); create table ecbm_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecbm_person primary key (id) ); -create sequence ecbm_person_seq increment by 1; create table ecbm_person_phone_numbers ( person_id number(19) not null, @@ -1831,12 +1674,11 @@ create table ecbm_person_phone_numbers ( ); create table ecm_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecm_person primary key (id) ); -create sequence ecm_person_seq increment by 1; create table ecm_person_phone_numbers ( ecm_person_id number(19) not null, @@ -1845,12 +1687,11 @@ create table ecm_person_phone_numbers ( ); create table ecmc_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecmc_person primary key (id) ); -create sequence ecmc_person_seq increment by 1; create table ecmc_person_phone_numbers ( ecmc_person_id number(19) not null, @@ -1859,12 +1700,11 @@ create table ecmc_person_phone_numbers ( ); create table ecs_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecs_person primary key (id) ); -create sequence ecs_person_seq increment by 1; create table ecs_person_phone ( ecs_person_id number(19) not null, @@ -1892,12 +1732,11 @@ create table ecsm_one ( ); create table ecsm_parent ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_ecsm_parent primary key (id) ); -create sequence ecsm_parent_seq increment by 1; create table ecsm_two ( id varchar2(40) not null, @@ -1907,80 +1746,71 @@ create table ecsm_two ( ); create table td_child ( - child_id number(10) not null, + child_id number(10) generated by default as identity not null, child_name varchar2(255), parent_id number(10) not null, constraint pk_td_child primary key (child_id) ); -create sequence td_child_seq increment by 1; create table td_parent ( parent_type varchar2(31) not null, - parent_id number(10) not null, + parent_id number(10) generated by default as identity not null, parent_name varchar2(255), extended_name varchar2(255), constraint pk_td_parent primary key (parent_id) ); -create sequence td_parent_seq increment by 1; create table element_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, complex_bean_id varchar2(40) not null, value varchar2(255) not null, constraint pk_element_bean primary key (id) ); -create sequence element_bean_seq increment by 1; create table empl ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), age number(10), default_address_id number(19), constraint pk_empl primary key (id) ); -create sequence empl_seq increment by 1; create table esd_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), master_id number(19) not null, version number(19) not null, deleted number(1) default 0 not null, constraint pk_esd_detail primary key (id) ); -create sequence esd_detail_seq increment by 1; create table esd_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, deleted number(1) default 0 not null, constraint pk_esd_master primary key (id) ); -create sequence esd_master_seq increment by 1; create table feature_desc ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), constraint pk_feature_desc primary key (id) ); -create sequence feature_desc_seq increment by 1; create table f_first ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_f_first primary key (id) ); -create sequence f_first_seq increment by 1; create table foo ( - foo_id number(10) not null, + foo_id number(10) generated by default as identity not null, important_text varchar2(255), version number(10) not null, constraint pk_foo primary key (foo_id) ); -create sequence foo_seq increment by 1; create table gen_key_identity ( id number(19) generated by default as identity not null, @@ -1996,7 +1826,7 @@ create table gen_key_sequence ( create sequence SEQ_NAME increment by 1; create table grand_parent_person ( - identifier number(10) not null, + identifier number(10) generated by default as identity not null, name varchar2(255), age number(10), some_bean_id number(10), @@ -2004,19 +1834,17 @@ create table grand_parent_person ( address varchar2(255), constraint pk_grand_parent_person primary key (identifier) ); -create sequence grand_parent_person_seq increment by 1; create table survey_group ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), categoryobjectid number(19), sequence_number number(10) not null, constraint pk_survey_group primary key (id) ); -create sequence survey_group_seq increment by 1; create table c_group ( - id number(19) not null, + id number(19) generated by default as identity not null, inactive number(1) default 0 not null, name varchar2(255), version number(19) not null, @@ -2024,20 +1852,18 @@ create table c_group ( when_modified timestamp not null, constraint pk_c_group primary key (id) ); -create sequence c_group_seq increment by 1; create table he_doc ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_he_doc primary key (id) ); -create sequence he_doc_seq increment by 1; create table hx_link ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), location varchar2(255), comments varchar2(255), @@ -2047,7 +1873,6 @@ create table hx_link ( deleted number(1) default 0 not null, constraint pk_hx_link primary key (id) ); -create sequence hx_link_seq increment by 1; create table hx_link_doc ( hx_link_id number(19) not null, @@ -2056,17 +1881,16 @@ create table hx_link_doc ( ); create table hi_doc ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_hi_doc primary key (id) ); -create sequence hi_doc_seq increment by 1; create table hi_link ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), location varchar2(255), comments varchar2(255), @@ -2075,7 +1899,6 @@ create table hi_link ( when_modified timestamp not null, constraint pk_hi_link primary key (id) ); -create sequence hi_link_seq increment by 1; create table hi_link_doc ( hi_link_id number(19) not null, @@ -2084,7 +1907,7 @@ create table hi_link_doc ( ); create table hi_tone ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), comments varchar2(255), version number(19) not null, @@ -2092,10 +1915,9 @@ create table hi_tone ( when_modified timestamp not null, constraint pk_hi_tone primary key (id) ); -create sequence hi_tone_seq increment by 1; create table hi_tthree ( - id number(19) not null, + id number(19) generated by default as identity not null, hi_ttwo_id number(19) not null, three varchar2(255), version number(19) not null, @@ -2103,10 +1925,9 @@ create table hi_tthree ( when_modified timestamp not null, constraint pk_hi_tthree primary key (id) ); -create sequence hi_tthree_seq increment by 1; create table hi_ttwo ( - id number(19) not null, + id number(19) generated by default as identity not null, hi_tone_id number(19) not null, two varchar2(255), version number(19) not null, @@ -2114,10 +1935,9 @@ create table hi_ttwo ( when_modified timestamp not null, constraint pk_hi_ttwo primary key (id) ); -create sequence hi_ttwo_seq increment by 1; create table hsd_setting ( - id number(19) not null, + id number(19) generated by default as identity not null, code varchar2(255), content varchar2(255), user_id number(19), @@ -2128,10 +1948,9 @@ create table hsd_setting ( constraint uq_hsd_setting_user_id unique (user_id), constraint pk_hsd_setting primary key (id) ); -create sequence hsd_setting_seq increment by 1; create table hsd_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, @@ -2139,41 +1958,36 @@ create table hsd_user ( deleted number(1) default 0 not null, constraint pk_hsd_user primary key (id) ); -create sequence hsd_user_seq increment by 1; create table iaf_segment ( ptype varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, segment_id_zat number(19) not null, status_id number(19) not null, constraint pk_iaf_segment primary key (id) ); -create sequence iaf_segment_seq increment by 1; create table iaf_segment_status ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_iaf_segment_status primary key (id) ); -create sequence iaf_segment_status_seq increment by 1; create table imrelated ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), owner_id number(19) not null, constraint pk_imrelated primary key (id) ); -create sequence imrelated_seq increment by 1; create table imroot ( dtype varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), title varchar2(255), when_title timestamp, constraint pk_imroot primary key (id) ); -create sequence imroot_seq increment by 1; create table ixresource ( dtype varchar2(255), @@ -2183,40 +1997,36 @@ create table ixresource ( ); create table info_company ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_info_company primary key (id) ); -create sequence info_company_seq increment by 1; create table info_contact ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), company_id number(19) not null, version number(19) not null, constraint pk_info_contact primary key (id) ); -create sequence info_contact_seq increment by 1; create table info_customer ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), company_id number(19), version number(19) not null, constraint uq_info_customer_company_id unique (company_id), constraint pk_info_customer primary key (id) ); -create sequence info_customer_seq increment by 1; create table inner_report ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), forecast_id number(19), constraint uq_inner_report_forecast_id unique (forecast_id), constraint pk_inner_report primary key (id) ); -create sequence inner_report_seq increment by 1; create table drel_invoice ( id number(19) not null, @@ -2242,21 +2052,19 @@ create table item ( ); create table monkey ( - mid number(19) not null, + mid number(19) generated by default as identity not null, name varchar2(255), food_preference varchar2(255), version number(19) not null, constraint pk_monkey primary key (mid) ); -create sequence monkey_seq increment by 1; create table mkeygroup ( - pid number(19) not null, + pid number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_mkeygroup primary key (pid) ); -create sequence mkeygroup_seq increment by 1; create table mkeygroup_monkey ( mkeygroup_pid number(19) not null, @@ -2266,12 +2074,11 @@ create table mkeygroup_monkey ( ); create table trainer ( - tid number(19) not null, + tid number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_trainer primary key (tid) ); -create sequence trainer_seq increment by 1; create table trainer_monkey ( trainer_tid number(19) not null, @@ -2281,12 +2088,11 @@ create table trainer_monkey ( ); create table troop ( - pid number(19) not null, + pid number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_troop primary key (pid) ); -create sequence troop_seq increment by 1; create table troop_monkey ( troop_pid number(19) not null, @@ -2296,25 +2102,22 @@ create table troop_monkey ( ); create table l2_cldf_reset_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_l2_cldf_reset_bean primary key (id) ); -create sequence l2_cldf_reset_bean_seq increment by 1; create table l2_cldf_reset_bean_child ( - id number(19) not null, + id number(19) generated by default as identity not null, parent_id number(19), constraint pk_l2_cldf_reset_bean_child primary key (id) ); -create sequence l2_cldf_reset_bean_child_seq increment by 1; create table level1 ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_level1 primary key (id) ); -create sequence level1_seq increment by 1; create table level1_level4 ( level1_id number(19) not null, @@ -2329,11 +2132,10 @@ create table level1_level2 ( ); create table level2 ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_level2 primary key (id) ); -create sequence level2_seq increment by 1; create table level2_level3 ( level2_id number(19) not null, @@ -2342,21 +2144,19 @@ create table level2_level3 ( ); create table level3 ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_level3 primary key (id) ); -create sequence level3_seq increment by 1; create table level4 ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_level4 primary key (id) ); -create sequence level4_seq increment by 1; create table link ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), location varchar2(255), when_publish timestamp, @@ -2367,10 +2167,9 @@ create table link ( deleted number(1) default 0 not null, constraint pk_link primary key (id) ); -create sequence link_seq increment by 1; create table link_draft ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), location varchar2(255), when_publish timestamp, @@ -2382,17 +2181,15 @@ create table link_draft ( deleted number(1) default 0 not null, constraint pk_link_draft primary key (id) ); -create sequence link_draft_seq increment by 1; create table la_attr_value ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_la_attr_value primary key (id) ); -create sequence la_attr_value_seq increment by 1; create table la_attr_value_attribute ( la_attr_value_id number(10) not null, @@ -2401,12 +2198,11 @@ create table la_attr_value_attribute ( ); create table looney ( - id number(19) not null, + id number(19) generated by default as identity not null, tune_id number(19), name varchar2(255), constraint pk_looney primary key (id) ); -create sequence looney_seq increment by 1; create table maddress ( id varchar2(40) not null, @@ -2447,19 +2243,17 @@ create table mcustomer ( ); create table mgroup ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_mgroup primary key (id) ); -create sequence mgroup_seq increment by 1; create table mmachine ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_mmachine primary key (id) ); -create sequence mmachine_seq increment by 1; create table mmachine_mgroup ( mmachine_id number(19) not null, @@ -2469,25 +2263,23 @@ create table mmachine_mgroup ( create table mmedia ( type varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, url varchar2(255), note varchar2(255), constraint pk_mmedia primary key (id) ); -create sequence mmedia_seq increment by 1; create table non_updateprop ( - id number(10) not null, + id number(10) generated by default as identity not null, non_enum varchar2(5), name varchar2(255), note varchar2(255), constraint ck_non_updateprop_non_enum check ( non_enum in ('BEGIN','END')), constraint pk_non_updateprop primary key (id) ); -create sequence non_updateprop_seq increment by 1; create table mprinter ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), flags number(19) not null, current_state_id number(19), @@ -2502,38 +2294,33 @@ create table mprinter ( constraint uq_mprntr_lst_swp_blck_d unique (last_swap_black_id), constraint pk_mprinter primary key (id) ); -create sequence mprinter_seq increment by 1; create table mprinter_state ( - id number(19) not null, + id number(19) generated by default as identity not null, flags number(19) not null, printer_id number(19), version number(19) not null, constraint pk_mprinter_state primary key (id) ); -create sequence mprinter_state_seq increment by 1; create table mprofile ( - id number(19) not null, + id number(19) generated by default as identity not null, picture_id number(19), name varchar2(255), constraint pk_mprofile primary key (id) ); -create sequence mprofile_seq increment by 1; create table mprotected_construct_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_mprotected_construct_bean primary key (id) ); -create sequence mprotected_construct_bean_seq increment by 1; create table mrole ( - roleid number(10) not null, + roleid number(10) generated by default as identity not null, role_name varchar2(255), constraint pk_mrole primary key (roleid) ); -create sequence mrole_seq increment by 1; create table mrole_muser ( mrole_roleid number(10) not null, @@ -2542,42 +2329,37 @@ create table mrole_muser ( ); create table msome_other ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_msome_other primary key (id) ); -create sequence msome_other_seq increment by 1; create table muser ( - userid number(10) not null, + userid number(10) generated by default as identity not null, user_name varchar2(255), user_type_id number(10), constraint pk_muser primary key (userid) ); -create sequence muser_seq increment by 1; create table muser_type ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_muser_type primary key (id) ); -create sequence muser_type_seq increment by 1; create table mail_box ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_mail_box primary key (id) ); -create sequence mail_box_seq increment by 1; create table mail_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_mail_user primary key (id) ); -create sequence mail_user_seq increment by 1; create table mail_user_inbox ( mail_user_id number(19) not null, @@ -2607,16 +2389,15 @@ create table main_entity_relation ( ); create table map_super_actual ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), when_created timestamp not null, when_updated timestamp not null, constraint pk_map_super_actual primary key (id) ); -create sequence map_super_actual_seq increment by 1; create table c_message ( - id number(19) not null, + id number(19) generated by default as identity not null, title varchar2(255), body varchar2(255), conversation_id number(19), @@ -2626,7 +2407,6 @@ create table c_message ( when_modified timestamp not null, constraint pk_c_message primary key (id) ); -create sequence c_message_seq increment by 1; create table meter_address_data ( id varchar2(40) not null, @@ -2665,20 +2445,18 @@ create table meter_version ( ); create table mnoc_role ( - role_id number(10) not null, + role_id number(10) generated by default as identity not null, role_name varchar2(255), version number(10) not null, constraint pk_mnoc_role primary key (role_id) ); -create sequence mnoc_role_seq increment by 1; create table mnoc_user ( - user_id number(10) not null, + user_id number(10) generated by default as identity not null, user_name varchar2(255), version number(10) not null, constraint pk_mnoc_user primary key (user_id) ); -create sequence mnoc_user_seq increment by 1; create table mnoc_user_mnoc_role ( mnoc_user_user_id number(10) not null, @@ -2687,17 +2465,16 @@ create table mnoc_user_mnoc_role ( ); create table mny_a ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_mny_a primary key (id) ); -create sequence mny_a_seq increment by 1; create table mny_b ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), a_id number(19), version number(19) not null, @@ -2705,7 +2482,6 @@ create table mny_b ( when_modified timestamp not null, constraint pk_mny_b primary key (id) ); -create sequence mny_b_seq increment by 1; create table mny_b_mny_c ( mny_b_id number(19) not null, @@ -2714,22 +2490,20 @@ create table mny_b_mny_c ( ); create table mny_c ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_mny_c primary key (id) ); -create sequence mny_c_seq increment by 1; create table mny_topic ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_mny_topic primary key (id) ); -create sequence mny_topic_seq increment by 1; create table subtopics ( topic number(19) not null, @@ -2738,30 +2512,27 @@ create table subtopics ( ); create table mp_role ( - id number(19) not null, + id number(19) generated by default as identity not null, mp_user_id number(19) not null, code varchar2(255), organization_id number(19), constraint pk_mp_role primary key (id) ); -create sequence mp_role_seq increment by 1; create table mp_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_mp_user primary key (id) ); -create sequence mp_user_seq increment by 1; create table ms_many_a ( - aid number(19) not null, + aid number(19) generated by default as identity not null, name varchar2(255), ms_many_a_many_b number(1) default 0 not null, ms_many_b number(1) default 0 not null, deleted number(1) default 0 not null, constraint pk_ms_many_a primary key (aid) ); -create sequence ms_many_a_seq increment by 1; create table ms_many_a_many_b ( ms_many_a_aid number(19) not null, @@ -2770,12 +2541,11 @@ create table ms_many_a_many_b ( ); create table ms_many_b ( - bid number(19) not null, + bid number(19) generated by default as identity not null, name varchar2(255), deleted number(1) default 0 not null, constraint pk_ms_many_b primary key (bid) ); -create sequence ms_many_b_seq increment by 1; create table ms_many_b_many_a ( ms_many_b_bid number(19) not null, @@ -2784,22 +2554,20 @@ create table ms_many_b_many_a ( ); create table my_lob_size ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), my_count number(10) not null, my_lob clob, constraint pk_my_lob_size primary key (id) ); -create sequence my_lob_size_seq increment by 1; create table my_lob_size_join_many ( - id number(10) not null, + id number(10) generated by default as identity not null, something varchar2(255), other varchar2(255), parent_id number(10), constraint pk_my_lob_size_join_many primary key (id) ); -create sequence my_lob_size_join_many_seq increment by 1; create table noidbean ( name varchar2(255), @@ -2808,37 +2576,33 @@ create table noidbean ( ); create table o_bean_child ( - id number(19) not null, + id number(19) generated by default as identity not null, cached_bean_id number(19), constraint pk_o_bean_child primary key (id) ); -create sequence o_bean_child_seq increment by 1; create table ocached_app ( - id number(19) not null, + id number(19) generated by default as identity not null, app_name varchar2(255), version number(19) not null, constraint uq_ocached_app_app_name unique (app_name), constraint pk_ocached_app primary key (id) ); -create sequence ocached_app_seq increment by 1; create table ocached_app_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, app_id number(19) not null, detail varchar2(255), version number(19) not null, constraint uq_occhd_pp_dtl_pp_d_dtl unique (app_id,detail), constraint pk_ocached_app_detail primary key (id) ); -create sequence ocached_app_detail_seq increment by 1; create table o_cached_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_o_cached_bean primary key (id) ); -create sequence o_cached_bean_seq increment by 1; create table o_cached_bean_country ( o_cached_bean_id number(19) not null, @@ -2847,52 +2611,47 @@ create table o_cached_bean_country ( ); create table o_cached_bean_child ( - id number(19) not null, + id number(19) generated by default as identity not null, cached_bean_id number(19), constraint pk_o_cached_bean_child primary key (id) ); -create sequence o_cached_bean_child_seq increment by 1; create table o_cached_inherit ( dtype varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), child_adata varchar2(255), child_bdata varchar2(255), constraint pk_o_cached_inherit primary key (id) ); -create sequence o_cached_inherit_seq increment by 1; create table o_cached_natkey ( - id number(19) not null, + id number(19) generated by default as identity not null, store varchar2(255), sku varchar2(255), description varchar2(255), constraint pk_o_cached_natkey primary key (id) ); -create sequence o_cached_natkey_seq increment by 1; create table o_cached_natkey3 ( - id number(19) not null, + id number(19) generated by default as identity not null, store varchar2(255), code number(10) not null, sku varchar2(255), description varchar2(255), constraint pk_o_cached_natkey3 primary key (id) ); -create sequence o_cached_natkey3_seq increment by 1; create table ocached_nkey_uid ( - id number(19) not null, + id number(19) generated by default as identity not null, cid varchar2(40), other varchar2(255), version number(19) not null, constraint pk_ocached_nkey_uid primary key (id) ); -create sequence ocached_nkey_uid_seq increment by 1; create table ocar ( - id number(10) not null, + id number(10) generated by default as identity not null, vin varchar2(255), name varchar2(255), cretime timestamp not null, @@ -2900,10 +2659,9 @@ create table ocar ( version number(19) not null, constraint pk_ocar primary key (id) ); -create sequence ocar_seq increment by 1; create table ocompany ( - id number(10) not null, + id number(10) generated by default as identity not null, corp_id varchar2(50), cretime timestamp not null, updtime timestamp not null, @@ -2911,7 +2669,6 @@ create table ocompany ( constraint uq_ocompany_corp_id unique (corp_id), constraint pk_ocompany primary key (id) ); -create sequence ocompany_seq increment by 1; create table oengine ( engine_id varchar2(40) not null, @@ -2945,7 +2702,7 @@ create table omvertex_other ( ); create table oroad_show_msg ( - id number(10) not null, + id number(10) generated by default as identity not null, company_id number(10) not null, cretime timestamp not null, updtime timestamp not null, @@ -2953,66 +2710,58 @@ create table oroad_show_msg ( constraint uq_oroad_show_msg_company_id unique (company_id), constraint pk_oroad_show_msg primary key (id) ); -create sequence oroad_show_msg_seq increment by 1; create table om_account_child_dbo ( - id number(19) not null, + id number(19) generated by default as identity not null, description varchar2(255), banana_rama_id number(19), constraint pk_om_account_child_dbo primary key (id) ); -create sequence om_account_child_dbo_seq increment by 1; create table om_account_dbo ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_om_account_dbo primary key (id) ); -create sequence om_account_dbo_seq increment by 1; create table om_basic_child ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), parent_id number(19), version number(19) not null, constraint pk_om_basic_child primary key (id) ); -create sequence om_basic_child_seq increment by 1; create table om_basic_parent ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_om_basic_parent primary key (id) ); -create sequence om_basic_parent_seq increment by 1; create table om_ordered_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), master_id number(19), version number(19) not null, sort_order number(10), constraint pk_om_ordered_detail primary key (id) ); -create sequence om_ordered_detail_seq increment by 1; create table om_ordered_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_om_ordered_master primary key (id) ); -create sequence om_ordered_master_seq increment by 1; create table only_id_entity ( - id number(19) not null, + id number(19) generated by default as identity not null, constraint pk_only_id_entity primary key (id) ); -create sequence only_id_entity_seq increment by 1; create table o_order ( - id number(10) not null, + id number(10) generated by default as identity not null, status number(10), order_date date, ship_date date, @@ -3022,10 +2771,9 @@ create table o_order ( constraint ck_o_order_status check ( status in (0,1,2,3)), constraint pk_o_order primary key (id) ); -create sequence o_order_seq increment by 1; create table o_order_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, order_id number(10) not null, order_qty number(10), ship_qty number(10), @@ -3035,7 +2783,6 @@ create table o_order_detail ( updtime timestamp not null, constraint pk_o_order_detail primary key (id) ); -create sequence o_order_detail_seq increment by 1; create table s_orders ( uuid varchar2(40) not null, @@ -3052,7 +2799,7 @@ create table s_order_items ( ); create table or_order_ship ( - id number(10) not null, + id number(10) generated by default as identity not null, order_id number(10), ship_time timestamp, cretime timestamp not null, @@ -3060,34 +2807,30 @@ create table or_order_ship ( version number(19) not null, constraint pk_or_order_ship primary key (id) ); -create sequence or_order_ship_seq increment by 1; create table organisation ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_organisation primary key (id) ); -create sequence organisation_seq increment by 1; create table organization_node ( kind varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, parent_tree_node_id number(19) not null, title varchar2(255), constraint uq_orgnztn_nd_prnt_tr_nd_d unique (parent_tree_node_id), constraint pk_organization_node primary key (id) ); -create sequence organization_node_seq increment by 1; create table organization_tree_node ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_organization_tree_node primary key (id) ); -create sequence organization_tree_node_seq increment by 1; create table orp_detail ( id varchar2(100) not null, @@ -3135,38 +2878,34 @@ create table oto_atwo ( ); create table oto_bchild ( - master_id number(19) not null, + master_id number(19) generated by default as identity not null, child varchar2(255), constraint pk_oto_bchild primary key (master_id) ); -create sequence oto_bchild_seq increment by 1; create table oto_bmaster ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_oto_bmaster primary key (id) ); -create sequence oto_bmaster_seq increment by 1; create table oto_child ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), master_id number(19), constraint uq_oto_child_master_id unique (master_id), constraint pk_oto_child primary key (id) ); -create sequence oto_child_seq increment by 1; create table oto_cust ( - cid number(19) not null, + cid number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_oto_cust primary key (cid) ); -create sequence oto_cust_seq increment by 1; create table oto_cust_address ( - aid number(19) not null, + aid number(19) generated by default as identity not null, line1 varchar2(255), line2 varchar2(255), line3 varchar2(255), @@ -3175,58 +2914,51 @@ create table oto_cust_address ( constraint uq_ot_cst_ddrss_cstmr_cd unique (customer_cid), constraint pk_oto_cust_address primary key (aid) ); -create sequence oto_cust_address_seq increment by 1; create table oto_level_a ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), b_id number(19), constraint uq_oto_level_a_b_id unique (b_id), constraint pk_oto_level_a primary key (id) ); -create sequence oto_level_a_seq increment by 1; create table oto_level_b ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), c_id number(19), constraint uq_oto_level_b_c_id unique (c_id), constraint pk_oto_level_b primary key (id) ); -create sequence oto_level_b_seq increment by 1; create table oto_level_c ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_oto_level_c primary key (id) ); -create sequence oto_level_c_seq increment by 1; create table oto_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_oto_master primary key (id) ); -create sequence oto_master_seq increment by 1; create table oto_prime ( - pid number(19) not null, + pid number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_oto_prime primary key (pid) ); -create sequence oto_prime_seq increment by 1; create table oto_prime_extra ( - eid number(19) not null, + eid number(19) generated by default as identity not null, extra varchar2(255), version number(19) not null, constraint pk_oto_prime_extra primary key (eid) ); -create sequence oto_prime_extra_seq increment by 1; create table oto_sd_child ( - id number(19) not null, + id number(19) generated by default as identity not null, child varchar2(255), master_id number(19), deleted number(1) default 0 not null, @@ -3234,18 +2966,16 @@ create table oto_sd_child ( constraint uq_oto_sd_child_master_id unique (master_id), constraint pk_oto_sd_child primary key (id) ); -create sequence oto_sd_child_seq increment by 1; create table oto_sd_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_oto_sd_master primary key (id) ); -create sequence oto_sd_master_seq increment by 1; create table oto_th_many ( - id number(19) not null, + id number(19) generated by default as identity not null, oto_th_top_id number(19) not null, many varchar2(255), version number(19) not null, @@ -3253,10 +2983,9 @@ create table oto_th_many ( when_modified timestamp not null, constraint pk_oto_th_many primary key (id) ); -create sequence oto_th_many_seq increment by 1; create table oto_th_one ( - id number(19) not null, + id number(19) generated by default as identity not null, one number(1) default 0 not null, many_id number(19), version number(19) not null, @@ -3265,17 +2994,15 @@ create table oto_th_one ( constraint uq_oto_th_one_many_id unique (many_id), constraint pk_oto_th_one primary key (id) ); -create sequence oto_th_one_seq increment by 1; create table oto_th_top ( - id number(19) not null, + id number(19) generated by default as identity not null, topp varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_oto_th_top primary key (id) ); -create sequence oto_th_top_seq increment by 1; create table oto_ubprime ( pid varchar2(40) not null, @@ -3306,7 +3033,7 @@ create table oto_uprime_extra ( ); create table oto_user_model ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), user_optional_id number(19), version number(19) not null, @@ -3315,20 +3042,18 @@ create table oto_user_model ( constraint uq_ot_sr_mdl_sr_ptnl_d unique (user_optional_id), constraint pk_oto_user_model primary key (id) ); -create sequence oto_user_model_seq increment by 1; create table oto_user_model_optional ( - id number(19) not null, + id number(19) generated by default as identity not null, optional varchar2(255), version number(19) not null, when_created timestamp not null, when_modified timestamp not null, constraint pk_oto_user_model_optional primary key (id) ); -create sequence oto_user_model_optional_seq increment by 1; create table pfile ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), file_content_id number(10), file_content2_id number(10), @@ -3339,17 +3064,15 @@ create table pfile ( constraint uq_pfile_file_content2_id unique (file_content2_id), constraint pk_pfile primary key (id) ); -create sequence pfile_seq increment by 1; create table pfile_content ( - id number(10) not null, + id number(10) generated by default as identity not null, content blob, cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_pfile_content primary key (id) ); -create sequence pfile_content_seq increment by 1; create table paggview ( pview_id varchar2(40), @@ -3359,37 +3082,33 @@ create table paggview ( create table pallet_location ( type varchar2(31) not null, - id number(10) not null, + id number(10) generated by default as identity not null, zone_sid number(10) not null, attribute varchar2(255), constraint pk_pallet_location primary key (id) ); -create sequence pallet_location_seq increment by 1; create table parcel ( - parcelid number(19) not null, + parcelid number(19) generated by default as identity not null, description varchar2(255), constraint pk_parcel primary key (parcelid) ); -create sequence parcel_seq increment by 1; create table parcel_location ( - parcellocid number(19) not null, + parcellocid number(19) generated by default as identity not null, location varchar2(255), parcelid number(19), constraint uq_parcel_location_parcelid unique (parcelid), constraint pk_parcel_location primary key (parcellocid) ); -create sequence parcel_location_seq increment by 1; create table rawinherit_parent ( type varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, val number(10), more varchar2(255), constraint pk_rawinherit_parent primary key (id) ); -create sequence rawinherit_parent_seq increment by 1; create table rawinherit_parent_rawinherit_d ( rawinherit_parent_id number(19) not null, @@ -3398,14 +3117,13 @@ create table rawinherit_parent_rawinherit_d ( ); create table e_save_test_c ( - id number(19) not null, + id number(19) generated by default as identity not null, version number(19) not null, constraint pk_e_save_test_c primary key (id) ); -create sequence e_save_test_c_seq increment by 1; create table parent_person ( - identifier number(10) not null, + identifier number(10) generated by default as identity not null, name varchar2(255), age number(10), some_bean_id number(10), @@ -3414,10 +3132,9 @@ create table parent_person ( address varchar2(255), constraint pk_parent_person primary key (identifier) ); -create sequence parent_person_seq increment by 1; create table c_participation ( - id number(19) not null, + id number(19) generated by default as identity not null, rating number(10), type number(10), conversation_id number(19) not null, @@ -3428,10 +3145,9 @@ create table c_participation ( constraint ck_c_participation_type check ( type in (0,1)), constraint pk_c_participation primary key (id) ); -create sequence c_participation_seq increment by 1; create table password_store_model ( - id number(19) not null, + id number(19) generated by default as identity not null, enc1 varchar2(30), enc2 varchar2(40), enc3 clob, @@ -3443,18 +3159,16 @@ create table password_store_model ( when_modified timestamp not null, constraint pk_password_store_model primary key (id) ); -create sequence password_store_model_seq increment by 1; create table pcf_calendar ( - id number(19) not null, + id number(19) generated by default as identity not null, pcf_person_id number(19) not null, version number(19) not null, constraint pk_pcf_calendar primary key (id) ); -create sequence pcf_calendar_seq increment by 1; create table pcf_city ( - id number(19) not null, + id number(19) generated by default as identity not null, pcf_country_id number(19) not null, name varchar2(255), mayor_id number(19) not null, @@ -3464,31 +3178,27 @@ create table pcf_city ( constraint uq_pcf_city_vice_mayor_id unique (vice_mayor_id), constraint pk_pcf_city primary key (id) ); -create sequence pcf_city_seq increment by 1; create table pcf_country ( - id number(19) not null, + id number(19) generated by default as identity not null, version number(19) not null, constraint pk_pcf_country primary key (id) ); -create sequence pcf_country_seq increment by 1; create table pcf_event ( - id number(19) not null, + id number(19) generated by default as identity not null, pcf_calendar_id number(19) not null, name varchar2(255), version number(19) not null, constraint pk_pcf_event primary key (id) ); -create sequence pcf_event_seq increment by 1; create table pcf_person ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_pcf_person primary key (id) ); -create sequence pcf_person_seq increment by 1; create table mt_permission ( id varchar2(40) not null, @@ -3497,17 +3207,16 @@ create table mt_permission ( ); create table persistent_file ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), cretime timestamp not null, updtime timestamp not null, version number(19) not null, constraint pk_persistent_file primary key (id) ); -create sequence persistent_file_seq increment by 1; create table persistent_file_content ( - id number(10) not null, + id number(10) generated by default as identity not null, persistent_file_id number(10), content blob, cretime timestamp not null, @@ -3516,23 +3225,20 @@ create table persistent_file_content ( constraint uq_prsstnt_fl_cntnt_prsstnt_1 unique (persistent_file_id), constraint pk_persistent_file_content primary key (id) ); -create sequence persistent_file_content_seq increment by 1; create table person ( - oid number(19) not null, + oid number(19) generated by default as identity not null, default_address_oid number(19), version number(10) not null, constraint pk_person primary key (oid) ); -create sequence person_seq increment by 1; create table persons ( - id number(19) not null, + id number(19) generated by default as identity (start with 1000 increment by 40) not null, surname varchar2(64) not null, name varchar2(64) not null, constraint pk_persons primary key (id) ); -create sequence PERSONS_seq start with 1000 increment by 1; create table person_cache_email ( id varchar2(128) not null, @@ -3548,21 +3254,19 @@ create table person_cache_info ( ); create table phones ( - id number(19) not null, + id number(19) generated by default as identity not null, phone_number varchar2(7) not null, person_id number(19) not null, constraint uq_phones_phone_number unique (phone_number), constraint pk_phones primary key (id) ); -create sequence PHONES_seq increment by 1; create table e_position ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), contract_id number(19) not null, constraint pk_e_position primary key (id) ); -create sequence e_position_seq increment by 1; create table primary_revision ( id number(19) not null, @@ -3573,14 +3277,13 @@ create table primary_revision ( ); create table o_product ( - id number(10) not null, + id number(10) generated by default as identity not null, sku varchar2(20), name varchar2(255), cretime timestamp not null, updtime timestamp not null, constraint pk_o_product primary key (id) ); -create sequence o_product_seq increment by 1; create table pp ( id varchar2(40) not null, @@ -3596,13 +3299,12 @@ create table pp_to_ww ( ); create table question ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), groupobjectid number(19), sequence_number number(10) not null, constraint pk_question primary key (id) ); -create sequence question_seq increment by 1; create table rcustomer ( company varchar2(127) not null, @@ -3633,21 +3335,19 @@ create table region ( ); create table rel_detail ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(10) not null, constraint pk_rel_detail primary key (id) ); -create sequence rel_detail_seq increment by 1; create table rel_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), detail_id number(19), version number(10) not null, constraint pk_rel_master primary key (id) ); -create sequence rel_master_seq increment by 1; create table resourcefile ( id varchar2(64) not null, @@ -3671,11 +3371,10 @@ create table mt_role_permission ( ); create table em_role ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_em_role primary key (id) ); -create sequence em_role_seq increment by 1; create table root_bean ( dtype varchar2(31) not null, @@ -3686,17 +3385,16 @@ create table root_bean ( ); create table f_second ( - id number(19) not null, + id number(19) generated by default as identity not null, mod_name varchar2(255), first number(19), title varchar2(255), constraint uq_f_second_first unique (first), constraint pk_f_second primary key (id) ); -create sequence f_second_seq increment by 1; create table section ( - id number(10) not null, + id number(10) generated by default as identity not null, article_id number(10), type number(10), content clob, @@ -3706,49 +3404,43 @@ create table section ( constraint ck_section_type check ( type in (0,1)), constraint pk_section primary key (id) ); -create sequence section_seq increment by 1; create table self_parent ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), parent_id number(19), version number(19) not null, constraint pk_self_parent primary key (id) ); -create sequence self_parent_seq increment by 1; create table self_ref_customer ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), referred_by_id number(19), constraint pk_self_ref_customer primary key (id) ); -create sequence self_ref_customer_seq increment by 1; create table self_ref_example ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255) not null, parent_id number(19), constraint pk_self_ref_example primary key (id) ); -create sequence self_ref_example_seq increment by 1; create table e_save_test_a ( - id number(19) not null, + id number(19) generated by default as identity not null, version number(19) not null, constraint pk_e_save_test_a primary key (id) ); -create sequence e_save_test_a_seq increment by 1; create table e_save_test_b ( - id number(19) not null, + id number(19) generated by default as identity not null, sibling_a_id number(19), test_property number(1) default 0 not null, version number(19) not null, constraint uq_e_save_test_b_sibling_a_id unique (sibling_a_id), constraint pk_e_save_test_b primary key (id) ); -create sequence e_save_test_b_seq increment by 1; create table site ( id varchar2(40) not null, @@ -3770,25 +3462,23 @@ create table site_address ( ); create table some_enum_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, some_enum number(10), name varchar2(255), constraint ck_some_enum_bean_some_enum check ( some_enum in (0,1)), constraint pk_some_enum_bean primary key (id) ); -create sequence some_enum_bean_seq increment by 1; create table some_file_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), content blob, version number(19) not null, constraint pk_some_file_bean primary key (id) ); -create sequence some_file_bean_seq increment by 1; create table some_new_types_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, dow number(1), mth number(1), yr number(10), @@ -3812,15 +3502,13 @@ create table some_new_types_bean ( constraint ck_some_new_types_bean_mth check ( mth in (1,2,3,4,5,6,7,8,9,10,11,12)), constraint pk_some_new_types_bean primary key (id) ); -create sequence some_new_types_bean_seq increment by 1; create table some_period_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, anniversary date, version number(19) not null, constraint pk_some_period_bean primary key (id) ); -create sequence some_period_bean_seq increment by 1; create table source_base ( dtype varchar2(31) not null, @@ -3833,14 +3521,13 @@ create table source_base ( create table stockforecast ( type varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, inner_report_id number(19), constraint pk_stockforecast primary key (id) ); -create sequence stockforecast_seq increment by 1; create table sub_section ( - id number(10) not null, + id number(10) generated by default as identity not null, section_id number(10), title varchar2(255), cretime timestamp not null, @@ -3848,29 +3535,25 @@ create table sub_section ( version number(19) not null, constraint pk_sub_section primary key (id) ); -create sequence sub_section_seq increment by 1; create table sub_type ( - sub_type_id number(10) not null, + sub_type_id number(10) generated by default as identity not null, description varchar2(255), version number(19) not null, constraint pk_sub_type primary key (sub_type_id) ); -create sequence sub_type_seq increment by 1; create table survey ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_survey primary key (id) ); -create sequence survey_seq increment by 1; create table tbytes_only ( - id number(10) not null, + id number(10) generated by default as identity not null, content blob, constraint pk_tbytes_only primary key (id) ); -create sequence tbytes_only_seq increment by 1; create table tcar ( type varchar2(31) not null, @@ -3880,15 +3563,14 @@ create table tcar ( ); create table tevent ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, constraint pk_tevent primary key (id) ); -create sequence tevent_seq increment by 1; create table tevent_many ( - id number(19) not null, + id number(19) generated by default as identity not null, description varchar2(255), event_id number(19), units number(10) not null, @@ -3896,10 +3578,9 @@ create table tevent_many ( version number(19) not null, constraint pk_tevent_many primary key (id) ); -create sequence tevent_many_seq increment by 1; create table tevent_one ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), status number(10), event_id number(19), @@ -3908,41 +3589,36 @@ create table tevent_one ( constraint uq_tevent_one_event_id unique (event_id), constraint pk_tevent_one primary key (id) ); -create sequence tevent_one_seq increment by 1; create table tint_root ( my_type number(3) not null, - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), child_property varchar2(255), constraint pk_tint_root primary key (id) ); -create sequence tint_root_seq increment by 1; create table tjoda_entity ( - id number(10) not null, + id number(10) generated by default as identity not null, local_time timestamp, constraint pk_tjoda_entity primary key (id) ); -create sequence tjoda_entity_seq increment by 1; create table t_mapsuper1 ( - id number(10) not null, + id number(10) generated by default as identity not null, something varchar2(255), name varchar2(255), version number(10) not null, constraint pk_t_mapsuper1 primary key (id) ); -create sequence t_mapsuper1_seq increment by 1; create table t_oneb ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), active number(1) default 0 not null, constraint pk_t_oneb primary key (id) ); -create sequence t_oneb_seq increment by 1; create table t_detail_with_other_namexxxyy ( id number(10) not null, @@ -3966,23 +3642,21 @@ create table t_atable_thatisrelatively ( create sequence t_atable_master_seq increment by 1; create table ttruck_holder ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), truck_plate_no varchar2(32) not null, basic_id number(10), version number(19) not null, constraint pk_ttruck_holder primary key (id) ); -create sequence ttruck_holder_seq increment by 1; create table ttruck_holder_item ( - id number(19) not null, + id number(19) generated by default as identity not null, some_uid varchar2(40), foo varchar2(255), owner_id number(19) not null, constraint pk_ttruck_holder_item primary key (id) ); -create sequence ttruck_holder_item_seq increment by 1; create table tuuid_entity ( id varchar2(40) not null, @@ -3991,19 +3665,17 @@ create table tuuid_entity ( ); create table twheel ( - id number(19) not null, + id number(19) generated by default as identity not null, owner_plate_no varchar2(32) not null, constraint pk_twheel primary key (id) ); -create sequence twheel_seq increment by 1; create table twith_pre_insert ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255) not null, title varchar2(255), constraint pk_twith_pre_insert primary key (id) ); -create sequence twith_pre_insert_seq increment by 1; create table target_base ( dtype varchar2(31) not null, @@ -4046,15 +3718,14 @@ create table sa_tire ( create sequence sa_tire_seq increment by 1; create table tree_entity ( - id number(10) not null, + id number(10) generated by default as identity not null, text varchar2(255), parent_id number(10), constraint pk_tree_entity primary key (id) ); -create sequence tree_entity_seq increment by 1; create table trip ( - id number(10) not null, + id number(10) generated by default as identity not null, vehicle_driver_id number(10), destination varchar2(255), address_id number(10), @@ -4064,21 +3735,18 @@ create table trip ( version number(19) not null, constraint pk_trip primary key (id) ); -create sequence trip_seq increment by 1; create table truck_ref ( - id number(10) not null, + id number(10) generated by default as identity not null, something varchar2(255), constraint pk_truck_ref primary key (id) ); -create sequence truck_ref_seq increment by 1; create table tune ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_tune primary key (id) ); -create sequence tune_seq increment by 1; create table "type" ( customer number(10) not null, @@ -4090,13 +3758,12 @@ create table "type" ( ); create table tz_bean ( - id number(19) not null, + id number(19) generated by default as identity not null, moda varchar2(255), ts timestamp, tstz timestamp, constraint pk_tz_bean primary key (id) ); -create sequence tz_bean_seq increment by 1; create table usib_child ( id varchar2(40) not null, @@ -4106,23 +3773,21 @@ create table usib_child ( ); create table usib_child_sibling ( - id number(19) not null, + id number(19) generated by default as identity not null, child_id varchar2(40), deleted number(1) default 0 not null, constraint uq_usb_chld_sblng_chld_d unique (child_id), constraint pk_usib_child_sibling primary key (id) ); -create sequence usib_child_sibling_seq increment by 1; create table usib_parent ( - id number(19) not null, + id number(19) generated by default as identity not null, deleted number(1) default 0 not null, constraint pk_usib_parent primary key (id) ); -create sequence usib_parent_seq increment by 1; create table ut_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, utmaster_id number(10) not null, name varchar2(255), qty number(10), @@ -4130,17 +3795,15 @@ create table ut_detail ( version number(10) not null, constraint pk_ut_detail primary key (id) ); -create sequence ut_detail_seq increment by 1; create table ut_master ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), description varchar2(255), event_date date, version number(10) not null, constraint pk_ut_master primary key (id) ); -create sequence ut_master_seq increment by 1; create table uuone ( id varchar2(40) not null, @@ -4160,7 +3823,7 @@ create table uutwo ( ); create table oto_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), account_id number(19) not null, version number(19) not null, @@ -4169,10 +3832,9 @@ create table oto_user ( constraint uq_oto_user_account_id unique (account_id), constraint pk_oto_user primary key (id) ); -create sequence oto_user_seq increment by 1; create table c_user ( - id number(19) not null, + id number(19) generated by default as identity not null, inactive number(1) default 0 not null, name varchar2(255), email varchar2(255), @@ -4183,29 +3845,25 @@ create table c_user ( when_modified timestamp not null, constraint pk_c_user primary key (id) ); -create sequence c_user_seq increment by 1; create table tx_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_tx_user primary key (id) ); -create sequence tx_user_seq increment by 1; create table g_user ( - id number(19) not null, + id number(19) generated by default as identity not null, username varchar2(255), version number(19) not null, constraint pk_g_user primary key (id) ); -create sequence g_user_seq increment by 1; create table em_user ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_em_user primary key (id) ); -create sequence em_user_seq increment by 1; create table user_interest_live ( user_id number(19) not null, @@ -4222,7 +3880,7 @@ create table em_user_role ( create table vehicle ( dtype varchar2(3) not null, - id number(10) not null, + id number(10) generated by default as identity not null, license_number varchar2(255), registration_date timestamp, lease_id number(19), @@ -4238,10 +3896,9 @@ create table vehicle ( constraint ck_vehicle_siz check ( siz in ('S','M','L','H')), constraint pk_vehicle primary key (id) ); -create sequence vehicle_seq increment by 1; create table vehicle_driver ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), vehicle_id number(10), address_id number(10), @@ -4251,11 +3908,10 @@ create table vehicle_driver ( version number(19) not null, constraint pk_vehicle_driver primary key (id) ); -create sequence vehicle_driver_seq increment by 1; create table vehicle_lease ( dtype varchar2(31) not null, - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), active_start date, active_end date, @@ -4266,14 +3922,12 @@ create table vehicle_lease ( max_days number(10), constraint pk_vehicle_lease primary key (id) ); -create sequence vehicle_lease_seq increment by 1; create table warehouses ( - id number(10) not null, + id number(10) generated by default as identity not null, officezoneid number(10), constraint pk_warehouses primary key (id) ); -create sequence warehouses_seq increment by 1; create table warehousesshippingzones ( warehouseid number(10) not null, @@ -4306,7 +3960,7 @@ create table sp_car_wheel ( create sequence sp_car_wheel_seq increment by 1; create table g_who_props_otm ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), version number(19) not null, when_created timestamp not null, @@ -4315,24 +3969,21 @@ create table g_who_props_otm ( who_modified_id number(19), constraint pk_g_who_props_otm primary key (id) ); -create sequence g_who_props_otm_seq increment by 1; create table with_zero ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), parent_id number(10), lang varchar2(2) default 'en' not null, version number(19) not null, constraint pk_with_zero primary key (id) ); -create sequence with_zero_seq increment by 1; create table parent ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_parent primary key (id) ); -create sequence parent_seq increment by 1; create table wview ( id varchar2(40) not null, @@ -4343,11 +3994,10 @@ create table wview ( create table zones ( type varchar2(31) not null, - id number(10) not null, + id number(10) generated by default as identity not null, attribute varchar2(255), constraint pk_zones primary key (id) ); -create sequence zones_seq increment by 1; create index ix_cntct_lst_nm_frst_nm on contact (last_name,first_name); create index ix_e_basic_name on e_basic (name); diff --git a/src/test/ddl-review/oracle-drop-all.sql b/src/test/ddl-review/oracle-drop-all.sql index 1e5f3075f..318c4b276 100644 --- a/src/test/ddl-review/oracle-drop-all.sql +++ b/src/test/ddl-review/oracle-drop-all.sql @@ -1,4 +1,4 @@ --- Generated by ebean unknown at 2020-03-17T09:21:18.938357Z +-- Generated by ebean unknown at 2020-03-17T09:34:02.384264Z alter table bar drop constraint fk_bar_foo_id; drop index ix_bar_foo_id; @@ -819,64 +819,44 @@ alter table with_zero drop constraint fk_with_zero_parent_id; drop index ix_with_zero_parent_id; drop table asimple_bean cascade constraints purge; -drop sequence asimple_bean_seq; drop table bar cascade constraints purge; -drop sequence bar_seq; drop table block cascade constraints purge; -drop sequence block_seq; drop table oto_account cascade constraints purge; -drop sequence oto_account_seq; drop table acl cascade constraints purge; -drop sequence acl_seq; drop table acl_container_relation cascade constraints purge; -drop sequence acl_container_relation_seq; drop table addr cascade constraints purge; -drop sequence addr_seq; drop table address cascade constraints purge; -drop sequence address_seq; drop table o_address cascade constraints purge; -drop sequence o_address_seq; drop table album cascade constraints purge; -drop sequence album_seq; drop table animal cascade constraints purge; -drop sequence animal_seq; drop table animal_shelter cascade constraints purge; -drop sequence animal_shelter_seq; drop table article cascade constraints purge; -drop sequence article_seq; drop table attribute cascade constraints purge; -drop sequence attribute_seq; drop table attribute_holder cascade constraints purge; -drop sequence attribute_holder_seq; drop table audit_log cascade constraints purge; -drop sequence audit_log_seq; drop table bbookmark cascade constraints purge; -drop sequence bbookmark_seq; drop table bbookmark_org cascade constraints purge; -drop sequence bbookmark_org_seq; drop table bbookmark_user cascade constraints purge; -drop sequence bbookmark_user_seq; drop table bsimple_with_gen cascade constraints purge; -drop sequence bsimple_with_gen_seq; drop table bsite cascade constraints purge; @@ -893,68 +873,49 @@ drop table bsite_user_e cascade constraints purge; drop table buser cascade constraints purge; drop table bwith_qident cascade constraints purge; -drop sequence bwith_qident_seq; drop table basic_draftable_bean cascade constraints purge; -drop sequence basic_draftable_bean_seq; drop table basic_draftable_bean_draft cascade constraints purge; -drop sequence basic_draftable_bean_draft_seq; drop table basic_joda_entity cascade constraints purge; -drop sequence basic_joda_entity_seq; drop table bean_with_time_zone cascade constraints purge; -drop sequence bean_with_time_zone_seq; drop table drel_booking cascade constraints purge; drop sequence drel_booking_seq; drop table bw_bean cascade constraints purge; -drop sequence bw_bean_seq; drop table cepcategory cascade constraints purge; -drop sequence cepcategory_seq; drop table cepproduct cascade constraints purge; -drop sequence cepproduct_seq; drop table cepproduct_category cascade constraints purge; drop table ciaddress cascade constraints purge; -drop sequence ciaddress_seq; drop table cicustomer_parent cascade constraints purge; -drop sequence cicustomer_parent_seq; drop table cistreet_parent cascade constraints purge; -drop sequence cistreet_parent_seq; drop table cinh_ref cascade constraints purge; -drop sequence cinh_ref_seq; drop table cinh_root cascade constraints purge; -drop sequence cinh_root_seq; drop table ckey_assoc cascade constraints purge; -drop sequence ckey_assoc_seq; drop table ckey_detail cascade constraints purge; -drop sequence ckey_detail_seq; drop table ckey_parent cascade constraints purge; drop table coone cascade constraints purge; -drop sequence coone_seq; drop table coone_many cascade constraints purge; -drop sequence coone_many_seq; drop table coroot cascade constraints purge; -drop sequence coroot_seq; drop table calculation_result cascade constraints purge; -drop sequence calculation_result_seq; drop table cao_bean cascade constraints purge; @@ -969,281 +930,199 @@ drop table sa_car cascade constraints purge; drop sequence sa_car_seq; drop table car_accessory cascade constraints purge; -drop sequence car_accessory_seq; drop table car_fuse cascade constraints purge; -drop sequence car_fuse_seq; drop table category cascade constraints purge; -drop sequence category_seq; drop table e_save_test_d cascade constraints purge; -drop sequence e_save_test_d_seq; drop table child_person cascade constraints purge; -drop sequence child_person_seq; drop table cke_client cascade constraints purge; drop table cke_user cascade constraints purge; drop table class_super cascade constraints purge; -drop sequence class_super_seq; drop table class_super_monkey cascade constraints purge; drop table configuration cascade constraints purge; -drop sequence configuration_seq; drop table configurations cascade constraints purge; -drop sequence configurations_seq; drop table contact cascade constraints purge; -drop sequence contact_seq; drop table contact_group cascade constraints purge; -drop sequence contact_group_seq; drop table contact_note cascade constraints purge; -drop sequence contact_note_seq; drop table contract cascade constraints purge; -drop sequence contract_seq; drop table contract_costs cascade constraints purge; -drop sequence contract_costs_seq; drop table c_conversation cascade constraints purge; -drop sequence c_conversation_seq; drop table o_country cascade constraints purge; drop table cover cascade constraints purge; -drop sequence cover_seq; drop table o_customer cascade constraints purge; -drop sequence o_customer_seq; drop table dcredit cascade constraints purge; -drop sequence dcredit_seq; drop table dcredit_drol cascade constraints purge; drop table dexh_entity cascade constraints purge; -drop sequence dexh_entity_seq; drop table dint_parent cascade constraints purge; -drop sequence dint_parent_seq; drop table dmachine cascade constraints purge; -drop sequence dmachine_seq; drop table d_machine_aux_use cascade constraints purge; -drop sequence d_machine_aux_use_seq; drop table d_machine_stats cascade constraints purge; -drop sequence d_machine_stats_seq; drop table d_machine_use cascade constraints purge; -drop sequence d_machine_use_seq; drop table dorg cascade constraints purge; -drop sequence dorg_seq; drop table dperson cascade constraints purge; -drop sequence dperson_seq; drop table drol cascade constraints purge; -drop sequence drol_seq; drop table drot cascade constraints purge; -drop sequence drot_seq; drop table drot_drol cascade constraints purge; drop table rawinherit_data cascade constraints purge; -drop sequence rawinherit_data_seq; drop table data_container cascade constraints purge; drop table dc_detail cascade constraints purge; -drop sequence dc_detail_seq; drop table dc_master cascade constraints purge; -drop sequence dc_master_seq; drop table dfk_cascade cascade constraints purge; -drop sequence dfk_cascade_seq; drop table dfk_cascade_one cascade constraints purge; -drop sequence dfk_cascade_one_seq; drop table dfk_none cascade constraints purge; -drop sequence dfk_none_seq; drop table dfk_none_via_join cascade constraints purge; -drop sequence dfk_none_via_join_seq; drop table dfk_none_via_mto_m cascade constraints purge; -drop sequence dfk_none_via_mto_m_seq; drop table dfk_none_via_mto_m_dfk_one cascade constraints purge; drop table dfk_one cascade constraints purge; -drop sequence dfk_one_seq; drop table dfk_set_null cascade constraints purge; -drop sequence dfk_set_null_seq; drop table doc cascade constraints purge; -drop sequence doc_seq; drop table doc_link cascade constraints purge; drop table doc_link_draft cascade constraints purge; drop table doc_draft cascade constraints purge; -drop sequence doc_draft_seq; drop table document cascade constraints purge; -drop sequence document_seq; drop table document_draft cascade constraints purge; -drop sequence document_draft_seq; drop table document_media cascade constraints purge; -drop sequence document_media_seq; drop table document_media_draft cascade constraints purge; -drop sequence document_media_draft_seq; drop table sp_car_door cascade constraints purge; drop sequence sp_car_door_seq; drop table earray_bean cascade constraints purge; -drop sequence earray_bean_seq; drop table earray_set_bean cascade constraints purge; -drop sequence earray_set_bean_seq; drop table e_basic cascade constraints purge; -drop sequence e_basic_seq; drop table ebasic_change_log cascade constraints purge; -drop sequence ebasic_change_log_seq; drop table ebasic_clob cascade constraints purge; -drop sequence ebasic_clob_seq; drop table ebasic_clob_fetch_eager cascade constraints purge; -drop sequence ebasic_clob_fetch_eager_seq; drop table ebasic_clob_no_ver cascade constraints purge; -drop sequence ebasic_clob_no_ver_seq; drop table e_basicenc cascade constraints purge; -drop sequence e_basicenc_seq; drop table e_basicenc_bin cascade constraints purge; -drop sequence e_basicenc_bin_seq; drop table e_basicenc_client cascade constraints purge; -drop sequence e_basicenc_client_seq; drop table e_basicenc_relate cascade constraints purge; -drop sequence e_basicenc_relate_seq; drop table e_basic_enum_id cascade constraints purge; drop table e_basic_eni cascade constraints purge; -drop sequence e_basic_eni_seq; drop table ebasic_hstore cascade constraints purge; -drop sequence ebasic_hstore_seq; drop table ebasic_json_jackson cascade constraints purge; -drop sequence ebasic_json_jackson_seq; drop table ebasic_json_jackson2 cascade constraints purge; -drop sequence ebasic_json_jackson2_seq; drop table ebasic_json_list cascade constraints purge; -drop sequence ebasic_json_list_seq; drop table ebasic_json_map cascade constraints purge; -drop sequence ebasic_json_map_seq; drop table ebasic_json_map_blob cascade constraints purge; -drop sequence ebasic_json_map_blob_seq; drop table ebasic_json_map_clob cascade constraints purge; -drop sequence ebasic_json_map_clob_seq; drop table ebasic_json_map_detail cascade constraints purge; -drop sequence ebasic_json_map_detail_seq; drop table ebasic_json_map_json_b cascade constraints purge; -drop sequence ebasic_json_map_json_b_seq; drop table ebasic_json_map_varchar cascade constraints purge; -drop sequence ebasic_json_map_varchar_seq; drop table ebasic_json_node cascade constraints purge; -drop sequence ebasic_json_node_seq; drop table ebasic_json_node_blob cascade constraints purge; -drop sequence ebasic_json_node_blob_seq; drop table ebasic_json_node_json_b cascade constraints purge; -drop sequence ebasic_json_node_json_b_seq; drop table ebasic_json_node_varchar cascade constraints purge; -drop sequence ebasic_json_node_varchar_seq; drop table ebasic_json_unmapped cascade constraints purge; -drop sequence ebasic_json_unmapped_seq; drop table e_basic_ndc cascade constraints purge; -drop sequence e_basic_ndc_seq; drop table ebasic_no_sdchild cascade constraints purge; -drop sequence ebasic_no_sdchild_seq; drop table ebasic_sdchild cascade constraints purge; -drop sequence ebasic_sdchild_seq; drop table ebasic_soft_delete cascade constraints purge; -drop sequence ebasic_soft_delete_seq; drop table e_basicver cascade constraints purge; -drop sequence e_basicver_seq; drop table e_basic_withlife cascade constraints purge; -drop sequence e_basic_withlife_seq; drop table e_basic_with_ex cascade constraints purge; -drop sequence e_basic_with_ex_seq; drop table e_basicverucon cascade constraints purge; -drop sequence e_basicverucon_seq; drop table ecache_child cascade constraints purge; drop table ecache_root cascade constraints purge; drop table e_col_ab cascade constraints purge; -drop sequence e_col_ab_seq; drop table ecustom_id cascade constraints purge; drop table edefault_prop cascade constraints purge; -drop sequence edefault_prop_seq; drop table eemb_inner cascade constraints purge; -drop sequence eemb_inner_seq; drop table eemb_outer cascade constraints purge; -drop sequence eemb_outer_seq; drop table efile2_no_fk cascade constraints purge; @@ -1254,143 +1133,104 @@ drop table efile_no_fk_euser_no_fk cascade constraints purge; drop table efile_no_fk_euser_no_fk_soft_d cascade constraints purge; drop table egen_props cascade constraints purge; -drop sequence egen_props_seq; drop table eid_uid_bean cascade constraints purge; -drop sequence eid_uid_bean_seq; drop table einvoice cascade constraints purge; -drop sequence einvoice_seq; drop table e_main cascade constraints purge; -drop sequence e_main_seq; drop table enull_collection cascade constraints purge; -drop sequence enull_collection_seq; drop table enull_collection_detail cascade constraints purge; -drop sequence enull_collection_detail_seq; drop table eopt_one_a cascade constraints purge; -drop sequence eopt_one_a_seq; drop table eopt_one_b cascade constraints purge; -drop sequence eopt_one_b_seq; drop table eopt_one_c cascade constraints purge; -drop sequence eopt_one_c_seq; drop table eper_addr cascade constraints purge; -drop sequence eper_addr_seq; drop table eperson cascade constraints purge; -drop sequence eperson_seq; drop table e_person_online cascade constraints purge; -drop sequence e_person_online_seq; drop table esimple cascade constraints purge; drop table esoft_del_book cascade constraints purge; -drop sequence esoft_del_book_seq; drop table esoft_del_book_esoft_del_user cascade constraints purge; drop table esoft_del_down cascade constraints purge; -drop sequence esoft_del_down_seq; drop table esoft_del_mid cascade constraints purge; -drop sequence esoft_del_mid_seq; drop table esoft_del_one_a cascade constraints purge; -drop sequence esoft_del_one_a_seq; drop table esoft_del_one_b cascade constraints purge; -drop sequence esoft_del_one_b_seq; drop table esoft_del_role cascade constraints purge; -drop sequence esoft_del_role_seq; drop table esoft_del_role_esoft_del_user cascade constraints purge; drop table esoft_del_top cascade constraints purge; -drop sequence esoft_del_top_seq; drop table esoft_del_up cascade constraints purge; -drop sequence esoft_del_up_seq; drop table esoft_del_user cascade constraints purge; -drop sequence esoft_del_user_seq; drop table esoft_del_user_esoft_del_role cascade constraints purge; drop table esome_convert_type cascade constraints purge; -drop sequence esome_convert_type_seq; drop table esome_type cascade constraints purge; -drop sequence esome_type_seq; drop table etrans_many cascade constraints purge; -drop sequence etrans_many_seq; drop table rawinherit_uncle cascade constraints purge; -drop sequence rawinherit_uncle_seq; drop table euser_no_fk cascade constraints purge; -drop sequence euser_no_fk_seq; drop table euser_no_fk_soft_del cascade constraints purge; -drop sequence euser_no_fk_soft_del_seq; drop table evanilla_collection cascade constraints purge; -drop sequence evanilla_collection_seq; drop table evanilla_collection_detail cascade constraints purge; -drop sequence evanilla_collection_detail_seq; drop table ewho_props cascade constraints purge; -drop sequence ewho_props_seq; drop table e_withinet cascade constraints purge; -drop sequence e_withinet_seq; drop table ec_enum_person cascade constraints purge; -drop sequence ec_enum_person_seq; drop table ec_enum_person_tags cascade constraints purge; drop table ec_person cascade constraints purge; -drop sequence ec_person_seq; drop table ec_person_phone cascade constraints purge; drop table ec_top cascade constraints purge; -drop sequence ec_top_seq; drop table ec_top_ecs_person cascade constraints purge; drop table ecbl_person cascade constraints purge; -drop sequence ecbl_person_seq; drop table ecbl_person_phone_numbers cascade constraints purge; drop table ecbm_person cascade constraints purge; -drop sequence ecbm_person_seq; drop table ecbm_person_phone_numbers cascade constraints purge; drop table ecm_person cascade constraints purge; -drop sequence ecm_person_seq; drop table ecm_person_phone_numbers cascade constraints purge; drop table ecmc_person cascade constraints purge; -drop sequence ecmc_person_seq; drop table ecmc_person_phone_numbers cascade constraints purge; drop table ecs_person cascade constraints purge; -drop sequence ecs_person_seq; drop table ecs_person_phone cascade constraints purge; @@ -1401,36 +1241,26 @@ drop table ecsm_values cascade constraints purge; drop table ecsm_one cascade constraints purge; drop table ecsm_parent cascade constraints purge; -drop sequence ecsm_parent_seq; drop table ecsm_two cascade constraints purge; drop table td_child cascade constraints purge; -drop sequence td_child_seq; drop table td_parent cascade constraints purge; -drop sequence td_parent_seq; drop table element_bean cascade constraints purge; -drop sequence element_bean_seq; drop table empl cascade constraints purge; -drop sequence empl_seq; drop table esd_detail cascade constraints purge; -drop sequence esd_detail_seq; drop table esd_master cascade constraints purge; -drop sequence esd_master_seq; drop table feature_desc cascade constraints purge; -drop sequence feature_desc_seq; drop table f_first cascade constraints purge; -drop sequence f_first_seq; drop table foo cascade constraints purge; -drop sequence foo_seq; drop table gen_key_identity cascade constraints purge; @@ -1438,70 +1268,50 @@ drop table gen_key_sequence cascade constraints purge; drop sequence SEQ_NAME; drop table grand_parent_person cascade constraints purge; -drop sequence grand_parent_person_seq; drop table survey_group cascade constraints purge; -drop sequence survey_group_seq; drop table c_group cascade constraints purge; -drop sequence c_group_seq; drop table he_doc cascade constraints purge; -drop sequence he_doc_seq; drop table hx_link cascade constraints purge; -drop sequence hx_link_seq; drop table hx_link_doc cascade constraints purge; drop table hi_doc cascade constraints purge; -drop sequence hi_doc_seq; drop table hi_link cascade constraints purge; -drop sequence hi_link_seq; drop table hi_link_doc cascade constraints purge; drop table hi_tone cascade constraints purge; -drop sequence hi_tone_seq; drop table hi_tthree cascade constraints purge; -drop sequence hi_tthree_seq; drop table hi_ttwo cascade constraints purge; -drop sequence hi_ttwo_seq; drop table hsd_setting cascade constraints purge; -drop sequence hsd_setting_seq; drop table hsd_user cascade constraints purge; -drop sequence hsd_user_seq; drop table iaf_segment cascade constraints purge; -drop sequence iaf_segment_seq; drop table iaf_segment_status cascade constraints purge; -drop sequence iaf_segment_status_seq; drop table imrelated cascade constraints purge; -drop sequence imrelated_seq; drop table imroot cascade constraints purge; -drop sequence imroot_seq; drop table ixresource cascade constraints purge; drop table info_company cascade constraints purge; -drop sequence info_company_seq; drop table info_contact cascade constraints purge; -drop sequence info_contact_seq; drop table info_customer cascade constraints purge; -drop sequence info_customer_seq; drop table inner_report cascade constraints purge; -drop sequence inner_report_seq; drop table drel_invoice cascade constraints purge; drop sequence drel_invoice_seq; @@ -1509,60 +1319,46 @@ drop sequence drel_invoice_seq; drop table item cascade constraints purge; drop table monkey cascade constraints purge; -drop sequence monkey_seq; drop table mkeygroup cascade constraints purge; -drop sequence mkeygroup_seq; drop table mkeygroup_monkey cascade constraints purge; drop table trainer cascade constraints purge; -drop sequence trainer_seq; drop table trainer_monkey cascade constraints purge; drop table troop cascade constraints purge; -drop sequence troop_seq; drop table troop_monkey cascade constraints purge; drop table l2_cldf_reset_bean cascade constraints purge; -drop sequence l2_cldf_reset_bean_seq; drop table l2_cldf_reset_bean_child cascade constraints purge; -drop sequence l2_cldf_reset_bean_child_seq; drop table level1 cascade constraints purge; -drop sequence level1_seq; drop table level1_level4 cascade constraints purge; drop table level1_level2 cascade constraints purge; drop table level2 cascade constraints purge; -drop sequence level2_seq; drop table level2_level3 cascade constraints purge; drop table level3 cascade constraints purge; -drop sequence level3_seq; drop table level4 cascade constraints purge; -drop sequence level4_seq; drop table link cascade constraints purge; -drop sequence link_seq; drop table link_draft cascade constraints purge; -drop sequence link_draft_seq; drop table la_attr_value cascade constraints purge; -drop sequence la_attr_value_seq; drop table la_attr_value_attribute cascade constraints purge; drop table looney cascade constraints purge; -drop sequence looney_seq; drop table maddress cascade constraints purge; @@ -1573,50 +1369,36 @@ drop table mcontact_message cascade constraints purge; drop table mcustomer cascade constraints purge; drop table mgroup cascade constraints purge; -drop sequence mgroup_seq; drop table mmachine cascade constraints purge; -drop sequence mmachine_seq; drop table mmachine_mgroup cascade constraints purge; drop table mmedia cascade constraints purge; -drop sequence mmedia_seq; drop table non_updateprop cascade constraints purge; -drop sequence non_updateprop_seq; drop table mprinter cascade constraints purge; -drop sequence mprinter_seq; drop table mprinter_state cascade constraints purge; -drop sequence mprinter_state_seq; drop table mprofile cascade constraints purge; -drop sequence mprofile_seq; drop table mprotected_construct_bean cascade constraints purge; -drop sequence mprotected_construct_bean_seq; drop table mrole cascade constraints purge; -drop sequence mrole_seq; drop table mrole_muser cascade constraints purge; drop table msome_other cascade constraints purge; -drop sequence msome_other_seq; drop table muser cascade constraints purge; -drop sequence muser_seq; drop table muser_type cascade constraints purge; -drop sequence muser_type_seq; drop table mail_box cascade constraints purge; -drop sequence mail_box_seq; drop table mail_user cascade constraints purge; -drop sequence mail_user_seq; drop table mail_user_inbox cascade constraints purge; @@ -1627,10 +1409,8 @@ drop table main_entity cascade constraints purge; drop table main_entity_relation cascade constraints purge; drop table map_super_actual cascade constraints purge; -drop sequence map_super_actual_seq; drop table c_message cascade constraints purge; -drop sequence c_message_seq; drop table meter_address_data cascade constraints purge; @@ -1643,87 +1423,64 @@ drop table meter_special_needs_contact cascade constraints purge; drop table meter_version cascade constraints purge; drop table mnoc_role cascade constraints purge; -drop sequence mnoc_role_seq; drop table mnoc_user cascade constraints purge; -drop sequence mnoc_user_seq; drop table mnoc_user_mnoc_role cascade constraints purge; drop table mny_a cascade constraints purge; -drop sequence mny_a_seq; drop table mny_b cascade constraints purge; -drop sequence mny_b_seq; drop table mny_b_mny_c cascade constraints purge; drop table mny_c cascade constraints purge; -drop sequence mny_c_seq; drop table mny_topic cascade constraints purge; -drop sequence mny_topic_seq; drop table subtopics cascade constraints purge; drop table mp_role cascade constraints purge; -drop sequence mp_role_seq; drop table mp_user cascade constraints purge; -drop sequence mp_user_seq; drop table ms_many_a cascade constraints purge; -drop sequence ms_many_a_seq; drop table ms_many_a_many_b cascade constraints purge; drop table ms_many_b cascade constraints purge; -drop sequence ms_many_b_seq; drop table ms_many_b_many_a cascade constraints purge; drop table my_lob_size cascade constraints purge; -drop sequence my_lob_size_seq; drop table my_lob_size_join_many cascade constraints purge; -drop sequence my_lob_size_join_many_seq; drop table noidbean cascade constraints purge; drop table o_bean_child cascade constraints purge; -drop sequence o_bean_child_seq; drop table ocached_app cascade constraints purge; -drop sequence ocached_app_seq; drop table ocached_app_detail cascade constraints purge; -drop sequence ocached_app_detail_seq; drop table o_cached_bean cascade constraints purge; -drop sequence o_cached_bean_seq; drop table o_cached_bean_country cascade constraints purge; drop table o_cached_bean_child cascade constraints purge; -drop sequence o_cached_bean_child_seq; drop table o_cached_inherit cascade constraints purge; -drop sequence o_cached_inherit_seq; drop table o_cached_natkey cascade constraints purge; -drop sequence o_cached_natkey_seq; drop table o_cached_natkey3 cascade constraints purge; -drop sequence o_cached_natkey3_seq; drop table ocached_nkey_uid cascade constraints purge; -drop sequence ocached_nkey_uid_seq; drop table ocar cascade constraints purge; -drop sequence ocar_seq; drop table ocompany cascade constraints purge; -drop sequence ocompany_seq; drop table oengine cascade constraints purge; @@ -1734,50 +1491,36 @@ drop table omvertex cascade constraints purge; drop table omvertex_other cascade constraints purge; drop table oroad_show_msg cascade constraints purge; -drop sequence oroad_show_msg_seq; drop table om_account_child_dbo cascade constraints purge; -drop sequence om_account_child_dbo_seq; drop table om_account_dbo cascade constraints purge; -drop sequence om_account_dbo_seq; drop table om_basic_child cascade constraints purge; -drop sequence om_basic_child_seq; drop table om_basic_parent cascade constraints purge; -drop sequence om_basic_parent_seq; drop table om_ordered_detail cascade constraints purge; -drop sequence om_ordered_detail_seq; drop table om_ordered_master cascade constraints purge; -drop sequence om_ordered_master_seq; drop table only_id_entity cascade constraints purge; -drop sequence only_id_entity_seq; drop table o_order cascade constraints purge; -drop sequence o_order_seq; drop table o_order_detail cascade constraints purge; -drop sequence o_order_detail_seq; drop table s_orders cascade constraints purge; drop table s_order_items cascade constraints purge; drop table or_order_ship cascade constraints purge; -drop sequence or_order_ship_seq; drop table organisation cascade constraints purge; -drop sequence organisation_seq; drop table organization_node cascade constraints purge; -drop sequence organization_node_seq; drop table organization_tree_node cascade constraints purge; -drop sequence organization_tree_node_seq; drop table orp_detail cascade constraints purge; @@ -1792,52 +1535,36 @@ drop table oto_aone cascade constraints purge; drop table oto_atwo cascade constraints purge; drop table oto_bchild cascade constraints purge; -drop sequence oto_bchild_seq; drop table oto_bmaster cascade constraints purge; -drop sequence oto_bmaster_seq; drop table oto_child cascade constraints purge; -drop sequence oto_child_seq; drop table oto_cust cascade constraints purge; -drop sequence oto_cust_seq; drop table oto_cust_address cascade constraints purge; -drop sequence oto_cust_address_seq; drop table oto_level_a cascade constraints purge; -drop sequence oto_level_a_seq; drop table oto_level_b cascade constraints purge; -drop sequence oto_level_b_seq; drop table oto_level_c cascade constraints purge; -drop sequence oto_level_c_seq; drop table oto_master cascade constraints purge; -drop sequence oto_master_seq; drop table oto_prime cascade constraints purge; -drop sequence oto_prime_seq; drop table oto_prime_extra cascade constraints purge; -drop sequence oto_prime_extra_seq; drop table oto_sd_child cascade constraints purge; -drop sequence oto_sd_child_seq; drop table oto_sd_master cascade constraints purge; -drop sequence oto_sd_master_seq; drop table oto_th_many cascade constraints purge; -drop sequence oto_th_many_seq; drop table oto_th_one cascade constraints purge; -drop sequence oto_th_one_seq; drop table oto_th_top cascade constraints purge; -drop sequence oto_th_top_seq; drop table oto_ubprime cascade constraints purge; @@ -1848,95 +1575,70 @@ drop table oto_uprime cascade constraints purge; drop table oto_uprime_extra cascade constraints purge; drop table oto_user_model cascade constraints purge; -drop sequence oto_user_model_seq; drop table oto_user_model_optional cascade constraints purge; -drop sequence oto_user_model_optional_seq; drop table pfile cascade constraints purge; -drop sequence pfile_seq; drop table pfile_content cascade constraints purge; -drop sequence pfile_content_seq; drop table paggview cascade constraints purge; drop table pallet_location cascade constraints purge; -drop sequence pallet_location_seq; drop table parcel cascade constraints purge; -drop sequence parcel_seq; drop table parcel_location cascade constraints purge; -drop sequence parcel_location_seq; drop table rawinherit_parent cascade constraints purge; -drop sequence rawinherit_parent_seq; drop table rawinherit_parent_rawinherit_d cascade constraints purge; drop table e_save_test_c cascade constraints purge; -drop sequence e_save_test_c_seq; drop table parent_person cascade constraints purge; -drop sequence parent_person_seq; drop table c_participation cascade constraints purge; -drop sequence c_participation_seq; drop table password_store_model cascade constraints purge; -drop sequence password_store_model_seq; drop table pcf_calendar cascade constraints purge; -drop sequence pcf_calendar_seq; drop table pcf_city cascade constraints purge; -drop sequence pcf_city_seq; drop table pcf_country cascade constraints purge; -drop sequence pcf_country_seq; drop table pcf_event cascade constraints purge; -drop sequence pcf_event_seq; drop table pcf_person cascade constraints purge; -drop sequence pcf_person_seq; drop table mt_permission cascade constraints purge; drop table persistent_file cascade constraints purge; -drop sequence persistent_file_seq; drop table persistent_file_content cascade constraints purge; -drop sequence persistent_file_content_seq; drop table person cascade constraints purge; -drop sequence person_seq; drop table persons cascade constraints purge; -drop sequence PERSONS_seq; drop table person_cache_email cascade constraints purge; drop table person_cache_info cascade constraints purge; drop table phones cascade constraints purge; -drop sequence PHONES_seq; drop table e_position cascade constraints purge; -drop sequence e_position_seq; drop table primary_revision cascade constraints purge; drop table o_product cascade constraints purge; -drop sequence o_product_seq; drop table pp cascade constraints purge; drop table pp_to_ww cascade constraints purge; drop table question cascade constraints purge; -drop sequence question_seq; drop table rcustomer cascade constraints purge; @@ -1947,10 +1649,8 @@ drop table referencing_bean cascade constraints purge; drop table region cascade constraints purge; drop table rel_detail cascade constraints purge; -drop sequence rel_detail_seq; drop table rel_master cascade constraints purge; -drop sequence rel_master_seq; drop table resourcefile cascade constraints purge; @@ -1959,86 +1659,62 @@ drop table mt_role cascade constraints purge; drop table mt_role_permission cascade constraints purge; drop table em_role cascade constraints purge; -drop sequence em_role_seq; drop table root_bean cascade constraints purge; drop table f_second cascade constraints purge; -drop sequence f_second_seq; drop table section cascade constraints purge; -drop sequence section_seq; drop table self_parent cascade constraints purge; -drop sequence self_parent_seq; drop table self_ref_customer cascade constraints purge; -drop sequence self_ref_customer_seq; drop table self_ref_example cascade constraints purge; -drop sequence self_ref_example_seq; drop table e_save_test_a cascade constraints purge; -drop sequence e_save_test_a_seq; drop table e_save_test_b cascade constraints purge; -drop sequence e_save_test_b_seq; drop table site cascade constraints purge; drop table site_address cascade constraints purge; drop table some_enum_bean cascade constraints purge; -drop sequence some_enum_bean_seq; drop table some_file_bean cascade constraints purge; -drop sequence some_file_bean_seq; drop table some_new_types_bean cascade constraints purge; -drop sequence some_new_types_bean_seq; drop table some_period_bean cascade constraints purge; -drop sequence some_period_bean_seq; drop table source_base cascade constraints purge; drop table stockforecast cascade constraints purge; -drop sequence stockforecast_seq; drop table sub_section cascade constraints purge; -drop sequence sub_section_seq; drop table sub_type cascade constraints purge; -drop sequence sub_type_seq; drop table survey cascade constraints purge; -drop sequence survey_seq; drop table tbytes_only cascade constraints purge; -drop sequence tbytes_only_seq; drop table tcar cascade constraints purge; drop table tevent cascade constraints purge; -drop sequence tevent_seq; drop table tevent_many cascade constraints purge; -drop sequence tevent_many_seq; drop table tevent_one cascade constraints purge; -drop sequence tevent_one_seq; drop table tint_root cascade constraints purge; -drop sequence tint_root_seq; drop table tjoda_entity cascade constraints purge; -drop sequence tjoda_entity_seq; drop table t_mapsuper1 cascade constraints purge; -drop sequence t_mapsuper1_seq; drop table t_oneb cascade constraints purge; -drop sequence t_oneb_seq; drop table t_detail_with_other_namexxxyy cascade constraints purge; drop sequence t_atable_detail_seq; @@ -2047,18 +1723,14 @@ drop table t_atable_thatisrelatively cascade constraints purge; drop sequence t_atable_master_seq; drop table ttruck_holder cascade constraints purge; -drop sequence ttruck_holder_seq; drop table ttruck_holder_item cascade constraints purge; -drop sequence ttruck_holder_item_seq; drop table tuuid_entity cascade constraints purge; drop table twheel cascade constraints purge; -drop sequence twheel_seq; drop table twith_pre_insert cascade constraints purge; -drop sequence twith_pre_insert_seq; drop table target_base cascade constraints purge; @@ -2073,70 +1745,52 @@ drop table sa_tire cascade constraints purge; drop sequence sa_tire_seq; drop table tree_entity cascade constraints purge; -drop sequence tree_entity_seq; drop table trip cascade constraints purge; -drop sequence trip_seq; drop table truck_ref cascade constraints purge; -drop sequence truck_ref_seq; drop table tune cascade constraints purge; -drop sequence tune_seq; drop table "type" cascade constraints purge; drop table tz_bean cascade constraints purge; -drop sequence tz_bean_seq; drop table usib_child cascade constraints purge; drop table usib_child_sibling cascade constraints purge; -drop sequence usib_child_sibling_seq; drop table usib_parent cascade constraints purge; -drop sequence usib_parent_seq; drop table ut_detail cascade constraints purge; -drop sequence ut_detail_seq; drop table ut_master cascade constraints purge; -drop sequence ut_master_seq; drop table uuone cascade constraints purge; drop table uutwo cascade constraints purge; drop table oto_user cascade constraints purge; -drop sequence oto_user_seq; drop table c_user cascade constraints purge; -drop sequence c_user_seq; drop table tx_user cascade constraints purge; -drop sequence tx_user_seq; drop table g_user cascade constraints purge; -drop sequence g_user_seq; drop table em_user cascade constraints purge; -drop sequence em_user_seq; drop table user_interest_live cascade constraints purge; drop table em_user_role cascade constraints purge; drop table vehicle cascade constraints purge; -drop sequence vehicle_seq; drop table vehicle_driver cascade constraints purge; -drop sequence vehicle_driver_seq; drop table vehicle_lease cascade constraints purge; -drop sequence vehicle_lease_seq; drop table warehouses cascade constraints purge; -drop sequence warehouses_seq; drop table warehousesshippingzones cascade constraints purge; @@ -2150,18 +1804,14 @@ drop table sp_car_wheel cascade constraints purge; drop sequence sp_car_wheel_seq; drop table g_who_props_otm cascade constraints purge; -drop sequence g_who_props_otm_seq; drop table with_zero cascade constraints purge; -drop sequence with_zero_seq; drop table parent cascade constraints purge; -drop sequence parent_seq; drop table wview cascade constraints purge; drop table zones cascade constraints purge; -drop sequence zones_seq; drop index ix_cntct_lst_nm_frst_nm; drop index ix_e_basic_name; diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java similarity index 85% rename from src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java rename to src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java index efd8c395c..c9eb698ab 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/Oracle10DdlTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/OracleDdlTest.java @@ -6,16 +6,16 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class Oracle10DdlTest { +public class OracleDdlTest { - Oracle10Ddl create() { - return new Oracle10Ddl(new OraclePlatform()); + OracleDdl create() { + return new OracleDdl(new OraclePlatform()); } @Test public void appendForeignKeyOnDelete_expectEmtpy_when_nullRestrictSetDefault() { - Oracle10Ddl oracle = create(); + OracleDdl oracle = create(); StringBuilder sb = new StringBuilder(); oracle.appendForeignKeyOnDelete(sb, oracle.withDefault(null)); @@ -34,7 +34,7 @@ public class Oracle10DdlTest { @Test public void appendForeignKeyOnDelete_setNull() { - Oracle10Ddl oracle = create(); + OracleDdl oracle = create(); StringBuilder sb = new StringBuilder(); oracle.appendForeignKeyOnDelete(sb, ConstraintMode.SET_NULL); @@ -44,7 +44,7 @@ public class Oracle10DdlTest { @Test public void appendForeignKeyOnDelete_cascade() { - Oracle10Ddl oracle = create(); + OracleDdl oracle = create(); StringBuilder sb = new StringBuilder(); oracle.appendForeignKeyOnDelete(sb, ConstraintMode.CASCADE); diff --git a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java index dc6db69b0..2607bd13b 100644 --- a/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java +++ b/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl_AlterColumnTest.java @@ -267,7 +267,7 @@ public class PlatformDdl_AlterColumnTest { @Test public void useIdentityType_oracle() { - assertEquals(oraDdl.useIdentityType(null), IdType.SEQUENCE); + assertEquals(oraDdl.useIdentityType(null), IdType.IDENTITY); assertEquals(oraDdl.useIdentityType(IdType.SEQUENCE), IdType.SEQUENCE); assertEquals(oraDdl.useIdentityType(IdType.IDENTITY), IdType.IDENTITY); assertEquals(oraDdl.useIdentityType(IdType.GENERATOR), IdType.GENERATOR); diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql index 8c9b8aefb..09a800c07 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.0__initial.sql @@ -1,18 +1,16 @@ -- Migrationscripts for ebean unittest -- apply changes create table migtest_ckey_assoc ( - id number(10) not null, + id number(10) generated by default as identity not null, assoc_one varchar2(255), constraint pk_migtest_ckey_assoc primary key (id) ); -create sequence migtest_ckey_assoc_seq; create table migtest_ckey_detail ( - id number(10) not null, + id number(10) generated by default as identity not null, something varchar2(255), constraint pk_migtest_ckey_detail primary key (id) ); -create sequence migtest_ckey_detail_seq; create table migtest_ckey_parent ( one_key number(10) not null, @@ -23,47 +21,41 @@ create table migtest_ckey_parent ( ); create table migtest_fk_cascade ( - id number(19) not null, + id number(19) generated by default as identity not null, one_id number(19), constraint pk_migtest_fk_cascade primary key (id) ); -create sequence migtest_fk_cascade_seq; create table migtest_fk_cascade_one ( - id number(19) not null, + id number(19) generated by default as identity not null, constraint pk_migtest_fk_cascade_one primary key (id) ); -create sequence migtest_fk_cascade_one_seq; create table migtest_fk_none ( - id number(19) not null, + id number(19) generated by default as identity not null, one_id number(19), constraint pk_migtest_fk_none primary key (id) ); -create sequence migtest_fk_none_seq; create table migtest_fk_none_via_join ( - id number(19) not null, + id number(19) generated by default as identity not null, one_id number(19), constraint pk_migtest_fk_none_via_join primary key (id) ); -create sequence migtest_fk_none_via_join_seq; create table migtest_fk_one ( - id number(19) not null, + id number(19) generated by default as identity not null, constraint pk_migtest_fk_one primary key (id) ); -create sequence migtest_fk_one_seq; create table migtest_fk_set_null ( - id number(19) not null, + id number(19) generated by default as identity not null, one_id number(19), constraint pk_migtest_fk_set_null primary key (id) ); -create sequence migtest_fk_set_null_seq; create table migtest_e_basic ( - id number(10) not null, + id number(10) generated by default as identity not null, status varchar2(1), status2 varchar2(1) default 'N' not null, name varchar2(127), @@ -85,103 +77,89 @@ create table migtest_e_basic ( constraint uq_migtest_e_basic_indextest6 unique (indextest6), constraint pk_migtest_e_basic primary key (id) ); -create sequence migtest_e_basic_seq; create table migtest_e_enum ( - id number(10) not null, + id number(10) generated by default as identity not null, test_status varchar2(1), constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')), constraint pk_migtest_e_enum primary key (id) ); -create sequence migtest_e_enum_seq; create table migtest_e_history ( - id number(10) not null, + id number(10) generated by default as identity not null, test_string varchar2(255), constraint pk_migtest_e_history primary key (id) ); -create sequence migtest_e_history_seq; create table migtest_e_history2 ( - id number(10) not null, + id number(10) generated by default as identity not null, test_string varchar2(255), obsolete_string1 varchar2(255), obsolete_string2 varchar2(255), constraint pk_migtest_e_history2 primary key (id) ); -create sequence migtest_e_history2_seq; create table migtest_e_history3 ( - id number(10) not null, + id number(10) generated by default as identity not null, test_string varchar2(255), constraint pk_migtest_e_history3 primary key (id) ); -create sequence migtest_e_history3_seq; create table migtest_e_history4 ( - id number(10) not null, + id number(10) generated by default as identity not null, test_number number(10), constraint pk_migtest_e_history4 primary key (id) ); -create sequence migtest_e_history4_seq; create table migtest_e_history5 ( - id number(10) not null, + id number(10) generated by default as identity not null, test_number number(10), constraint pk_migtest_e_history5 primary key (id) ); -create sequence migtest_e_history5_seq; create table migtest_e_history6 ( - id number(10) not null, + id number(10) generated by default as identity not null, test_number1 number(10), test_number2 number(10) not null, constraint pk_migtest_e_history6 primary key (id) ); -create sequence migtest_e_history6_seq; create table migtest_e_ref ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(127) not null, constraint uq_migtest_e_ref_name unique (name), constraint pk_migtest_e_ref primary key (id) ); -create sequence migtest_e_ref_seq; create table migtest_e_softdelete ( - id number(10) not null, + id number(10) generated by default as identity not null, test_string varchar2(255), constraint pk_migtest_e_softdelete primary key (id) ); -create sequence migtest_e_softdelete_seq; create table migtest_mtm_c ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_migtest_mtm_c primary key (id) ); -create sequence migtest_mtm_c_seq; create table migtest_mtm_m ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_migtest_mtm_m primary key (id) ); -create sequence migtest_mtm_m_seq; create table migtest_oto_child ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(255), constraint pk_migtest_oto_child primary key (id) ); -create sequence migtest_oto_child_seq; create table migtest_oto_master ( - id number(19) not null, + id number(19) generated by default as identity not null, name varchar2(255), constraint pk_migtest_oto_master primary key (id) ); -create sequence migtest_oto_master_seq; create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql index 68ab55e92..a7ebf50ef 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.1.sql @@ -1,10 +1,9 @@ -- Migrationscripts for ebean unittest -- apply changes create table migtest_e_user ( - id number(10) not null, + id number(10) generated by default as identity not null, constraint pk_migtest_e_user primary key (id) ); -create sequence migtest_e_user_seq; create table migtest_mtm_c_migtest_mtm_m ( migtest_mtm_c_id number(10) not null, diff --git a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql index 8bc419e76..47a095e4e 100644 --- a/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql +++ b/src/test/resources/dbmigration/migrationtest/oracle/1.3.sql @@ -1,12 +1,11 @@ -- Migrationscripts for ebean unittest -- apply changes create table migtest_e_ref ( - id number(10) not null, + id number(10) generated by default as identity not null, name varchar2(127) not null, constraint uq_migtest_e_ref_name unique (name), constraint pk_migtest_e_ref primary key (id) ); -create sequence migtest_e_ref_seq; alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent; alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id;