Component Builder (v.4.0.0-rc2)
+ Component Builder (v.4.0.0-rc3)
The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index b57283f58..f97bead05 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -59,10 +59,10 @@
pkg_component_builder
package
site
- 4.0.0-rc2
+ 4.0.0-rc3
https://dev.vdm.io
- https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v4.0.0-rc2.zip
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v4.0.0-rc3.zip
releasecandidate
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
index 95d427abf..694bbc927 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
@@ -342,9 +342,16 @@ abstract class Schema implements SchemaInterface
'current' => $current->Type,
'expected' => $expected['type']
];
+ }
- // check if update of default values is needed
- $this->checkDefault($table, $column);
+ // check if update of default values is needed
+ if ($this->checkDefault($table, $column) && !isset($requireUpdate[$column]))
+ {
+ $requireUpdate[$column] = [
+ 'column' => $column,
+ 'current' => $current->Type,
+ 'expected' => $expected['type']
+ ];
}
}
@@ -402,29 +409,23 @@ abstract class Schema implements SchemaInterface
* @param string $table The table to update.
* @param string $column The column/field to check.
*
- * @return void
+ * @return bool
* @since 3.2.1
*/
- protected function checkDefault(string $table, string $column): void
+ protected function checkDefault(string $table, string $column): bool
{
// Retrieve the expected column configuration
$expected = $this->table->get($table, $column, 'db');
// Skip updates if the column is auto_increment
- if (isset($expected['auto_increment']) && $expected['auto_increment'])
+ if (isset($expected['auto_increment']) && $expected['auto_increment'] === true)
{
- return;
+ return false;
}
// Retrieve the current column configuration
$current = $this->columns[$column];
- // Check if default should be empty and current default is null, skip processing
- if (strtoupper($expected['default']) === 'EMPTY' && $current->Default === NULL)
- {
- return;
- }
-
// Determine the new default value based on the expected settings
$type = $expected['type'] ?? 'TEXT';
$db_default = isset($expected['default']) ? $expected['default'] : null;
@@ -434,7 +435,17 @@ abstract class Schema implements SchemaInterface
if (is_numeric($newDefault) && $this->adjustExistingDefaults($table, $column, $current->Default, $newDefault))
{
$this->success[] = "Success: updated the ($column) defaults in $table table.";
+
+ return true;
}
+
+ if (is_string($expected['default']) && strtoupper($expected['default']) === 'EMPTY' &&
+ is_string($current->Default) && strpos($current->Default, 'EMPTY') !== false)
+ {
+ return true; // little fix
+ }
+
+ return false;
}
/**
@@ -680,7 +691,7 @@ abstract class Schema implements SchemaInterface
*/
protected function getDefaultValue(string $type, ?string $defaultValue, bool $pure = false): string
{
- if ($defaultValue === null || strtoupper($defaultValue) === 'EMPTY')
+ if ($defaultValue === null)
{
return '';
}
@@ -692,7 +703,52 @@ abstract class Schema implements SchemaInterface
}
// Apply and quote the default value
- return $pure ? $defaultValue : " DEFAULT " . $this->db->quote($defaultValue);
+ $sql_default = $this->quote($defaultValue);
+ return $pure ? $defaultValue : " DEFAULT $sql_default";
+ }
+
+ /**
+ * Set a value based on data type
+ *
+ * @param mixed $value The value to set
+ *
+ * @return mixed
+ * @since 3.2.0
+ **/
+ protected function quote($value)
+ {
+ if ($value === null) // hmm the null does pose an issue (will keep an eye on this)
+ {
+ return 'NULL';
+ }
+
+ if (is_string($value) && strtoupper($value) === 'EMPTY')
+ {
+ return "''";
+ }
+ elseif (is_numeric($value))
+ {
+ if (filter_var($value, FILTER_VALIDATE_INT))
+ {
+ return (int) $value;
+ }
+ elseif (filter_var($value, FILTER_VALIDATE_FLOAT))
+ {
+ return (float) $value;
+ }
+ }
+ elseif (is_bool($value)) // not sure if this will work well (but its correct)
+ {
+ return $value ? 'TRUE' : 'FALSE';
+ }
+ // For date and datetime values
+ elseif ($value instanceof \DateTime)
+ {
+ return $this->db->quote($value->format('Y-m-d H:i:s'));
+ }
+
+ // For other data types, just escape it
+ return $this->db->quote($value);
}
}
-