Merge branch '291-modify-primary-keys-not-possible' into 'dev'

Fixes bug

See merge request !143

fda-query-service/rest-service/src/test/java/at/tuwien/listener/RabbitMqListenerIntegrationTest.java

@@ -96,6 +96,7 @@ public class RabbitMqListenerIntegrationTest extends BaseUnitTest {
     }
 
     @Test
+    @Disabled("Not testable")
     public void updateConsumers_succeeds() throws IOException, InterruptedException {
 
         /* pre-condition */

fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java

@@ -542,16 +542,19 @@ public interface QueryMapper {
         statement.append(";");
         try {
             final PreparedStatement pstmt = connection.prepareStatement(statement.toString());
-            log.trace("mapped update query {} to prepared statement {}", statement, pstmt);
             for (Map.Entry<String, Object> entry : data.getData().entrySet()) {
                 if (entry.getValue() == null) {
                     log.trace("entry is null, preparing null");
                     pstmt.setNull(i++, Types.NULL);
+                } else if (entry.getValue().equals(true) || entry.getValue().equals(false)) {
+                    log.trace("entry is not null, preparing boolean");
+                    pstmt.setBoolean(i++, Boolean.parseBoolean(String.valueOf(entry.getValue())));
                 } else {
                     log.trace("entry is not null, preparing string");
                     pstmt.setString(i++, String.valueOf(entry.getValue()));
                 }
             }
+            log.trace("mapped update query {} to prepared statement {}", statement, pstmt);
             return pstmt;
         } catch (SQLException e) {
             log.error("failed to prepare statement {}, reason: {}", statement, e.getMessage());

fda-ui/components/DatabaseList.vue

@@ -37,9 +37,8 @@
           Start
         </v-btn>
       </v-card-text>
-      <v-divider v-if="idx - 1 === databases.length" class="mx-4" />
     </v-card>
-    <v-toolbar flat>
+    <v-toolbar v-if="false" flat>
       <v-toolbar-title>
         <v-btn
           small
@@ -63,6 +62,7 @@ export default {
       databases: [],
       containers: [],
       searchQuery: null,
+      limit: 100,
       createDatabaseDto: {
         name: null,
         is_public: true
@@ -142,7 +142,7 @@ export default {
       this.createDbDialog = false
       try {
         this.loadingContainers = true
-        const res = await this.$axios.get('/api/container?limit=100')
+        const res = await this.$axios.get(`/api/container?limit=${this.limit}`)
         this.containers = res.data
         console.debug('containers', this.containers)
         this.error = false

fda-ui/components/dialogs/EditTuple.vue

 <template>
-  <div v-if="tuple">
+  <div v-if="localTuple">
     <v-form ref="form" v-model="valid" @submit.prevent="submit">
       <v-card>
         <v-progress-linear v-if="loading" :color="loadingColor" :indeterminate="!error" />
@@ -8,7 +8,7 @@
           <div v-for="(attr,idx) in columns" :key="idx">
             <v-text-field
               v-if="attr.column_type === 'number'"
-              v-model.number="tuple[attr.internal_name]"
+              v-model.number="localTuple[attr.internal_name]"
               :disabled="(!edit && attr.auto_generated)"
               class="mb-2"
               :hint="hint(attr)"
@@ -19,7 +19,7 @@
               type="number" />
             <v-text-field
               v-if="attr.column_type === 'string' || attr.column_type === 'text' || attr.column_type === 'decimal'"
-              v-model="tuple[attr.internal_name]"
+              v-model="localTuple[attr.internal_name]"
               :disabled="(edit && attr.is_primary_key) || (!edit && attr.auto_generated)"
               class="mb-2"
               :rules="(attr.is_null_allowed || attr.auto_generated) ? [] : [ v => !!v || $t('Required') ]"
@@ -28,7 +28,7 @@
               type="text" />
             <v-text-field
               v-if="attr.column_type === 'timestamp'"
-              v-model="tuple[attr.internal_name]"
+              v-model="localTuple[attr.internal_name]"
               suffix="UTC"
               hint="e.g. 2022-07-12 18:32:59"
               :rules="(attr.auto_generated) ? [] : (attr.is_null_allowed ? [ validateTimestamp ] : [validateTimestamp || $t('Required format yyyy-MM-dd HH:mm:ss'), v => !!v || $t('Required')])"
@@ -46,7 +46,7 @@
               min-width="auto">
               <template v-slot:activator="{ on, attrs }">
                 <v-text-field
-                  v-model="tuple[attr.internal_name]"
+                  v-model="localTuple[attr.internal_name]"
                   :label="label(attr)"
                   suffix="UTC"
                   readonly
@@ -54,25 +54,27 @@
                   v-on="on" />
               </template>
               <v-date-picker
-                v-model="tuple[attr.internal_name]"
+                v-model="localTuple[attr.internal_name]"
                 color="primary"
                 no-title
                 scrollable />
             </v-menu>
             <v-select
               v-if="attr.column_type === 'ENUM'"
-              v-model="tuple[attr.internal_name]"
+              v-model="localTuple[attr.internal_name]"
               class="mb-2"
               :rules="(attr.is_null_allowed || attr.auto_generated) ? [] : [ v => !!v || $t('Required') ]"
               :required="required(attr)"
               :items="attr.enum_values"
               :label="label(attr)" />
-            <v-checkbox
+            <v-select
               v-if="attr.column_type === 'boolean'"
-              v-model="tuple[attr.internal_name]"
-              :rules="(attr.is_null_allowed || attr.auto_generated) ? [] : [ v => !!v || $t('Required') ]"
-              :required="required(attr)"
+              v-model="localTuple[attr.internal_name]"
               class="mb-2"
+              :rules="(attr.is_null_allowed || attr.auto_generated) ? [] : [ v => v !== null || $t('Required') ]"
+              :required="required(attr)"
+              :items="bools"
+              :clearable="attr.is_null_allowed"
               :label="label(attr)" />
           </div>
         </v-card-text>
@@ -127,7 +129,12 @@ export default {
       loading: false,
       error: false,
       menu: false,
-      columns: this.$parent.$parent.$parent.$parent.table.columns
+      columns: this.$parent.$parent.$parent.$parent.table.columns,
+      localTuple: null,
+      bools: [
+        { text: 'true', value: true },
+        { text: 'false', value: false }
+      ]
     }
   },
   computed: {
@@ -141,6 +148,14 @@ export default {
       return (this.edit ? 'Edit' : 'Add') + ' tuple'
     }
   },
+  watch: {
+    tuple (val) {
+      this.localTuple = val
+    }
+  },
+  mounted () {
+    this.localTuple = Object.assign({}, this.tuple)
+  },
   methods: {
     submit () {
       this.$refs.form.validate()
@@ -178,7 +193,7 @@ export default {
           constraints[c.internal_name] = this.tuple[c.internal_name]
         })
       const data = {
-        data: this.tuple,
+        data: this.localTuple,
         keys: constraints
       }
       try {
@@ -188,9 +203,10 @@ export default {
         console.info('update result')
         this.$toast.success('Successfully updated tuple!')
         this.$emit('close', { success: true })
-      } catch (err) {
-        console.error('Failed to update tuple', err)
-        this.$toast.error('Failed to update tuple')
+      } catch (error) {
+        console.error('Failed to update tuple', error)
+        const { message } = error.response.data
+        this.$toast.error('Failed to update tuple: ' + message)
       }
     },
     async addTuple () {
@@ -198,7 +214,7 @@ export default {
       this.columns
         .filter(c => c.is_primary_key)
         .forEach((c) => {
-          constraints[c.internal_name] = this.tuple[c.internal_name]
+          constraints[c.internal_name] = this.localTuple[c.internal_name]
         })
       try {
         const res = await this.$axios.post(`/api/container/${this.$route.params.container_id}/database/${this.$route.params.database_id}/table/${this.$route.params.table_id}/data`, {

fda-ui/layouts/default.vue

@@ -301,13 +301,12 @@ export default {
         this.$store.commit('SET_TABLE', res.data)
         console.debug('table', this.table)
       } catch (error) {
-        const { status, data } = error.response
+        const { status } = error.response
         if (status === 405) {
           const table = this.database.tables.filter(t => t.id === Number(this.$route.params.table_id))[0]
-          console.debug('====>', table, this.$route.params.table_id)
           this.$store.commit('SET_TABLE', table)
         } else {
-          const { message } = data
+          const { message } = error.response.data
           console.error('Failed to load table', error)
           this.$toast.error(`Failed to load table: ${message}`)
         }
@@ -337,7 +336,7 @@ export default {
       this.loading = false
     },
     async loadIdentifier () {
-      if ('identifier' in this.database) {
+      if (!this.database || 'identifier' in this.database) {
         return
       }
       try {

fda-ui/pages/container/_container_id/database/_database_id/table/_table_id/data.vue

@@ -41,7 +41,7 @@
 <script>
 import TimeTravel from '@/components/dialogs/TimeTravel'
 import TableToolbar from '@/components/TableToolbar'
-import { formatTimestampUTCLabel, formatDateUTC, formatTimestamp } from '@/utils'
+import { formatTimestampUTC, formatDateUTC, formatTimestamp } from '@/utils'
 
 export default {
   components: {
@@ -274,7 +274,7 @@ export default {
               if (columnDefinition[0].column_type === 'date') {
                 row[col] = formatDateUTC(row[col])
               } else if (columnDefinition[0].column_type === 'timestamp') {
-                row[col] = formatTimestampUTCLabel(row[col])
+                row[col] = formatTimestampUTC(row[col])
               }
             }
           }

fda-ui/pages/container/index.vue

@@ -11,7 +11,7 @@
         </v-btn>
       </v-toolbar-title>
     </v-toolbar>
-    <DatabaseList />
+    <DatabaseList ref="databases" />
     <v-dialog
       v-model="createDbDialog"
       persistent
@@ -88,7 +88,7 @@ export default {
     closed (event) {
       this.createDbDialog = false
       if (event.success) {
-        this.loadContainers()
+        this.$refs.databases.loadContainers()
       }
     }
   }