diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-oracle.sql
index 95134d8c1..015c266d0 100644
--- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-oracle.sql
+++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-oracle.sql
@@ -54,14 +54,14 @@ DROP TABLE BEFORE_CONVERT_CALLBACK_FOR_SAVE_BATCH CASCADE CONSTRAINTS PURGE;
 CREATE TABLE LEGO_SET
 (
     "id1" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    NAME VARCHAR(30)
+    NAME VARCHAR2(30)
 );
 CREATE TABLE MANUAL
 (
     "id2" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
     LEGO_SET    NUMBER,
     "alternative" NUMBER,
-    CONTENT     VARCHAR(2000)
+    CONTENT     VARCHAR2(2000)
 );
 
 ALTER TABLE MANUAL
@@ -71,27 +71,27 @@ ALTER TABLE MANUAL
 CREATE TABLE ONE_TO_ONE_PARENT
 (
     "id3" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    content VARCHAR(30)
+    content VARCHAR2(30)
 );
 CREATE TABLE Child_No_Id
 (
     ONE_TO_ONE_PARENT INTEGER PRIMARY KEY,
-    CONTENT           VARCHAR(30)
+    CONTENT           VARCHAR2(30)
 );
 
 CREATE TABLE LIST_PARENT
 (
     "id4"   NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 CREATE TABLE SIMPLE_LIST_PARENT
 (
     ID   NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 CREATE TABLE element_no_id
 (
-    CONTENT         VARCHAR(100),
+    CONTENT         VARCHAR2(100),
     SIMPLE_LIST_PARENT_key NUMBER,
     SIMPLE_LIST_PARENT     NUMBER,
     LIST_PARENT_key NUMBER,
@@ -107,14 +107,14 @@ CREATE TABLE BYTE_ARRAY_OWNER
 CREATE TABLE CHAIN4
 (
     FOUR        NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    FOUR_VALUE VARCHAR(20)
+    FOUR_VALUE VARCHAR2(20)
 );
 
 
 CREATE TABLE CHAIN3
 (
     THREE       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    THREE_VALUE VARCHAR(20),
+    THREE_VALUE VARCHAR2(20),
     CHAIN4      NUMBER,
     FOREIGN KEY (CHAIN4) REFERENCES CHAIN4 (FOUR)
 );
@@ -122,7 +122,7 @@ CREATE TABLE CHAIN3
 CREATE TABLE CHAIN2
 (
     TWO       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    TWO_VALUE VARCHAR(20),
+    TWO_VALUE VARCHAR2(20),
     CHAIN3    NUMBER,
     FOREIGN KEY (CHAIN3) REFERENCES CHAIN3 (THREE)
 );
@@ -130,7 +130,7 @@ CREATE TABLE CHAIN2
 CREATE TABLE CHAIN1
 (
     ONE       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    ONE_VALUE VARCHAR(20),
+    ONE_VALUE VARCHAR2(20),
     CHAIN2    NUMBER,
     FOREIGN KEY (CHAIN2) REFERENCES CHAIN2 (TWO)
 );
@@ -138,7 +138,7 @@ CREATE TABLE CHAIN1
 CREATE TABLE CHAIN0
 (
     ZERO       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    ZERO_VALUE VARCHAR(20),
+    ZERO_VALUE VARCHAR2(20),
     CHAIN1     NUMBER,
     FOREIGN KEY (CHAIN1) REFERENCES CHAIN1 (ONE)
 );
@@ -146,33 +146,33 @@ CREATE TABLE CHAIN0
 CREATE TABLE NO_ID_CHAIN4
 (
     FOUR       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    FOUR_VALUE VARCHAR(20)
+    FOUR_VALUE VARCHAR2(20)
 );
 
 CREATE TABLE NO_ID_CHAIN3
 (
-    THREE_VALUE  VARCHAR(20),
+    THREE_VALUE  VARCHAR2(20),
     NO_ID_CHAIN4 NUMBER,
     FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
 );
 
 CREATE TABLE NO_ID_CHAIN2
 (
-    TWO_VALUE    VARCHAR(20),
+    TWO_VALUE    VARCHAR2(20),
     NO_ID_CHAIN4 NUMBER,
     FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
 );
 
 CREATE TABLE NO_ID_CHAIN1
 (
-    ONE_VALUE    VARCHAR(20),
+    ONE_VALUE    VARCHAR2(20),
     NO_ID_CHAIN4 NUMBER,
     FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
 );
 
 CREATE TABLE NO_ID_CHAIN0
 (
-    ZERO_VALUE   VARCHAR(20),
+    ZERO_VALUE   VARCHAR2(20),
     NO_ID_CHAIN4 NUMBER,
     FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
 );
@@ -180,12 +180,12 @@ CREATE TABLE NO_ID_CHAIN0
 CREATE TABLE NO_ID_LIST_CHAIN4
 (
     FOUR       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    FOUR_VALUE VARCHAR(20)
+    FOUR_VALUE VARCHAR2(20)
 );
 
 CREATE TABLE NO_ID_LIST_CHAIN3
 (
-    THREE_VALUE           VARCHAR(20),
+    THREE_VALUE           VARCHAR2(20),
     NO_ID_LIST_CHAIN4     NUMBER,
     NO_ID_LIST_CHAIN4_KEY NUMBER,
     PRIMARY KEY (NO_ID_LIST_CHAIN4,
@@ -195,7 +195,7 @@ CREATE TABLE NO_ID_LIST_CHAIN3
 
 CREATE TABLE NO_ID_LIST_CHAIN2
 (
-    TWO_VALUE             VARCHAR(20),
+    TWO_VALUE             VARCHAR2(20),
     NO_ID_LIST_CHAIN4     NUMBER,
     NO_ID_LIST_CHAIN4_KEY NUMBER,
     NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -213,7 +213,7 @@ CREATE TABLE NO_ID_LIST_CHAIN2
 
 CREATE TABLE NO_ID_LIST_CHAIN1
 (
-    ONE_VALUE             VARCHAR(20),
+    ONE_VALUE             VARCHAR2(20),
     NO_ID_LIST_CHAIN4     NUMBER,
     NO_ID_LIST_CHAIN4_KEY NUMBER,
     NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -235,7 +235,7 @@ CREATE TABLE NO_ID_LIST_CHAIN1
 
 CREATE TABLE NO_ID_LIST_CHAIN0
 (
-    ZERO_VALUE            VARCHAR(20),
+    ZERO_VALUE            VARCHAR2(20),
     NO_ID_LIST_CHAIN4     NUMBER,
     NO_ID_LIST_CHAIN4_KEY NUMBER,
     NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -264,14 +264,14 @@ CREATE TABLE NO_ID_LIST_CHAIN0
 CREATE TABLE NO_ID_MAP_CHAIN4
 (
     FOUR       NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    FOUR_VALUE VARCHAR(20)
+    FOUR_VALUE VARCHAR2(20)
 );
 
 CREATE TABLE NO_ID_MAP_CHAIN3
 (
-    THREE_VALUE          VARCHAR(20),
+    THREE_VALUE          VARCHAR2(20),
     NO_ID_MAP_CHAIN4     NUMBER,
-    NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
+    NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
     PRIMARY KEY (NO_ID_MAP_CHAIN4,
                  NO_ID_MAP_CHAIN4_KEY),
     FOREIGN KEY (NO_ID_MAP_CHAIN4) REFERENCES NO_ID_MAP_CHAIN4 (FOUR)
@@ -279,10 +279,10 @@ CREATE TABLE NO_ID_MAP_CHAIN3
 
 CREATE TABLE NO_ID_MAP_CHAIN2
 (
-    TWO_VALUE            VARCHAR(20),
+    TWO_VALUE            VARCHAR2(20),
     NO_ID_MAP_CHAIN4     NUMBER,
-    NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
+    NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
     PRIMARY KEY (NO_ID_MAP_CHAIN4,
                  NO_ID_MAP_CHAIN4_KEY,
                  NO_ID_MAP_CHAIN3_KEY),
@@ -297,11 +297,11 @@ CREATE TABLE NO_ID_MAP_CHAIN2
 
 CREATE TABLE NO_ID_MAP_CHAIN1
 (
-    ONE_VALUE            VARCHAR(20),
+    ONE_VALUE            VARCHAR2(20),
     NO_ID_MAP_CHAIN4     NUMBER,
-    NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN2_KEY VARCHAR(20),
+    NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN2_KEY VARCHAR2(20),
     PRIMARY KEY (NO_ID_MAP_CHAIN4,
                  NO_ID_MAP_CHAIN4_KEY,
                  NO_ID_MAP_CHAIN3_KEY,
@@ -319,12 +319,12 @@ CREATE TABLE NO_ID_MAP_CHAIN1
 
 CREATE TABLE NO_ID_MAP_CHAIN0
 (
-    ZERO_VALUE           VARCHAR(20),
+    ZERO_VALUE           VARCHAR2(20),
     NO_ID_MAP_CHAIN4     NUMBER,
-    NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN2_KEY VARCHAR(20),
-    NO_ID_MAP_CHAIN1_KEY VARCHAR(20),
+    NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN2_KEY VARCHAR2(20),
+    NO_ID_MAP_CHAIN1_KEY VARCHAR2(20),
     PRIMARY KEY (NO_ID_MAP_CHAIN4,
                  NO_ID_MAP_CHAIN4_KEY,
                  NO_ID_MAP_CHAIN3_KEY,
@@ -352,8 +352,8 @@ CREATE TABLE VERSIONED_AGGREGATE
 CREATE TABLE WITH_READ_ONLY
 (
     ID        NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    NAME      VARCHAR(200),
-    READ_ONLY VARCHAR(200) DEFAULT 'from-db'
+    NAME      VARCHAR2(200),
+    READ_ONLY VARCHAR2(200) DEFAULT 'from-db'
 );
 
 
@@ -372,35 +372,35 @@ CREATE TABLE WITH_ID_ONLY
 CREATE TABLE WITH_INSERT_ONLY
 (
   ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-  INSERT_ONLY VARCHAR(100)
+  INSERT_ONLY VARCHAR2(100)
 );
 
 CREATE TABLE MULTIPLE_COLLECTIONS
 (
     ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE SET_ELEMENT
 (
     MULTIPLE_COLLECTIONS NUMBER,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE LIST_ELEMENT
 (
     MULTIPLE_COLLECTIONS NUMBER,
     MULTIPLE_COLLECTIONS_KEY INT,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE MAP_ELEMENT
 (
     MULTIPLE_COLLECTIONS NUMBER,
-    MULTIPLE_COLLECTIONS_KEY VARCHAR(10),
+    MULTIPLE_COLLECTIONS_KEY VARCHAR2(10),
     ENUM_MAP_OWNER NUMBER,
-    ENUM_MAP_OWNER_KEY VARCHAR(10),
-    NAME VARCHAR(100)
+    ENUM_MAP_OWNER_KEY VARCHAR2(10),
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE AUTHOR
@@ -411,48 +411,48 @@ CREATE TABLE AUTHOR
 CREATE TABLE BOOK
 (
     AUTHOR NUMBER,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE ENUM_MAP_OWNER
 (
     ID NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-    NAME VARCHAR(100)
+    NAME VARCHAR2(100)
 );
 
 CREATE TABLE WITH_ONE_TO_ONE
 (
-    ID VARCHAR(100)
+    ID VARCHAR2(100)
 );
 
 CREATE TABLE REFERENCED
 (
-    "renamed" VARCHAR(100),
+    "renamed" VARCHAR2(100),
     ID NUMBER
 );
 CREATE TABLE FIRST
 (
     ID   NUMBER      NOT NULL PRIMARY KEY,
-    NAME VARCHAR(20) NOT NULL
+    NAME VARCHAR2(20) NOT NULL
 );
 
 CREATE TABLE SEC
 (
     ID    NUMBER      NOT NULL PRIMARY KEY,
     FIRST NUMBER      NOT NULL,
-    NAME  VARCHAR(20) NOT NULL,
+    NAME  VARCHAR2(20) NOT NULL,
     FOREIGN KEY (FIRST) REFERENCES FIRST (ID)
 );
 
 CREATE TABLE THIRD
 (
     SEC NUMBER      NOT NULL,
-    NAME   VARCHAR(20) NOT NULL,
+    NAME   VARCHAR2(20) NOT NULL,
     FOREIGN KEY (SEC) REFERENCES SEC (ID)
 );
 
 CREATE TABLE BEFORE_CONVERT_CALLBACK_FOR_SAVE_BATCH
 (
-    ID VARCHAR(50) PRIMARY KEY,
-    NAME VARCHAR(50)
+    ID VARCHAR2(50) PRIMARY KEY,
+    NAME VARCHAR2(50)
 );
diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql
index 428ff48f3..9bdcc9cbf 100644
--- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql
+++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql
@@ -45,8 +45,8 @@ CREATE TABLE LEAF
 CREATE TABLE WITH_DELIMITED_COLUMN
 (
     ID                      NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY,
-    "ORG.XTUNIT.IDENTIFIER" VARCHAR(100),
-    STYPE                   VARCHAR(100)
+    "ORG.XTUNIT.IDENTIFIER" VARCHAR2(100),
+    STYPE                   VARCHAR2(100)
 );
 
 CREATE TABLE ENTITY_WITH_SEQUENCE
diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithCollectionsIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithCollectionsIntegrationTests-oracle.sql
index 52dbc96a4..94dde7996 100644
--- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithCollectionsIntegrationTests-oracle.sql
+++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithCollectionsIntegrationTests-oracle.sql
@@ -8,6 +8,6 @@ CREATE TABLE DUMMY_ENTITY (
 
 CREATE TABLE ELEMENT (
     ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
-    CONTENT VARCHAR(100),
+    CONTENT VARCHAR2(100),
     DUMMY_ENTITY NUMBER
 );
diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithListsIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithListsIntegrationTests-oracle.sql
index ba93df317..6a71b9f21 100644
--- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithListsIntegrationTests-oracle.sql
+++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithListsIntegrationTests-oracle.sql
@@ -14,7 +14,7 @@ CREATE TABLE DUMMY_ENTITY
 CREATE TABLE ELEMENT
 (
     ID               NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY,
-    CONTENT          VARCHAR(100),
+    CONTENT          VARCHAR2(100),
     DUMMY_ENTITY_KEY NUMBER,
     DUMMY_ENTITY     NUMBER
 );
@@ -31,7 +31,7 @@ CREATE TABLE intermediate
 );
 CREATE TABLE leaf
 (
-    name             VARCHAR(100),
+    name             VARCHAR2(100),
     intermediate     NUMBER NOT NULL,
     intermediate_key NUMBER NOT NULL
 );
diff --git a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests-oracle.sql b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests-oracle.sql
index 18c251e18..a6e74e044 100644
--- a/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests-oracle.sql
+++ b/spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/StringBasedJdbcQueryMappingConfigurationIntegrationTests-oracle.sql
@@ -1,2 +1,2 @@
 DROP TABLE CAR;
-CREATE TABLE CAR ( id NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY, model VARCHAR(100));
+CREATE TABLE CAR ( id NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY, model VARCHAR2(100));