diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java index 5e8db2f9a7..33a49b0758 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java @@ -35,7 +35,6 @@ */ package org.jooq.util.ase; -import java.math.BigDecimal; import static java.util.Arrays.asList; import static org.jooq.impl.Factory.concat; import static org.jooq.impl.Factory.field; @@ -263,6 +262,7 @@ public class ASEDatabase extends AbstractDatabase { return result; } + @SuppressWarnings("unused") private List fetchRoutines() { List result = new ArrayList(); @@ -280,12 +280,15 @@ public class ASEDatabase extends AbstractDatabase { @Override protected List getRoutines0() throws SQLException { List result = new ArrayList(); - - for (Record record : fetchRoutines()) { - SchemaDefinition schema = getSchema(record.getValueAsString("Owner")); - String name = record.getValueAsString("Name"); - result.add(new ASERoutineDefinition(schema, null, name, "", null, null, null)); - } + + // [#1507] This was contributed by Mark. It will be correctly + // implemented at a later stage + +// for (Record record : fetchRoutines()) { +// SchemaDefinition schema = getSchema(record.getValueAsString("Owner")); +// String name = record.getValueAsString("Name"); +// result.add(new ASERoutineDefinition(schema, null, name, null, null, null)); +// } return result; } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASERoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASERoutineDefinition.java index 2b667b6709..1e72de33e3 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASERoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASERoutineDefinition.java @@ -35,12 +35,21 @@ import java.util.List; import org.jooq.Record; import org.jooq.Result; import org.jooq.tools.StringUtils; -import org.jooq.util.*; +import org.jooq.util.AbstractRoutineDefinition; +import org.jooq.util.ColumnDefinition; +import org.jooq.util.DataTypeDefinition; +import org.jooq.util.DefaultDataTypeDefinition; +import org.jooq.util.DefaultParameterDefinition; +import org.jooq.util.InOutDefinition; +import org.jooq.util.ParameterDefinition; +import org.jooq.util.SchemaDefinition; /** - * @author + * [#1507] This was contributed by user Mark. It will be correctly implemented at a later stage + * + * @author Mark */ -public class ASERoutineDefinition extends AbstractRoutineDefinition { +class ASERoutineDefinition extends AbstractRoutineDefinition { public ASERoutineDefinition(SchemaDefinition schema, String name, String dataType, Number length, Number precision, Number scale) { super(schema, null, name, null, null); @@ -57,7 +66,7 @@ public class ASERoutineDefinition extends AbstractRoutineDefinition { if(fetchMany.size() < 2) { return; } - + for (Record record : fetchMany.get(1)) { String n = record.getValueAsString("Parameter_name"); String l = record.getValueAsString("Length");