diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
index 720dc0c512..bb365e5321 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java
@@ -374,7 +374,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             checkResultSet(ctx, true);
 
             assertNotNull(ctx.record());
-            assertEquals(2, ctx.record().fieldsRow().getDegree());
+            assertEquals(2, ctx.record().fieldsRow().size());
 
             assertNull(ctx.record().getValue(0));
             assertNull(ctx.record().getValue(1));
@@ -389,7 +389,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             checkResultSet(ctx, true);
 
             assertNotNull(ctx.record());
-            assertEquals(2, ctx.record().fieldsRow().getDegree());
+            assertEquals(2, ctx.record().fieldsRow().size());
 
             assertEquals(ids.remove(), ctx.record().getValue(0));
             assertEquals("Hello", ctx.record().getValue(1));
@@ -403,7 +403,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             checkStatement(ctx, true);
             checkResultSet(ctx, true);
             assertNotNull(ctx.record());
-            assertEquals(2, ctx.record().fieldsRow().getDegree());
+            assertEquals(2, ctx.record().fieldsRow().size());
 
             assertNotNull(ctx.result());
             assertEquals(2, ctx.result().size());
@@ -417,7 +417,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             checkStatement(ctx, true);
             checkResultSet(ctx, true);
             assertNotNull(ctx.record());
-            assertEquals(2, ctx.record().fieldsRow().getDegree());
+            assertEquals(2, ctx.record().fieldsRow().size());
 
             assertNotNull(ctx.result());
             assertEquals(2, ctx.result().size());
@@ -431,7 +431,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             checkStatement(ctx, true);
             checkResultSet(ctx, true);
             assertNotNull(ctx.record());
-            assertEquals(2, ctx.record().fieldsRow().getDegree());
+            assertEquals(2, ctx.record().fieldsRow().size());
 
             assertNotNull(ctx.result());
             assertEquals(2, ctx.result().size());
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
index ac823f279a..876cb14d74 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java
@@ -263,7 +263,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .fetch();
 
         assertEquals(2, result3.size());
-        assertEquals(5, result3.fieldsRow().getDegree());
+        assertEquals(5, result3.fieldsRow().size());
         assertEquals(AUTHOR_IDS, result3.getValues(0));
         assertEquals(
             asList(1, 2, 0, 0, 0),
@@ -306,7 +306,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .fetch();
 
         assertEquals(3, r1.size());
-        assertEquals(7, r1.fieldsRow().getDegree());
+        assertEquals(7, r1.fieldsRow().size());
         assertEquals(asList(1, 2, 3), r1.getValues("book_id", Integer.class));
         assertEquals(asList(10, 10, 10), r1.getValues("of_max", Integer.class));
         assertEquals(asList(1, 1, 1), r1.getValues("of_cnt", Integer.class));
@@ -325,7 +325,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .fetch();
 
         assertEquals(1, r2.size());
-        assertEquals(5, r2.fieldsRow().getDegree());
+        assertEquals(5, r2.fieldsRow().size());
         assertEquals(1, (int) r2.get(0).getValue("a", Integer.class));
         assertEquals(2, (int) r2.get(0).getValue("b", Integer.class));
         assertEquals(3, (int) r2.get(0).getValue("c", Integer.class));
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index 0e5c520038..def79072c8 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -321,7 +321,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         // --------
         B book = create().selectFrom(TBook()).where(TBook_ID().equal(1)).fetchOne();
         Object[] bookArray = create().selectFrom(TBook()).where(TBook_ID().equal(1)).fetchOneArray();
-        for (int i = 0; i < TBook().fieldsRow().getDegree(); i++) {
+        for (int i = 0; i < TBook().fieldsRow().size(); i++) {
             assertEquals(book.getValue(i), bookArray[i]);
         }
 
@@ -341,7 +341,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             assertEquals(bookJ, book2);
             assertEquals(bookJ, book3);
 
-            for (int i = 0; i < TBook().fieldsRow().getDegree(); i++) {
+            for (int i = 0; i < TBook().fieldsRow().size(); i++) {
                 assertEquals(books.getValue(j, i), booksArray[j][i]);
                 assertEquals(books.getValue(j, i), books.intoArray()[j][i]);
                 assertEquals(books.get(j).getValue(i), books.get(j).intoArray()[i]);
@@ -1688,7 +1688,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
     private void checkMetaData(Row row, ResultSet rs) throws SQLException {
         // Check the meta data
         ResultSetMetaData meta = rs.getMetaData();
-        assertEquals(row.getDegree(), meta.getColumnCount());
+        assertEquals(row.size(), meta.getColumnCount());
         assertEquals(Integer.class.getName(), meta.getColumnClassName(1));
         assertEquals(Types.INTEGER, meta.getColumnType(1));
         assertEquals("integer", meta.getColumnTypeName(1));
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
index fecb38a923..196339b36f 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FormatTests.java
@@ -180,21 +180,21 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals("1", xp.evaluate("count(/table/thead)", doc));
         assertEquals("1", xp.evaluate("count(/table/thead/tr)", doc));
         assertEquals("0", xp.evaluate("count(/table/thead/tr/td)", doc));
-        assertEquals("" + row.getDegree(),
+        assertEquals("" + row.size(),
                           xp.evaluate("count(/table/thead/tr/th)", doc));
 
-        for (int i = 0; i < row.getDegree(); i++) {
+        for (int i = 0; i < row.size(); i++) {
             assertEquals(row.field(i).getName(),
                           xp.evaluate("/table/thead/tr/th[" + (i + 1) + "]/text()", doc));
         }
 
         assertEquals("1", xp.evaluate("count(/table/tbody)", doc));
         assertEquals("4", xp.evaluate("count(/table/tbody/tr)", doc));
-        assertEquals("" + 4 * row.getDegree(),
+        assertEquals("" + 4 * row.size(),
                           xp.evaluate("count(/table/tbody/tr/td)", doc));
 
         for (int j = 0; j < books.size(); j++) {
-            for (int i = 0; i < row.getDegree(); i++) {
+            for (int i = 0; i < row.size(); i++) {
                 assertEquals(books.get(j).getValue(i, String.class, "{null}"),
                           xp.evaluate("/table/tbody/tr[" + (j + 1) + "]/td[" + (i + 1) + "]/text()", doc));
             }
@@ -210,7 +210,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             "1,2,a,b,c");
 
         // Check meta data
-        assertEquals(4, result1.fieldsRow().getDegree());
+        assertEquals(4, result1.fieldsRow().size());
         assertEquals(3, result1.size());
         assertEquals("A", result1.field(0).getName());
         assertEquals("B", result1.field(1).getName());
@@ -279,9 +279,9 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         String[] fieldNames = lines[0].split(",");
 
         assertEquals(books.size() + 1, lines.length);
-        assertEquals(row.getDegree(), fieldNames.length);
+        assertEquals(row.size(), fieldNames.length);
 
-        for (int i = 0; i < row.getDegree(); i++) {
+        for (int i = 0; i < row.size(); i++) {
             assertEquals(row.field(i).getName(), fieldNames[i]);
         }
 
@@ -289,7 +289,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         for (int j = 1; j < lines.length; j++) {
 
             // Check every value in the record
-            for (int i = 0; i < row.getDegree(); i++) {
+            for (int i = 0; i < row.size(); i++) {
                 String value = books.get(j - 1).getValue(i, String.class);
 
                 if (value == null || "".equals(value)) {
@@ -301,7 +301,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
                 // Generate a regular expression matching dummy values for
                 // fields != i and an actual value expression for field == i
-                for (int x = 0; x < row.getDegree(); x++) {
+                for (int x = 0; x < row.size(); x++) {
                     if (x > 0) {
                         regex1 += ",";
                         regex2 += ",";
@@ -414,10 +414,10 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         Row row = TBook().fieldsRow();
         assertEquals("1", xp.evaluate("count(/result)", doc));
         assertEquals("1", xp.evaluate("count(/result/fields)", doc));
-        assertEquals("" + row.getDegree(),
+        assertEquals("" + row.size(),
                           xp.evaluate("count(/result/fields/field)", doc));
 
-        for (int i = 0; i < row.getDegree(); i++) {
+        for (int i = 0; i < row.size(); i++) {
             assertEquals(row.field(i).getName(),
                           xp.evaluate("/result/fields/field[" + (i + 1) + "]/@name", doc));
             assertEquals(row.field(i).getDataType().getTypeName().toUpperCase(),
@@ -426,11 +426,11 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         assertEquals("1", xp.evaluate("count(/result/records)", doc));
         assertEquals("4", xp.evaluate("count(/result/records/record)", doc));
-        assertEquals("" + 4 * row.getDegree(),
+        assertEquals("" + 4 * row.size(),
                           xp.evaluate("count(/result/records/record/value)", doc));
 
         for (int j = 0; j < books.size(); j++) {
-            for (int i = 0; i < row.getDegree(); i++) {
+            for (int i = 0; i < row.size(); i++) {
                 assertEquals(row.field(i).getName(),
                           xp.evaluate("/result/records/record[" + (j + 1) + "]/value[" + (i + 1) + "]/@field", doc));
                 assertEquals(books.get(j).getValue(i, String.class, ""),
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index 44fe6ef5ed..e989af470a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -275,7 +275,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         create().select()
                 .from(TAuthor().as("x"))
                 .crossJoin(TAuthor())
-                .orderBy(1, 1 + TAuthor().fieldsRow().getDegree())
+                .orderBy(1, 1 + TAuthor().fieldsRow().size())
                 .fetch();
 
         assertEquals(4, result.size());
@@ -284,7 +284,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             result.getValues(0, Integer.class));
         assertEquals(
            asList(1, 2, 1, 2),
-           result.getValues(0 + TAuthor().fieldsRow().getDegree(), Integer.class));
+           result.getValues(0 + TAuthor().fieldsRow().size(), Integer.class));
 
         // [#1844] Cross joins can be achieved by omitting the ON clause, too
         assertEquals(8, (int)
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
index 6ce17cb922..92d0a02182 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -432,7 +432,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         Result<Record> fetch1 = q.fetch();
         assertEquals(1, fetch1.size());
-        assertEquals(1, fetch1.fieldsRow().getDegree());
+        assertEquals(1, fetch1.fieldsRow().size());
         assertEquals("p", fetch1.field(0).getName());
         assertEquals("p", fetch1.field("p").getName());
         assertEquals("10", fetch1.getValue(0, 0));
@@ -448,7 +448,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         assertEquals(10L, (long) fetch3.get(0));
 
         Record fetch4 = q.fetchAny();
-        assertEquals(1, fetch4.fieldsRow().getDegree());
+        assertEquals(1, fetch4.fieldsRow().size());
         assertEquals("p", fetch4.field(0).getName());
         assertEquals("p", fetch4.field("p").getName());
         assertEquals("10", fetch4.getValue(0));
@@ -478,7 +478,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         q.fetchInto(new RecordHandler<Record>() {
             @Override
             public void next(Record record) {
-                assertEquals(1, record.fieldsRow().getDegree());
+                assertEquals(1, record.fieldsRow().size());
                 assertEquals("10", record.getValue(0));
                 count[0] += 1;
             }
@@ -495,7 +495,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         Cursor<Record> fetch10 = q.fetchLazy();
         assertFalse(fetch10.isClosed());
         assertTrue(fetch10.hasNext());
-        assertEquals(1, fetch10.fieldsRow().getDegree());
+        assertEquals(1, fetch10.fieldsRow().size());
         assertEquals("p", fetch10.field(0).getName());
         assertEquals("10", fetch10.fetchOne().getValue(0));
         assertFalse(fetch10.isClosed());
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
index 346cce6ee7..be29f31ccd 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java
@@ -950,7 +950,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             result = create().select().from(table(array)).fetch();
 
             assertEquals(0, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
             // [#523] TODO use ArrayRecord meta data instead
 //            assertEquals(array.getDataType(), result.getField(0).getDataType());
 
@@ -960,7 +960,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             result = create().select().from(table(array)).fetch();
 
             assertEquals(1, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 //            assertEquals(array.getDataType(), result.getField(0).getDataType());
             assertEquals(null, result.getValue(0, 0));
 
@@ -970,7 +970,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             result = create().select().from(table(array)).fetch();
 
             assertEquals(2, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 //            assertEquals(array.getDataType(), result.getField(0).getDataType());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
@@ -981,7 +981,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             result = create().select().from(table(array)).fetch();
 
             assertEquals(3, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 //            assertEquals(array.getDataType(), result.getField(0).getDataType());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
@@ -1025,24 +1025,24 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             // --------------------------
             result = create().select().from(table(FArrays1Field_R(null))).fetch();
             assertEquals(0, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 
             array = newNUMBER_R();
             result = create().select().from(table(FArrays1Field_R(val(array)))).fetch();
             assertEquals(0, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 
             array.set(null, 1);
             result = create().select().from(table(FArrays1Field_R(val(array)))).fetch();
             assertEquals(2, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
 
             array.set(null, 1, null, 2);
             result = create().select().from(table(FArrays1Field_R(val(array)))).fetch();
             assertEquals(4, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
             assertEquals(null, result.getValue(2, 0));
@@ -1091,24 +1091,24 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             // --------------------------
             result = create().select().from(table(FArrays1Field(null))).fetch();
             assertEquals(0, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 
             array = new Integer[0];
             result = create().select().from(table(FArrays1Field(val(array)))).fetch();
             assertEquals(0, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
 
             array = new Integer[] { null, 1 };
             result = create().select().from(table(FArrays1Field(val(array)))).fetch();
             assertEquals(2, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
 
             array = new Integer[] { null, 1, null, 2 };
             result = create().select().from(table(FArrays1Field(val(array)))).fetch();
             assertEquals(4, result.size());
-            assertEquals(1, result.fieldsRow().getDegree());
+            assertEquals(1, result.fieldsRow().size());
             assertEquals(null, result.getValue(0, 0));
             assertEquals("1", "" + result.getValue(1, 0));
             assertEquals(null, result.getValue(2, 0));
@@ -1129,7 +1129,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         result = create().select().from(table(new Integer[0])).fetch();
 
         assertEquals(0, result.size());
-        assertEquals(1, result.fieldsRow().getDegree());
+        assertEquals(1, result.fieldsRow().size());
 
         // An array containing null
         // ------------------------
@@ -1137,7 +1137,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         result = create().select().from(table(array)).fetch();
 
         assertEquals(1, result.size());
-        assertEquals(1, result.fieldsRow().getDegree());
+        assertEquals(1, result.fieldsRow().size());
         assertEquals(null, result.getValue(0, 0));
 
         // An array containing two values (some DB's can't guarantee ordering)
@@ -1146,7 +1146,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         result = create().select().from(table(array)).fetch();
 
         assertEquals(2, result.size());
-        assertEquals(1, result.fieldsRow().getDegree());
+        assertEquals(1, result.fieldsRow().size());
         assertTrue(asList(array).containsAll(result.getValues(0)));
 
         // An array containing three values (some DB's can't guarantee ordering)
@@ -1155,7 +1155,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         result = create().select().from(table(array)).fetch();
 
         assertEquals(3, result.size());
-        assertEquals(1, result.fieldsRow().getDegree());
+        assertEquals(1, result.fieldsRow().size());
         assertTrue(asList(array).containsAll(result.getValues(0)));
 
         // Joining an unnested array table
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
index 1af8cd8d34..073bd3fd4d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java
@@ -112,12 +112,12 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         assertEquals(1, i);
         assertEquals(1, result.size());
-        assertEquals(3, result.fieldsRow().getDegree());
+        assertEquals(3, result.fieldsRow().size());
         assertTrue(asList(result.fields()).contains(f1));
         assertTrue(asList(result.fields()).contains(f2));
         assertTrue(asList(result.fields()).contains(f3));
 
-        assertEquals(3, result.get(0).fieldsRow().getDegree());
+        assertEquals(3, result.get(0).fieldsRow().size());
         assertTrue(asList(result.get(0).fields()).contains(f1));
         assertTrue(asList(result.get(0).fields()).contains(f2));
         assertTrue(asList(result.get(0).fields()).contains(f3));
diff --git a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend
index 1d06323021..7cdf226b47 100644
--- a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend
@@ -261,7 +261,7 @@ class BetweenAndSteps extends Generators {
         
                 // These dialects either don't support row value expressions, or they
                 // Can't handle row value expressions with the BETWEEN predicate
-                else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) {
+                else if (row.size() > 1 && asList(CUBRID, DERBY, FIREBIRD, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) {
                     Condition result = r.ge(min).and(r.le(max));
         
                     if (not) {
diff --git a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
index 0db26bcab5..58c450197a 100644
--- a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
@@ -1206,7 +1206,7 @@ class Rows extends Generators {
             // ------------------------------------------------------------------------
 
             @Override
-            public final int getDegree() {
+            public final int size() {
                 return fields.length;
             }
 
diff --git a/jOOQ/src/main/java/org/jooq/Row.java b/jOOQ/src/main/java/org/jooq/Row.java
index 1fba093a92..574aa30856 100644
--- a/jOOQ/src/main/java/org/jooq/Row.java
+++ b/jOOQ/src/main/java/org/jooq/Row.java
@@ -49,7 +49,7 @@ public interface Row extends QueryPart {
     /**
      * Get the degree of this row value expression
      */
-    int getDegree();
+    int size();
 
     /**
      * Get a specific field from this row.
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 1b53b64f31..69dd2cf786 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -431,7 +431,7 @@ implements
                     FieldList v = new FieldList();
                     Row row = h2Select.fieldsRow();
 
-                    for (int i = 0; i < row.getDegree(); i++) {
+                    for (int i = 0; i < row.size(); i++) {
                         v.add(row.field(i).as("s" + (i + 1)));
                     }
 
@@ -503,7 +503,7 @@ implements
                 Map<Field<?>, Field<?>> update = new LinkedHashMap<Field<?>, Field<?>>();
                 Map<Field<?>, Field<?>> insert = new LinkedHashMap<Field<?>, Field<?>>();
 
-                for (int i = 0; i < src.fieldsRow().getDegree(); i++) {
+                for (int i = 0; i < src.fieldsRow().size(); i++) {
 
                     // Oracle does not allow to update fields from the ON clause
                     if (!onFields.contains(getH2Fields().get(i))) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
index fbe812f425..6b23244c83 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultSetImpl.java
@@ -1157,7 +1157,7 @@ class ResultSetImpl extends JDBC41ResultSet implements ResultSet, Serializable {
         public final int getColumnCount() throws SQLException {
             checkNotClosed();
 
-            return result.fieldsRow().getDegree();
+            return result.fieldsRow().size();
         }
 
         @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
index 159d10eda9..47045d193d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
@@ -698,7 +698,7 @@ implements
 
         // These dialects either don't support row value expressions, or they
         // Can't handle row value expressions with the BETWEEN predicate
-        else if (row.getDegree() > 1 && asList(CUBRID, DERBY, FIREBIRD, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) {
+        else if (row.size() > 1 && asList(CUBRID, DERBY, FIREBIRD, MYSQL, ORACLE, SQLITE, SQLSERVER, SYBASE).contains(configuration.getDialect())) {
             Condition result = r.ge(min).and(r.le(max));
 
             if (not) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
index 692c7e05cc..351acc7e84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
@@ -200,7 +200,7 @@ implements
     // ------------------------------------------------------------------------
 
     @Override
-    public final int getDegree() {
+    public final int size() {
         return fields.length;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 5e5a3a1471..c41d1fbf7c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -758,7 +758,7 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
     }
 
     private final boolean knownTable(Table<?> table) {
-        return table.fieldsRow().getDegree() > 0;
+        return table.fieldsRow().size() > 0;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
index 1b8e9095cc..5ecb39d5a6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
@@ -82,7 +82,7 @@ class TableAlias<R extends Record> extends AbstractTable<R> {
      */
     private final void registerFields(String[] fieldAliases) {
         Row row = this.alias.wrapped().fieldsRow();
-        int size = row.getDegree();
+        int size = row.size();
 
         for (int i = 0; i < size; i++) {
             Field<?> field = row.field(i);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index efb25718b6..cd6b1a2c43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -2057,7 +2057,7 @@ final class Utils {
         List<String> values = PostgresUtils.toPGObject(object.toString());
 
         Row row = record.fieldsRow();
-        for (int i = 0; i < row.getDegree(); i++) {
+        for (int i = 0; i < row.size(); i++) {
             pgSetValue(record, row.field(i), values.get(i));
         }
 
diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
index a36b4bc402..3e0be99564 100644
--- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
@@ -535,15 +535,15 @@ public class BasicTest extends AbstractTest {
         RowN t23 = row(1, "2", 3, "4", 5, "6", 7, "8", 9, "10", 11, "12", 13, "14", 15, "16", 17, "18", 19, "20", 21, "22", 23);
 
         // General info
-        assertEquals(1, t1.getDegree());
-        assertEquals(2, t2.getDegree());
-        assertEquals(3, t3.getDegree());
-        assertEquals(4, t4.getDegree());
-        assertEquals(5, t5.getDegree());
-        assertEquals(6, t6.getDegree());
-        assertEquals(7, t7.getDegree());
-        assertEquals(8, t8.getDegree());
-        assertEquals(23, t23.getDegree());
+        assertEquals(1, t1.size());
+        assertEquals(2, t2.size());
+        assertEquals(3, t3.size());
+        assertEquals(4, t4.size());
+        assertEquals(5, t5.size());
+        assertEquals(6, t6.size());
+        assertEquals(7, t7.size());
+        assertEquals(8, t8.size());
+        assertEquals(23, t23.size());
 
         // Accessors
         assertEquals(val(1), t1.field1());