added in postgres and cockroach database variants

Author: synapticloop

build.all.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+
+./gradlew assemble pTML -b build.gradle 
+./gradlew -b build.h2zero.cockroach.gradle h2zero
+./gradlew -b build.h2zero.mysql.gradle h2zero
+./gradlew -b build.h2zero.postgresql.gradle h2zero
+
+

build.cockroach.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./gradlew assemble pTML -b build.gradle 
+./gradlew -b build.h2zero.cockroach.gradle h2zero
+

build.h2zero.cockroach.gradle

@@ -0,0 +1,34 @@
+buildscript {
+	repositories {
+		mavenCentral()
+		jcenter()
+		mavenLocal()
+		maven {
+			url "https://plugins.gradle.org/"
+		}
+	}
+
+	dependencies {
+		classpath 'synapticloop:h2zero:4.2.7'
+//		classpath 'synapticloop:h2zero-extension-taglibs:1.0.0'
+	}
+}
+
+plugins {
+	id 'java'
+	id 'eclipse'
+}
+
+apply plugin: 'synapticloop.h2zero'
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+	jcenter()
+}
+
+h2zero {
+	inFile = 'src/test/resources/sample-include-cockroach.h2zero'
+	outDir = '.'
+	verbose = 'false'
+}

build.h2zero.postgresql.gradle

@@ -0,0 +1,34 @@
+buildscript {
+	repositories {
+		mavenCentral()
+		jcenter()
+		mavenLocal()
+		maven {
+			url "https://plugins.gradle.org/"
+		}
+	}
+
+	dependencies {
+		classpath 'synapticloop:h2zero:4.2.7'
+//		classpath 'synapticloop:h2zero-extension-taglibs:1.0.0'
+	}
+}
+
+plugins {
+	id 'java'
+	id 'eclipse'
+}
+
+apply plugin: 'synapticloop.h2zero'
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+	jcenter()
+}
+
+h2zero {
+	inFile = 'src/test/resources/sample-include-postgresql.h2zero'
+	outDir = '.'
+	verbose = 'false'
+}

build.postgresql.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+./gradlew assemble pTML -b build.gradle 
+./gradlew -b build.h2zero.postgresql.gradle h2zero
+

src/main/java/synapticloop/h2zero/H2ZeroParser.java

@@ -64,6 +64,7 @@
 import synapticloop.h2zero.validator.field.FieldNotNullLengthValidator;
 import synapticloop.h2zero.validator.field.FieldPopulateForeignKeyValidator;
 import synapticloop.h2zero.validator.field.FieldPopulatePrimaryKeyValidator;
+import synapticloop.h2zero.validator.field.FieldPrimaryKeyTypeValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldBlobValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldClobValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldPrimaryKeyValidator;
@@ -81,6 +82,8 @@
 import synapticloop.h2zero.validator.inserter.InserterKeyValidator;
 import synapticloop.h2zero.validator.inserter.InserterNameValidator;
 import synapticloop.h2zero.validator.inserter.InserterQueryParameterNameValidator;
+import synapticloop.h2zero.validator.options.OptionsDatabaseDefaultValidator;
+import synapticloop.h2zero.validator.options.OptionsDatabaseTypeValidator;
 import synapticloop.h2zero.validator.question.QuestionInternalNameValidator;
 import synapticloop.h2zero.validator.question.QuestionJsonUniqueKeyExistsValidator;
 import synapticloop.h2zero.validator.question.QuestionKeyValidator;
@@ -119,6 +122,8 @@ public class H2ZeroParser {
 	static {
 		// options
 		validators.add(new OptionsGeneratorsValidator());
+		validators.add(new OptionsDatabaseDefaultValidator());
+		validators.add(new OptionsDatabaseTypeValidator());
 
 		// overall validators
 		validators.add(new UniqueTableViewNameValidator());
@@ -142,6 +147,7 @@ public class H2ZeroParser {
 		validators.add(new FieldNameDuplicateValidator());
 		validators.add(new FieldIgnoredKeysValidator());
 		validators.add(new FieldNotNullLengthValidator());
+		validators.add(new FieldPrimaryKeyTypeValidator());
 
 		validators.add(new SQLite3FieldBlobValidator());
 		validators.add(new SQLite3FieldClobValidator());
@@ -205,6 +211,7 @@ public class H2ZeroParser {
 		validators.add(new ConstantDeleterValidator());
 		validators.add(new ConstantInserterValidator());
 		validators.add(new ConstantUpdaterValidator());
+
 	}
 
 	private static Map<String, BaseValidator> validatorMap = new HashMap<>();

src/main/java/synapticloop/h2zero/base/manager/BaseConnectionManager.java

@@ -196,6 +196,20 @@ public static void setBigint(PreparedStatement preparedStatement, int parameterI
 		}
 	}
 
+	/**
+	 * Set a BIGSERIAL datatype to a prepared statement with the value of the passed
+	 * in Long, or the correct SQL null type if null
+	 * 
+	 * @param preparedStatement The prepared statement
+	 * @param parameterIndex the index of the parameter
+	 * @param value the value to be set
+	 * 
+	 * @throws SQLException if something went horribly wrong
+	 */
+	public static void setBigserial(PreparedStatement preparedStatement, int parameterIndex, Long value) throws SQLException {
+		setBigint(preparedStatement, parameterIndex, value);
+	}
+
 	/**
 	 * Set a VARCHAR datatype to a prepared statement with the value of the passed
 	 * in String, or the correct SQL null type if null
@@ -250,6 +264,52 @@ public static void setInt(PreparedStatement preparedStatement, int parameterInde
 		}
 	}
 
+	/**
+	 * Set a SMALLINT datatype to a prepared statement with the value of the passed
+	 * in Integer, or the correct SQL null type if null
+	 * 
+	 * @param preparedStatement The prepared statement
+	 * @param parameterIndex the index of the parameter
+	 * @param value the value to be set
+	 * 
+	 * @throws SQLException if something went horribly wrong
+	 */
+	public static void setSmallint(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+		if(null == value) {
+			preparedStatement.setNull(parameterIndex, Types.SMALLINT);
+		} else {
+			preparedStatement.setInt(parameterIndex, value);
+		}
+	}
+
+	/**
+	 * Set a SMALLSERIAL datatype to a prepared statement with the value of the passed
+	 * in Integer, or the correct SQL null type if null
+	 * 
+	 * @param preparedStatement The prepared statement
+	 * @param parameterIndex the index of the parameter
+	 * @param value the value to be set
+	 * 
+	 * @throws SQLException if something went horribly wrong
+	 */
+	public static void setSmallserial(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+		setSmallint(preparedStatement, parameterIndex, value);
+	}
+
+	/**
+	 * Set a SERIAL datatype to a prepared statement with the value of the passed
+	 * in Integer, or the correct SQL null type if null
+	 * 
+	 * @param preparedStatement The prepared statement
+	 * @param parameterIndex the index of the parameter
+	 * @param value the value to be set
+	 * 
+	 * @throws SQLException if something went horribly wrong
+	 */
+	public static void setSerial(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+		setInt(preparedStatement, parameterIndex, value);
+	}
+
 	/**
 	 * Set a DATETIME datatype to a prepared statement with the value of the passed
 	 * in datetime or the correct SQL null type if null
@@ -364,6 +424,20 @@ public static void setFloat(PreparedStatement preparedStatement, int parameterIn
 		}
 	}
 
+	/**
+	 * Set a NUMERIC datatype to a prepared statement with the value of the passed
+	 * in float, or the correct SQL null type if null
+	 * 
+	 * @param preparedStatement The prepared statement
+	 * @param parameterIndex the index of the parameter
+	 * @param value the value to be set
+	 * 
+	 * @throws SQLException if something went horribly wrong
+	 */
+	public static void setNumeric(PreparedStatement preparedStatement, int parameterIndex, Float value) throws SQLException {
+		setFloat(preparedStatement, parameterIndex, value);
+	}
+
 	/**
 	 * Set a TINYINT datatype to a prepared statement with the value of the passed
 	 * in boolean, or the correct SQL null type if null

src/main/java/synapticloop/h2zero/base/manager/postgresql/ConnectionManager.java

@@ -0,0 +1,24 @@
+package synapticloop.h2zero.base.manager.postgresql;
+
+/*
+ * Copyright (c) 2012-2020 synapticloop.
+ * All rights reserved.
+ *
+ * This source code and any derived binaries are covered by the terms and
+ * conditions of the Licence agreement ("the Licence").  You may not use this
+ * source code or any derived binaries except in compliance with the Licence.
+ * A copy of the Licence is available in the file named LICENCE shipped with
+ * this source code or binaries.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * Licence for the specific language governing permissions and limitations
+ * under the Licence.
+ */
+
+import synapticloop.h2zero.base.manager.BaseConnectionManager;
+
+public class ConnectionManager extends BaseConnectionManager {
+
+}

src/main/java/synapticloop/h2zero/base/model/postgresql/ModelBase.java

@@ -0,0 +1,31 @@
+package synapticloop.h2zero.base.model.postgresql;
+
+/*
+ * Copyright (c) 2018 - 2020 synapticloop.
+ * All rights reserved.
+ *
+ * This source code and any derived binaries are covered by the terms and
+ * conditions of the Licence agreement ("the Licence").  You may not use this
+ * source code or any derived binaries except in compliance with the Licence.
+ * A copy of the Licence is available in the file named LICENCE shipped with
+ * this source code or binaries.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * Licence for the specific language governing permissions and limitations
+ * under the Licence.
+ */
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import synapticloop.h2zero.base.manager.mysql.ConnectionManager;
+
+public abstract class ModelBase extends synapticloop.h2zero.base.model.ModelBase {
+
+	@Override
+	protected Connection getConnection() throws SQLException {
+		return(ConnectionManager.getConnection());
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/NumericValidator.java

@@ -0,0 +1,29 @@
+package synapticloop.h2zero.base.validator;
+
+import synapticloop.h2zero.base.validator.bean.ValidationBean;
+import synapticloop.h2zero.base.validator.bean.ValidationFieldBean;
+
+/*
+ * Copyright (c) 2013-2020 synapticloop.
+ * All rights reserved.
+ *
+ * This source code and any derived binaries are covered by the terms and
+ * conditions of the Licence agreement ("the Licence").  You may not use this
+ * source code or any derived binaries except in compliance with the Licence.
+ * A copy of the Licence is available in the file named LICENCE shipped with
+ * this source code or binaries.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * Licence for the specific language governing permissions and limitations
+ * under the Licence.
+ */
+
+
+public class NumericValidator extends ValidatorBase {
+
+	public NumericValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}