Component Builder (v.5.0.0-beta4)
+ Component Builder (v.5.0.0-beta5)
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 4ddffb257..55d02e9e8 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -125,4 +125,22 @@
https://dev.vdm.io
+
+ Component Builder
+ Builds Complex Joomla Components
+ pkg_component_builder
+ package
+ site
+ 5.0.0-beta5
+ https://dev.vdm.io
+
+ https://git.vdm.dev/api/v1/repos/joomla/pkg-component-builder/archive/v5.0.0-beta5.zip
+
+
+ beta
+
+ Llewellyn van der Merwe
+ https://dev.vdm.io
+
+
\ No newline at end of file
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/BaseTable.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/BaseTable.php
index ee9043d9e..46227edca 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/BaseTable.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/BaseTable.php
@@ -48,7 +48,7 @@ abstract class BaseTable implements Tableinterface
'tab_name' => NULL,
'db' => [
'type' => 'INT(11)',
- 'default' => '',
+ 'default' => 'EMPTY',
'auto_increment' => true,
'primary_key' => true,
'null_switch' => 'NOT NULL'
@@ -227,7 +227,7 @@ abstract class BaseTable implements Tableinterface
'tab_name' => NULL,
'db' => [
'type' => 'TEXT',
- 'default' => '',
+ 'default' => 'EMPTY',
'null_switch' => 'NULL'
]
]
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
index 746acd6a3..53c05915a 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Abstraction/Schema.php
@@ -12,7 +12,8 @@
namespace VDM\Joomla\Abstraction;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Version;
use VDM\Joomla\Interfaces\Tableinterface as Table;
use VDM\Joomla\Interfaces\SchemaInterface;
@@ -71,6 +72,14 @@ abstract class Schema implements SchemaInterface
*/
private array $keys;
+ /**
+ * The current table columns
+ *
+ * @var array
+ * @since 3.2.1
+ */
+ private array $columns;
+
/**
* The success messages of the action
*
@@ -79,6 +88,14 @@ abstract class Schema implements SchemaInterface
*/
private array $success;
+ /**
+ * Current Joomla Version We are IN
+ *
+ * @var int
+ * @since 3.2.1
+ **/
+ protected $currentVersion;
+
/**
* Constructor.
*
@@ -100,8 +117,11 @@ abstract class Schema implements SchemaInterface
// set the component table
$this->prefix = $this->db->getPrefix() . $this->getCode();
+
+ // set the current version
+ $this->currentVersion = Version::MAJOR_VERSION;
} catch (\Exception $e) {
- throw new \Exception("Error: failed to initialize schema class due to a database error.", 0, $e);
+ throw new \Exception("Error: failed to initialize schema class due to a database error.");
}
}
@@ -118,23 +138,22 @@ abstract class Schema implements SchemaInterface
$this->success = [
"Success: scan of the component tables started."
];
-
foreach ($this->table->tables() as $table)
{
$this->uniqueKeys = [];
$this->keys = [];
- if (!$this->tableExists($table))
- {
- $this->createTable($table);
- }
- else
+ if ($this->tableExists($table))
{
$this->updateSchema($table);
}
+ else
+ {
+ $this->createTable($table);
+ }
}
} catch (\Exception $e) {
- throw new \Exception("Error: updating database schema.", 0, $e);
+ throw new \Exception("Error: updating database schema. " . $e->getMessage());
}
if (count($this->success) == 1)
@@ -149,6 +168,63 @@ abstract class Schema implements SchemaInterface
return $this->success;
}
+ /**
+ * Get the targeted component code
+ *
+ * @return string
+ * @since 3.2.1
+ */
+ abstract protected function getCode(): string;
+
+ /**
+ * Check if a table exists in the database.
+ *
+ * @param string $table The name of the table to check.
+ *
+ * @return bool True if table exists, False otherwise.
+ * @since 3.2.1
+ */
+ protected function tableExists(string $table): bool
+ {
+ return in_array($this->getTable($table), $this->tables);
+ }
+
+ /**
+ * Update the schema of an existing table.
+ *
+ * @param string $table The table to update.
+ *
+ * @return void
+ * @since 3.2.1
+ * @throws \Exception If there is an error while updating the schema.
+ */
+ public function updateSchema(string $table): void
+ {
+ try {
+ $existingColumns = $this->getExistingColumns($table);
+ $expectedColumns = $this->table->fields($table, true);
+
+ $missingColumns = array_diff($expectedColumns, $existingColumns);
+
+ if (!empty($missingColumns))
+ {
+ $this->addMissingColumns($table, $missingColumns);
+ }
+
+ $this->checkColumnsDataType($table, $expectedColumns);
+
+ } catch (\Exception $e) {
+ throw new \Exception("Error: updating schema for $table table. " . $e->getMessage());
+ }
+
+ if (!empty($missingColumns))
+ {
+ $column_s = (count($missingColumns) == 1) ? 'column' : 'columns';
+ $missingColumns = implode(', ', $missingColumns);
+ $this->success[] = "Success: added missing ($missingColumns) $column_s to $table table.";
+ }
+ }
+
/**
* Create a table with all necessary fields.
*
@@ -182,64 +258,38 @@ abstract class Schema implements SchemaInterface
$this->db->setQuery($createTableSql);
$this->db->execute();
} catch (\Exception $e) {
- throw new \Exception("Error: failed to create missing $table table.", 0, $e);
+ throw new \Exception("Error: failed to create missing $table table. " . $e->getMessage());
}
$this->success[] = "Success: created missing $table table.";
}
/**
- * Update the schema of an existing table.
+ * Fetch existing columns from a database table.
*
- * @param string $table The table to update.
+ * @param string $table The name of the table.
*
- * @return void
+ * @return array An array of column names.
* @since 3.2.1
- * @throws \Exception If there is an error while updating the schema.
*/
- public function updateSchema(string $table): void
+ protected function getExistingColumns(string $table): array
{
- try {
- $existingColumns = $this->getExistingColumns($table);
- $expectedColumns = $this->table->fields($table, true);
+ $this->columns = $this->db->getTableColumns($this->getTable($table), false);
- $missingColumns = array_diff($expectedColumns, $existingColumns);
-
- if (!empty($missingColumns))
- {
- $this->addMissingColumns($table, $missingColumns);
- }
- } catch (\Exception $e) {
- throw new \Exception("Error: updating schema for $table table.", 0, $e);
- }
-
- if (!empty($missingColumns))
- {
- $columns = (count($missingColumns) == 1) ? 'column' : 'columns';
- $missingColumns = implode(', ', $missingColumns);
- $this->success[] = "Success: added missing ($missingColumns) $columns to $table table.";
- }
+ return array_keys($this->columns);
}
- /**
- * Get the targeted component code
- *
- * @return string
- * @since 3.2.1
- */
- abstract protected function getCode(): string;
-
/**
* Add missing columns to a table.
*
- * @param string $table The table to update.
- * @param array $fields List of missing columns/fields.
+ * @param string $table The table to update.
+ * @param array $columns List of missing columns/fields.
*
* @return void
* @since 3.2.1
* @throws \Exception If there is an error adding columns.
*/
- protected function addMissingColumns(string $table, array $fields): void
+ protected function addMissingColumns(string $table, array $columns): void
{
try {
$query = $this->db->getQuery(true);
@@ -247,9 +297,9 @@ abstract class Schema implements SchemaInterface
// Start an ALTER TABLE query
$alterQueries = [];
- foreach ($fields as $field)
+ foreach ($columns as $column)
{
- if (($def = $this->getColumnDefinition($table, $field)) !== null)
+ if (($def = $this->getColumnDefinition($table, $column)) !== null)
{
$alterQueries[] = " ADD " . $def;
}
@@ -258,9 +308,291 @@ abstract class Schema implements SchemaInterface
$this->db->setQuery($alterTable . implode(', ', $alterQueries));
$this->db->execute();
} catch (\Exception $e) {
- $columns = (count($fields) == 1) ? 'column' : 'columns';
- $fields = implode(', ', $fields);
- throw new \Exception("Error: failed to add ($fields) $columns to $table table.", 0, $e);
+ $column_s = (count($columns) == 1) ? 'column' : 'columns';
+ $columns = implode(', ', $columns);
+ throw new \Exception("Error: failed to add ($columns) $column_s to $table table. " . $e->getMessage());
+ }
+ }
+
+ /**
+ * Validate and update the data type of existing fields/columns
+ *
+ * @param string $table The table to update.
+ * @param array $columns List of columns/fields to check.
+ *
+ * @return void
+ * @since 3.2.1
+ */
+ protected function checkColumnsDataType(string $table, array $columns): void
+ {
+ $requireUpdate = [];
+ foreach ($columns as $column)
+ {
+ $current = $this->columns[$column] ?? null;
+ if ($current === null || ($expected = $this->table->get($table, $column, 'db')) === null)
+ {
+ continue;
+ }
+
+ // check if the data type and size match
+ if ($this->isDataTypeChangeSignificant($current->Type, $expected['type']))
+ {
+ $requireUpdate[$column] = [
+ 'column' => $column,
+ 'current' => $current->Type,
+ 'expected' => $expected['type']
+ ];
+
+ // check if update of default values is needed
+ $this->checkDefault($table, $column);
+ }
+ }
+
+ if (!empty($requireUpdate))
+ {
+ $this->updateColumnsDataType($table, $requireUpdate);
+ }
+ }
+
+ /**
+ * Generates a SQL snippet for defining a table column, incorporating column type,
+ * default value, nullability, and auto-increment properties.
+ *
+ * @param string $table The table name to be used.
+ * @param string $field The field name in the table to generate SQL for.
+ *
+ * @return string|null The SQL snippet for the column definition.
+ * @since 3.2.1
+ * @throws \Exception If the schema details cannot be retrieved or the SQL statement cannot be constructed properly.
+ */
+ protected function getColumnDefinition(string $table, string $field): ?string
+ {
+ try {
+ // Retrieve the database schema details for the specified table and field
+ if (($db = $this->table->get($table, $field, 'db')) === null)
+ {
+ return null;
+ }
+
+ // Prepare the column name
+ $column_name = $this->db->quoteName($field);
+ $db['name'] = $field;
+
+ // Prepare the type and default value SQL statement
+ $type = $db['type'] ?? 'TEXT';
+ $db_default = isset($db['default']) ? $db['default'] : null;
+ $default = $this->getDefaultValue($type, $db_default);
+
+ // Prepare the null switch, and auto increment statement
+ $null_switch = !empty($db['null_switch']) ? " " . $db['null_switch'] : '';
+ $auto_increment = !empty($db['auto_increment']) ? " AUTO_INCREMENT" : '';
+
+ $this->setKeys($db);
+
+ // Assemble the SQL snippet for the column definition
+ return "{$column_name} {$type}{$null_switch}{$default}{$auto_increment}";
+ } catch (\Exception $e) {
+ throw new \Exception("Error: failed to generate column definition for ($table.$field). " . $e->getMessage());
+ }
+ }
+
+ /**
+ * Check and Update the default values if needed, including existing data adjustments
+ *
+ * @param string $table The table to update.
+ * @param string $column The column/field to check.
+ *
+ * @return void
+ * @since 3.2.1
+ */
+ protected function checkDefault(string $table, string $column): void
+ {
+ // 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'])
+ {
+ return;
+ }
+
+ // 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;
+ $newDefault = $this->getDefaultValue($type, $db_default, true);
+
+ // First, adjust existing rows to conform to the new default if necessary
+ if (is_numeric($newDefault) && $this->adjustExistingDefaults($table, $column, $current->Default, $newDefault))
+ {
+ $this->success[] = "Success: updated the ($column) defaults in $table table.";
+ }
+ }
+
+ /**
+ * Update the data type of the given fields.
+ *
+ * @param string $table The table to update.
+ * @param array $columns List of columns/fields that must be updated.
+ *
+ * @return void
+ * @since 3.2.1
+ */
+ protected function updateColumnsDataType(string $table, array $columns): void
+ {
+ $alterTable = 'ALTER TABLE ' . $this->db->quoteName($this->getTable($table));
+ foreach ($columns as $column => $types)
+ {
+ if (($def = $this->getColumnDefinition($table, $column)) === null)
+ {
+ continue;
+ }
+
+ $dbField = $this->db->quoteName($column);
+ $alterQuery = "$alterTable CHANGE $dbField ". $def;
+
+ if ($this->updateColumnDataType($alterQuery, $table, $column))
+ {
+ $current = $types['current'] ?? 'error';
+ $expected = $types['expected'] ?? 'error';
+ $this->success[] = "Success: updated ($column) column datatype $current to $expected in $table table.";
+ }
+ }
+ }
+
+ /**
+ * Add the component name to get the full table name.
+ *
+ * @param string $table The table name.
+ *
+ * @return void
+ * @since 3.2.1
+ */
+ protected function getTable(string $table): string
+ {
+ return $this->prefix . '_' . $table;
+ }
+
+ /**
+ * Determines if the change in data type between two definitions is significant.
+ *
+ * This function checks if there's a significant difference between the current
+ * data type and the expected data type that would require updating the database schema.
+ * It ignores size and other modifiers for certain data types where MySQL considers
+ * these attributes irrelevant for storage.
+ *
+ * @param string $currentType The current data type from the database schema.
+ * @param string $expectedType The expected data type to validate against.
+ *
+ * @return bool Returns true if the data type change is significant, otherwise false.
+ * @since 3.2.1
+ */
+ function isDataTypeChangeSignificant(string $currentType, string $expectedType): bool
+ {
+ // we only do this for Joomla 4+
+ if ($this->currentVersion != 3)
+ {
+ // Normalize both input types to lowercase for case-insensitive comparison
+ $currentType = strtolower($currentType);
+ $expectedType = strtolower($expectedType);
+
+ // Define types where size or other modifiers are irrelevant
+ $sizeIrrelevantTypes = [
+ 'int', 'tinyint', 'smallint', 'mediumint', 'bigint', // Standard integer types
+ 'int unsigned', 'tinyint unsigned', 'smallint unsigned', 'mediumint unsigned', 'bigint unsigned', // Unsigned integer types
+ ];
+
+ // Check if the type involves size-irrelevant types
+ foreach ($sizeIrrelevantTypes as $type)
+ {
+ if (strpos($expectedType, $type) !== false)
+ {
+ // Remove any numeric sizes and modifiers for comparison
+ $pattern = '/\(\d+\)|unsigned|\s*/';
+ $cleanCurrentType = preg_replace($pattern, '', $currentType);
+ $cleanExpectedType = preg_replace($pattern, '', $expectedType);
+
+ // Compare the cleaned types
+ if ($cleanCurrentType === $cleanExpectedType)
+ {
+ return false; // No significant change
+ }
+ }
+ }
+ }
+
+ // Perform a standard case-insensitive comparison for other types
+ if (strcasecmp($currentType, $expectedType) == 0)
+ {
+ return false; // No significant change
+ }
+
+ return true; // Significant datatype change detected
+ }
+
+ /**
+ * Updates existing rows in a column to a new default value
+ *
+ * @param string $table The table to update.
+ * @param string $column The column to update.
+ * @param mixed $currentDefault Current default value.
+ * @param mixed $newDefault The new default value to be set.
+ *
+ * @return void
+ * @since 3.2.1
+ * @throws \Exception If there is an error updating column defaults.
+ */
+ protected function adjustExistingDefaults(string $table, string $column, $currentDefault, $newDefault): bool
+ {
+ // Determine if adjustment is needed based on new and current defaults
+ if ($newDefault !== $currentDefault)
+ {
+ try {
+ // Format the new default for SQL use
+ $sqlDefault = $this->db->quote($newDefault);
+
+ $updateTable = 'UPDATE ' . $this->db->quoteName($this->getTable($table));
+ $dbField = $this->db->quoteName($column);
+
+ // Update SQL to set new default on existing rows where the default is currently the old default
+ $sql = $updateTable . " SET $dbField = $sqlDefault WHERE $dbField IS NULL OR $dbField = ''";
+
+ // Execute the update
+ $this->db->setQuery($sql);
+ return $this->db->execute();
+ } catch (\Exception $e) {
+ throw new \Exception("Error: failed to update ($column) column defaults in $table table. " . $e->getMessage());
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Update the data type of the given field.
+ *
+ * @param string $updateString The SQL command to update the column data type
+ * @param string $table The table to update.
+ * @param string $field Column/field that must be updated.
+ *
+ * @return bool true on succes
+ * @since 3.2.1
+ * @throws \Exception If there is an error adding columns.
+ */
+ protected function updateColumnDataType(string $updateString, string $table, string $field): bool
+ {
+ try {
+ $this->db->setQuery($updateString);
+ return $this->db->execute();
+ } catch (\Exception $e) {
+ throw new \Exception("Error: failed to update the datatype of ($field) column in $table table. " . $e->getMessage());
}
}
@@ -288,6 +620,20 @@ abstract class Schema implements SchemaInterface
return implode(', ', $keys);
}
+ /**
+ * Function to set the view keys
+ *
+ * @param string $column The field column database array values
+ *
+ * @return void
+ * @since 3.2.1
+ */
+ protected function setKeys(array $column): void
+ {
+ $this->setUniqueKey($column);
+ $this->setKey($column);
+ }
+
/**
* Function to set the unique key
*
@@ -323,97 +669,34 @@ abstract class Schema implements SchemaInterface
}
/**
- * Add the component name to get the full table name.
+ * Adjusts the default value SQL fragment for a database field based on its type and specific rules.
*
- * @param string $table The table name.
+ * If the field is of type DATETIME and the Joomla version is not 3, it sets the default to CURRENT_TIMESTAMP
+ * if not explicitly specified otherwise. For all other types, or when a 'EMPTY' default is specified, it handles
+ * defaults by either leaving them unset or applying the provided default, properly quoted for SQL safety.
*
- * @return void
- * @since 3.2.1
- */
- protected function getTable(string $table): string
- {
- return $this->prefix . '_' . $table;
- }
-
- /**
- * Check if a table exists in the database.
+ * @param string $type The type of the database field (e.g., 'DATETIME').
+ * @param string|null $defaultValue Optional default value for the field, null if not provided.
+ * @param bool $pure Optional to add the 'DEFAULT' string or not.
*
- * @param string $table The name of the table to check.
- *
- * @return bool True if table exists, False otherwise.
- * @since 3.2.1
- */
- private function tableExists(string $table): bool
- {
- return in_array($this->getTable($table), $this->tables);
- }
-
- /**
- * Fetch existing columns from a database table.
- *
- * @param string $table The name of the table.
- *
- * @return array An array of column names.
- * @since 3.2.1
- */
- private function getExistingColumns(string $table): array
- {
- $columns = $this->db->getTableColumns($this->getTable($table), false);
-
- return array_keys($columns);
- }
-
- /**
- * Generates a SQL snippet for defining a table column, incorporating column type,
- * default value, nullability, and auto-increment properties.
- *
- * @param string $table The table name to be used.
- * @param string $field The field name in the table to generate SQL for.
- *
- * @return string|null The SQL snippet for the column definition.
+ * @return string The SQL fragment to set the default value for a field.
* @since 3.2.1
- * @throws \Exception If the schema details cannot be retrieved or the SQL statement cannot be constructed properly.
*/
- private function getColumnDefinition(string $table, string $field): ?string
+ protected function getDefaultValue(string $type, ?string $defaultValue, bool $pure = false): string
{
- try {
- // Retrieve the database schema details for the specified table and field
- if (($db = $this->table->get($table, $field, 'db')) === null)
- {
- return null;
- }
-
- // Prepare the column name
- $column_name = $this->db->quoteName($field);
- $db['name'] = $field;
-
- // Prepare the default value SQL, null switch, and auto increment statement
- $default = !empty($db['default']) ? " DEFAULT " . $this->db->quote($db['default']) : '';
- $null_switch = !empty($db['null_switch']) ? " " . $db['null_switch'] : '';
- $auto_increment = !empty($db['auto_increment']) ? " AUTO_INCREMENT" : '';
- $type = !empty($db['type']) ? $db['type'] : 'TEXT';
-
- $this->setKeys($db);
-
- // Assemble the SQL snippet for the column definition
- return "{$column_name} {$type}{$default}{$null_switch}{$auto_increment}";
- } catch (\Exception $e) {
- throw new \Exception("Error: failed to generate column definition for $table.$field", 0, $e);
+ if ($defaultValue === null || strtoupper($defaultValue) === 'EMPTY')
+ {
+ return '';
}
- }
- /**
- * Function to set the view keys
- *
- * @param string $column The field column database array values
- *
- * @return void
- * @since 3.2.1
- */
- private function setKeys(array $column): void
- {
- $this->setUniqueKey($column);
- $this->setKey($column);
+ // Set default for DATETIME fields in Joomla versions above 3
+ if (strtoupper($type) === 'DATETIME' && $this->currentVersion != 3)
+ {
+ return $pure ? "CURRENT_TIMESTAMP" : " DEFAULT CURRENT_TIMESTAMP";
+ }
+
+ // Apply and quote the default value
+ return $pure ? $defaultValue : " DEFAULT " . $this->db->quote($defaultValue);
}
}
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
index 3f82ff0b0..501266958 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Adminview/Data.php
@@ -433,6 +433,22 @@ class Data
}
unset($view->addtables);
+ // Make sure the icon is only an icon path
+ if (strpos($view->icon, '#') !== false)
+ {
+ $view->icon = strstr($view->icon, '#', true);
+ }
+ // Make sure the icon_add is only an icon_add path
+ if (strpos($view->icon_add, '#') !== false)
+ {
+ $view->icon_add = strstr($view->icon_add, '#', true);
+ }
+ // Make sure the icon_add is only an icon_add path
+ if (strpos($view->icon_category, '#') !== false)
+ {
+ $view->icon_category = strstr($view->icon_category, '#', true);
+ }
+
// set custom tabs
$this->customtabs->set($view);
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Data.php
index 541af4c40..93ba3016c 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Component/Data.php
@@ -404,6 +404,12 @@ final class Data
)
);
+ // Make sure the image is only an image path
+ if (strpos($component->image, '#') !== false)
+ {
+ $component->image = strstr($component->image, '#', true);
+ }
+
// set the website and autor for global use (default to VDM if not found)
$this->config->set('project_website', $component->website ?? 'https://dev.vdm.io');
$this->config->set('project_author', $component->author ?? 'VDM');
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Customview/Data.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Customview/Data.php
index f3ac65786..de049af55 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Customview/Data.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Compiler/Customview/Data.php
@@ -243,6 +243,12 @@ class Data
'jcb_ce_onBeforeModelCustomViewData', [&$item, &$id, &$table]
);
+ // Make sure the icon is only an icon path
+ if (strpos($item->icon, '#') !== false)
+ {
+ $item->icon = strstr($item->icon, '#', true);
+ }
+
// set GUI mapper
$guiMapper = [
'table' => $table,
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
index 0a74f0418..92805b604 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table.php
@@ -664,7 +664,7 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Details',
'db' => [
- 'type' => 'CHAR(64)',
+ 'type' => 'VARCHAR(255)',
'default' => '',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -3596,7 +3596,7 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Details',
'db' => [
- 'type' => 'CHAR(64)',
+ 'type' => 'VARCHAR(255)',
'default' => '',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -3660,7 +3660,7 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Details',
'db' => [
- 'type' => 'CHAR(64)',
+ 'type' => 'VARCHAR(255)',
'default' => '',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -3676,7 +3676,7 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Details',
'db' => [
- 'type' => 'CHAR(64)',
+ 'type' => 'VARCHAR(255)',
'default' => '',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -3964,8 +3964,8 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Fields',
'db' => [
- 'type' => 'CHAR',
- 'default' => '',
+ 'type' => 'TINYINT(1)',
+ 'default' => '0',
'null_switch' => 'NOT NULL',
'unique_key' => false,
'key' => false,
@@ -5148,7 +5148,7 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Details',
'db' => [
- 'type' => 'CHAR(64)',
+ 'type' => 'VARCHAR(255)',
'default' => '',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -6924,8 +6924,8 @@ class Table extends BaseTable implements Tableinterface
'store' => NULL,
'tab_name' => 'Abacus',
'db' => [
- 'type' => 'CHAR',
- 'default' => '',
+ 'type' => 'TINYINT(1)',
+ 'default' => '0',
'null_switch' => 'NOT NULL',
'unique_key' => false,
'key' => false,
@@ -9598,7 +9598,7 @@ class Table extends BaseTable implements Tableinterface
'store' => 'json',
'tab_name' => 'Updates',
'db' => [
- 'type' => 'TEXT',
+ 'type' => 'MEDIUMTEXT',
'default' => 'EMPTY',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -10526,7 +10526,7 @@ class Table extends BaseTable implements Tableinterface
'store' => 'json',
'tab_name' => 'Updates',
'db' => [
- 'type' => 'TEXT',
+ 'type' => 'MEDIUMTEXT',
'default' => 'EMPTY',
'null_switch' => 'NOT NULL',
'unique_key' => false,
@@ -10734,7 +10734,7 @@ class Table extends BaseTable implements Tableinterface
'store' => 'json',
'tab_name' => 'Updates',
'db' => [
- 'type' => 'TEXT',
+ 'type' => 'MEDIUMTEXT',
'default' => 'EMPTY',
'null_switch' => 'NOT NULL',
'unique_key' => false,
diff --git a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
index dbfe9807f..200e3303a 100644
--- a/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
+++ b/libraries/vendor_jcb/VDM.Joomla/src/Componentbuilder/Table/Schema.php
@@ -12,7 +12,7 @@
namespace VDM\Joomla\Componentbuilder\Table;
-use VDM\Joomla\Componentbuilder\Table as Table;
+use VDM\Joomla\Componentbuilder\Table;
use VDM\Joomla\Interfaces\SchemaInterface;
use VDM\Joomla\Abstraction\Schema as ExtendingSchema;
-