feat: Add the requested the changes from the PR review

- **SQLDatasourceEditor**: Removed `useWatch` from react-hook-form; `driver` is now derived directly from `config.driver` (already present in `value.proxy.spec`).
- **SQLTimeSeriesQueryEditor**: Replaced the manual `string → DatasourceSelector` conversion with the `isVariableDatasource` guard pattern used across other query editors, so variable datasources (e.g. `$ds`) are passed through as-is.
- **package.json**: Added `"license": "Apache-2.0"` field.
- **jest.config.ts**: Replaced `module.exports` + manual settings with the shared `jest.shared` config (matching `clickhouse/jest.config.ts`).
- **test-setup.sh** (all three DB checks): Replaced `|| echo` with `|| { ...; exit 1; }` so a failed query exits the script rather than silently continuing to print "Test data verified".
- **Makefile**: Fixed the Adminer port from `8080` to `8081` to match `docker-compose.test.yaml`.

Signed-off-by: Pascal Zimmermann <pascal.zimmermann@theiotstudio.com>

Author: ZPascal

sql/Makefile

@@ -18,7 +18,7 @@ db-up: ## Start all test databases
 	@echo "PostgreSQL: localhost:5432"
 	@echo "MySQL:      localhost:3306"
 	@echo "MariaDB:    localhost:3307"
-	@echo "Adminer UI: http://localhost:8080"
+	@echo "Adminer UI: http://localhost:8081"
 
 db-down: ## Stop all test databases
 	docker-compose -f docker-compose.test.yaml down

sql/jest.config.ts

@@ -11,23 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const path = require('path');
-const fs = require('fs');
+import type { Config } from '@jest/types';
+import shared from '../jest.shared';
 
-const swcrcPath = path.join(__dirname, '..', '.cjs.swcrc');
-const swcrc = JSON.parse(fs.readFileSync(swcrcPath, 'utf-8'));
+const jestConfig: Config.InitialOptions = {
+  ...shared,
 
-module.exports = {
-  testEnvironment: 'jsdom',
-  roots: ['<rootDir>/src'],
-  moduleNameMapper: {
-    '^echarts/(.*)$': 'echarts',
-    '^use-resize-observer$': 'use-resize-observer/polyfilled',
-    '\\.(css|less)$': '<rootDir>/../stylesMock.js',
-  },
-  transformIgnorePatterns: ['node_modules/(?!(lodash-es|yaml|@perses-dev))'],
-  transform: {
-    '^.+\\.(ts|tsx|js|jsx)$': ['@swc/jest', { ...swcrc, exclude: [], swcrc: false }],
-  },
-  setupFilesAfterEnv: ['<rootDir>/src/setup-tests.ts'],
+  setupFilesAfterEnv: [...(shared.setupFilesAfterEnv ?? []), '<rootDir>/src/setup-tests.ts'],
 };
+
+export default jestConfig;

sql/package.json

@@ -2,6 +2,7 @@
   "name": "@perses-dev/sql-plugin",
   "version": "0.1.0-rc.0",
   "description": "Generic SQL datasource plugin for Perses (supports PostgreSQL, MySQL, MariaDB)",
+  "license": "Apache-2.0",
   "homepage": "https://github.com/perses/plugins/blob/main/README.md",
   "repository": {
     "type": "git",

sql/src/datasources/sql-datasource/SQLDatasourceEditor.tsx

@@ -12,7 +12,6 @@
 // limitations under the License.
 
 import { Stack, TextField, MenuItem, Select, FormControl, InputLabel, FormHelperText } from '@mui/material';
-import { useWatch } from 'react-hook-form';
 import { OptionsEditorProps } from '@perses-dev/plugin-system';
 import { SQLDatasourceSpec, SQLProxySpec, SQLDriver, SSLMode } from './sql-datasource-types';
 
@@ -32,11 +31,9 @@ const SSL_MODES: Array<{ value: SSLMode; label: string }> = [
 export function SQLDatasourceEditor(props: OptionsEditorProps<SQLDatasourceSpec>) {
   const { value, onChange } = props;
 
-  // Access the actual config through proxy.spec
   const config = value?.proxy?.spec || ({} as SQLProxySpec);
 
-  // Use useWatch to watch the driver field
-  const driver = useWatch({ name: 'proxy.spec.driver', defaultValue: config.driver || 'postgres' });
+  const driver = config.driver || 'postgres';
 
   const handleChange = (field: keyof SQLProxySpec, fieldValue: unknown) => {
     onChange({

sql/src/queries/sql-time-series-query/SQLTimeSeriesQueryEditor.tsx

@@ -12,26 +12,34 @@
 // limitations under the License.
 
 import { Stack, TextField } from '@mui/material';
-import { OptionsEditorProps, DatasourceSelect } from '@perses-dev/plugin-system';
-import { DatasourceSelector } from '@perses-dev/spec';
+import {
+  DatasourceSelect,
+  DatasourceSelectProps,
+  isVariableDatasource,
+  OptionsEditorProps,
+} from '@perses-dev/plugin-system';
 import { SQLTimeSeriesQuerySpec } from './sql-time-series-query-types';
 
-export function SQLTimeSeriesQueryEditor({ value, onChange }: OptionsEditorProps<SQLTimeSeriesQuerySpec>) {
-  const handleDatasourceChange = (newDatasource: DatasourceSelector | string | undefined) => {
-    // Convert string to DatasourceSelector if needed
-    const datasourceValue: DatasourceSelector | undefined =
-      typeof newDatasource === 'string'
-        ? { kind: 'SQLDatasource', name: newDatasource }
-        : (newDatasource as DatasourceSelector | undefined);
+const DATASOURCE_KIND = 'SQLDatasource';
 
-    onChange({ ...value, datasource: datasourceValue });
+export function SQLTimeSeriesQueryEditor({ value, onChange }: OptionsEditorProps<SQLTimeSeriesQuerySpec>) {
+  const handleDatasourceChange: DatasourceSelectProps['onChange'] = (newDatasource) => {
+    if (isVariableDatasource(newDatasource)) {
+      onChange({ ...value, datasource: newDatasource });
+      return;
+    }
+    if (newDatasource.kind === DATASOURCE_KIND) {
+      onChange({ ...value, datasource: newDatasource });
+      return;
+    }
+    throw new Error('Got unexpected non SQLDatasource selection');
   };
 
   return (
     <Stack spacing={2}>
       <DatasourceSelect
-        datasourcePluginKind="SQLDatasource"
-        value={value?.datasource || { kind: 'SQLDatasource' }}
+        datasourcePluginKind={DATASOURCE_KIND}
+        value={value?.datasource ?? { kind: DATASOURCE_KIND }}
         onChange={handleDatasourceChange}
       />
 

sql/test-setup.sh

@@ -74,7 +74,7 @@ verify_data() {
             UNION ALL SELECT 'sensor_readings', COUNT(*) FROM sensor_readings \
             UNION ALL SELECT 'http_requests', COUNT(*) FROM http_requests \
             UNION ALL SELECT 'transactions', COUNT(*) FROM transactions \
-        ) t;" 2>/dev/null || echo -e "${RED}  Failed to query PostgreSQL${NC}"
+        ) t;" || { echo -e "${RED}  Failed to query PostgreSQL${NC}"; exit 1; }
 
     # MySQL
     echo -e "${YELLOW}MySQL:${NC}"
@@ -84,7 +84,7 @@ verify_data() {
             UNION ALL SELECT 'sensor_readings', COUNT(*) FROM sensor_readings \
             UNION ALL SELECT 'http_requests', COUNT(*) FROM http_requests \
             UNION ALL SELECT 'transactions', COUNT(*) FROM transactions \
-        ) t;" 2>/dev/null || echo -e "${RED}  Failed to query MySQL${NC}"
+        ) t;" || { echo -e "${RED}  Failed to query MySQL${NC}"; exit 1; }
 
     # MariaDB
     echo -e "${YELLOW}MariaDB:${NC}"
@@ -94,7 +94,7 @@ verify_data() {
             UNION ALL SELECT 'sensor_readings', COUNT(*) FROM sensor_readings \
             UNION ALL SELECT 'http_requests', COUNT(*) FROM http_requests \
             UNION ALL SELECT 'transactions', COUNT(*) FROM transactions \
-        ) t;" 2>/dev/null || echo -e "${RED}  Failed to query MariaDB${NC}"
+        ) t;" || { echo -e "${RED}  Failed to query MariaDB${NC}"; exit 1; }
 
     echo -e "${GREEN}✓${NC} Test data verified"
 }