adding in all types for all databases

Author: synapticloop

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

@@ -65,6 +65,7 @@
 import synapticloop.h2zero.validator.field.FieldPopulateForeignKeyValidator;
 import synapticloop.h2zero.validator.field.FieldPopulatePrimaryKeyValidator;
 import synapticloop.h2zero.validator.field.FieldPrimaryKeyTypeValidator;
+import synapticloop.h2zero.validator.field.FieldSerialNonPrimaryKeyValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldBlobValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldClobValidator;
 import synapticloop.h2zero.validator.field.SQLite3FieldPrimaryKeyValidator;
@@ -148,6 +149,7 @@ public class H2ZeroParser {
 		validators.add(new FieldIgnoredKeysValidator());
 		validators.add(new FieldNotNullLengthValidator());
 		validators.add(new FieldPrimaryKeyTypeValidator());
+		validators.add(new FieldSerialNonPrimaryKeyValidator());
 
 		validators.add(new SQLite3FieldBlobValidator());
 		validators.add(new SQLite3FieldClobValidator());

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

@@ -265,7 +265,7 @@ public static void setInt(PreparedStatement preparedStatement, int parameterInde
 	}
 
 	/**
-	 * Set a SMALLINT datatype to a prepared statement with the value of the passed
+	 * Set a INTEGER 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
@@ -274,7 +274,21 @@ public static void setInt(PreparedStatement preparedStatement, int parameterInde
 	 * 
 	 * @throws SQLException if something went horribly wrong
 	 */
-	public static void setSmallint(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+	public static void setInteger(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+		setInt(preparedStatement, parameterIndex, value);
+	}
+
+	/**
+	 * Set a SMALLINT datatype to a prepared statement with the value of the passed
+	 * in Short, 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, Short value) throws SQLException {
 		if(null == value) {
 			preparedStatement.setNull(parameterIndex, Types.SMALLINT);
 		} else {
@@ -292,7 +306,7 @@ public static void setSmallint(PreparedStatement preparedStatement, int paramete
 	 * 
 	 * @throws SQLException if something went horribly wrong
 	 */
-	public static void setSmallserial(PreparedStatement preparedStatement, int parameterIndex, Integer value) throws SQLException {
+	public static void setSmallserial(PreparedStatement preparedStatement, int parameterIndex, Short value) throws SQLException {
 		setSmallint(preparedStatement, parameterIndex, value);
 	}
 
@@ -493,6 +507,42 @@ public static void setDouble(PreparedStatement preparedStatement, int parameterI
 		}
 	}
 
+	/**
+	 * Set a DECIMAL datatype to a prepared statement with the value of the passed 
+	 * in double, 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 setDecimal(PreparedStatement preparedStatement, int parameterIndex, Double value) throws SQLException {
+		if(null == value) {
+			preparedStatement.setNull(parameterIndex, Types.DECIMAL);
+		} else {
+			preparedStatement.setDouble(parameterIndex, value);
+		}
+	}
+
+	/**
+	 * Set a REAL datatype to a prepared statement with the value of the passed 
+	 * in double, 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 setReal(PreparedStatement preparedStatement, int parameterIndex, Double value) throws SQLException {
+		if(null == value) {
+			preparedStatement.setNull(parameterIndex, Types.REAL);
+		} else {
+			preparedStatement.setDouble(parameterIndex, value);
+		}
+	}
+
 	/**
 	 * Set a CLOB datatype to a prepared statement with the value of the passed
 	 * in clob, or the correct SQL null type if null
@@ -732,6 +782,15 @@ public static Float getNullableResultFloat(ResultSet resultSet, int index) throw
 		return((Float)returnPossibleNullObject(resultSet, resultSet.getFloat(index)));
 	}
 
+	public static Double getNullableResultDouble(ResultSet resultSet, int index) throws SQLException { 
+		return((Double)returnPossibleNullObject(resultSet, resultSet.getDouble(index)));
+	}
+
+	public static Short getNullableResultShort(ResultSet resultSet, int index) throws SQLException { 
+		return((Short)returnPossibleNullObject(resultSet, resultSet.getShort(index)));
+	}
+
+	
 	/**
 	 * Get the underlying combo pooled result set
 	 * 

src/main/java/synapticloop/h2zero/base/validator/BigserialValidator.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 BigserialValidator extends ValidatorBase {
+
+	public BigserialValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/DoubleValidator.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 DoubleValidator extends ValidatorBase {
+
+	public DoubleValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/RealValidator.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 RealValidator extends ValidatorBase {
+
+	public RealValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/SerialValidator.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 SerialValidator extends ValidatorBase {
+
+	public SerialValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/SmallintValidator.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 SmallintValidator extends ValidatorBase {
+
+	public SmallintValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/base/validator/SmallserialValidator.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 SmallserialValidator extends ValidatorBase {
+
+	public SmallserialValidator(String nmField, String value, int minLength, int maxLength, boolean allowNull) {
+		super(nmField, value, minLength, maxLength, allowNull, false);
+	}
+}

src/main/java/synapticloop/h2zero/model/field/BigserialField.java

@@ -0,0 +1,54 @@
+package synapticloop.h2zero.model.field;
+
+/*
+ * 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 org.json.JSONObject;
+
+import synapticloop.h2zero.exception.H2ZeroParseException;
+
+public class BigserialField extends BaseField {
+
+	public BigserialField(JSONObject jsonObject) throws H2ZeroParseException {
+		super(jsonObject);
+	}
+
+	public BigserialField(JSONObject jsonObject, boolean isInField) throws H2ZeroParseException {
+		super(jsonObject, isInField);
+	}
+
+	@Override
+	public String getJavaType() {
+		return "Long";
+	}
+
+	@Override
+	public String getSqlJavaType() {
+		return("Long");
+	}
+
+	@Override
+	public String getSqlNullType() {
+		return("BIGINT");
+	}
+
+	@Override
+	public boolean getShouldEscape() {
+		return false;
+	}
+}

src/main/java/synapticloop/h2zero/model/field/DecimalField.java

@@ -35,12 +35,12 @@ public DecimalField(JSONObject jsonObject, boolean isInField) throws H2ZeroParse
 
 	@Override
 	public String getJavaType() {
-		return("Float");
+		return("Double");
 	}
 
 	@Override
 	public String getSqlJavaType() {
-		return("Float");
+		return("Double");
 	}
 
 	@Override