#3082. NULL generator.

be35bbe0 · Evgeny Fradkin · 543e0b66 · be35bbe0 · be35bbe0
2 changed file
--- a/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/plugin.xml
@@ -48,128 +48,139 @@
    <extension point="org.jkiss.dbeaver.mockGenerator">

        <generator
-            id="fkGenerator"
-            label="FK"
-            description="Values from associated table (FK)"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.FKGenerator">
-<!--
+                id="booleanRandomGenerator"
+                label="Random"
+                description="Random boolean values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.BooleanRandomGenerator">
+            <type kind="BOOLEAN"/>
+
            <propertyGroup label="General">
-                <property id="numberRefRecords" label="Ref Records" type="integer" defaultValue="1000000" description="Size limit of referenced keys dictionary"/>
+                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
-->
        </generator>

        <generator
-            id="stringTextGenerator"
-            label="Text"
-            description="Random length substrings from the 'Lorem ipsum' text"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.StringTextGenerator">
-            <type kind="STRING"/>
+                id="booleanSequenceGenerator"
+                label="Sequence"
+                description="Adjustable sequence of boolean values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.BooleanSequenceGenerator">
+            <type kind="BOOLEAN"/>

            <propertyGroup label="General">
-                <property id="template" label="Template" type="string" description="Source of substrings"
-                    defaultValue="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."/>
-                <property id="minLength" label="Min Length" type="integer" defaultValue="1" description="Minimum length"/>
-                <property id="maxLength" label="Max Length" type="integer" defaultValue="100" description="Maximum length (0 means the column length)"/>
+                <property id="initial" label="Initial" type="boolean" defaultValue="TRUE"/>
+                <property id="order" label="Order" type="string" defaultValue="CONSTANT" validValues="ALTERNATELY,CONSTANT"/>

                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-                id="stringUuidGenerator"
-                label="UUID"
-                description="UUID random values"
-                class="org.jkiss.dbeaver.ext.mockdata.generator.StringUuidGenerator">
-            <type kind="STRING"/>
+                id="dateRandomGenerator"
+                label="Random"
+                description="Random date values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.DateRandomGenerator">
+            <type kind="DATETIME"/>

            <propertyGroup label="General">
+                <property id="startDate" label="Start date" type="string" description="Date range start (DD-MM-YYYY)"/>
+                <property id="endDate" label="End date" type="string" description="Date range end (DD-MM-YYYY)"/>
+
                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-            id="numericRandomGenerator"
-            label="Random"
-            description="Random numeric values"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.NumericRandomGenerator">
-            <type kind="NUMERIC"/>
+                id="dateSequenceGenerator"
+                label="Sequence"
+                description="Adjustable sequence of dates"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.DateSequenceGenerator">
+            <type kind="DATETIME"/>

            <propertyGroup label="General">
+                <property id="startDate" label="Start date" type="string" defaultValue="${now as dd-MM-yyyy}" description="Sequence start date (DD-MM-YYYY)"/>
+                <property id="step" label="Increment step" type="integer" defaultValue="1" description="Sequence increment step (days)"/>
+                <property id="reverse" label="Reverse order" type="boolean" defaultValue="FALSE" description="Reverse sequence order"/>
+
                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-            id="numericSequenceGenerator"
-            label="Sequence"
-            description="Sequence of numbers with adjustable start, step and order"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.NumericSequenceGenerator">
-            <type kind="NUMERIC"/>
-
+            id="fkGenerator"
+            label="FK"
+            description="Values from associated table (FK)"
+            class="org.jkiss.dbeaver.ext.mockdata.generator.FKGenerator">
+<!--
            <propertyGroup label="General">
-                <property id="start" label="Start value" type="long" defaultValue="0" description="Initial sequence value"/>
-                <property id="step" label="Increment step" type="long" defaultValue="1" description="Sequence increment step"/>
-                <property id="reverse" label="Reverse order" type="boolean" defaultValue="FALSE" description="Reverse the sequence order"/>
-
-                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
+                <property id="numberRefRecords" label="Ref Records" type="integer" defaultValue="1000000" description="Size limit of referenced keys dictionary"/>
            </propertyGroup>
+-->
        </generator>

        <generator
-            id="dateRandomGenerator"
-            label="Random"
-            description="Random date values"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.DateRandomGenerator">
+            id="nullGenerator"
+            label="NULL"
+            description="NULL values"
+            class="org.jkiss.dbeaver.ext.mockdata.generator.NullGenerator">
+            <type kind="BOOLEAN"/>
            <type kind="DATETIME"/>
+            <type kind="NUMERIC"/>
+            <type kind="STRING"/>
+        </generator>

-            <propertyGroup label="General">
-                <property id="startDate" label="Start date" type="string" description="Date range start (DD-MM-YYYY)"/>
-                <property id="endDate" label="End date" type="string" description="Date range end (DD-MM-YYYY)"/>
+        <generator
+                id="numericRandomGenerator"
+                label="Random"
+                description="Random numeric values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.NumericRandomGenerator">
+            <type kind="NUMERIC"/>

+            <propertyGroup label="General">
                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-                id="dateSequenceGenerator"
+                id="numericSequenceGenerator"
                label="Sequence"
-                description="Adjustable sequence of dates"
-                class="org.jkiss.dbeaver.ext.mockdata.generator.DateSequenceGenerator">
-            <type kind="DATETIME"/>
+                description="Sequence of numbers with adjustable start, step and order"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.NumericSequenceGenerator">
+            <type kind="NUMERIC"/>

            <propertyGroup label="General">
-                <property id="startDate" label="Start date" type="string" defaultValue="${now as dd-MM-yyyy}" description="Sequence start date (DD-MM-YYYY)"/>
-                <property id="step" label="Increment step" type="integer" defaultValue="1" description="Sequence increment step (days)"/>
-                <property id="reverse" label="Reverse order" type="boolean" defaultValue="FALSE" description="Reverse sequence order"/>
+                <property id="start" label="Start value" type="long" defaultValue="0" description="Initial sequence value"/>
+                <property id="step" label="Increment step" type="long" defaultValue="1" description="Sequence increment step"/>
+                <property id="reverse" label="Reverse order" type="boolean" defaultValue="FALSE" description="Reverse the sequence order"/>

                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-            id="booleanRandomGenerator"
-            label="Random"
-            description="Random boolean values"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.BooleanRandomGenerator">
-            <type kind="BOOLEAN"/>
+            id="stringTextGenerator"
+            label="Text"
+            description="Random length substrings from the 'Lorem ipsum' text"
+            class="org.jkiss.dbeaver.ext.mockdata.generator.StringTextGenerator">
+            <type kind="STRING"/>

            <propertyGroup label="General">
+                <property id="template" label="Template" type="string" description="Source of substrings"
+                    defaultValue="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."/>
+                <property id="minLength" label="Min Length" type="integer" defaultValue="1" description="Minimum length"/>
+                <property id="maxLength" label="Max Length" type="integer" defaultValue="100" description="Maximum length (0 means the column length)"/>
+
                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

        <generator
-            id="booleanSequenceGenerator"
-            label="Sequence"
-            description="Adjustable sequence of boolean values"
-            class="org.jkiss.dbeaver.ext.mockdata.generator.BooleanSequenceGenerator">
-            <type kind="BOOLEAN"/>
+                id="stringUuidGenerator"
+                label="UUID"
+                description="UUID random values"
+                class="org.jkiss.dbeaver.ext.mockdata.generator.StringUuidGenerator">
+            <type kind="STRING"/>

            <propertyGroup label="General">
-                <property id="initial" label="Initial" type="boolean" defaultValue="TRUE"/>
-                <property id="order" label="Order" type="string" defaultValue="CONSTANT" validValues="ALTERNATELY,CONSTANT"/>
-
                <property id="nulls" label="%% of NULLs" type="integer" defaultValue="0" description="NULL values (%)"/>
            </propertyGroup>
        </generator>

--- a/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/generator/NullGenerator.java
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/generator/NullGenerator.java
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+ * Copyright (C) 2010-2017 Eugene Fradkin (eugene.fradkin@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jkiss.dbeaver.ext.mockdata.generator;
+
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+
+import java.io.IOException;
+
+public class NullGenerator extends AbstractMockValueGenerator {
+
+    @Override
+    public Object generateOneValue(DBRProgressMonitor monitor) throws DBException, IOException {
+        return null;
+    }
+}