Update schema introspection to work with latest multirange updates

edgedb · Aug 22, 2023 · 61f295e · 61f295e
1 parent 4322287
commit 61f295e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/shared/common/schemaData/index.ts b/shared/common/schemaData/index.ts
@@ -395,8 +395,8 @@ export function buildTypesGraph(data: RawIntrospectionResult): {
           name: type.name,
         } as any);
         break;
-      case "schema::Multirange":
-      case "schema::MultirangeExprAlias":
+      case "schema::MultiRange":
+      case "schema::MultiRangeExprAlias":
         types.set(type.id, {
           schemaType: "Multirange",
           id: type.id,
@@ -745,8 +745,8 @@ export function buildTypesGraph(data: RawIntrospectionResult): {
       }
       case "schema::Range":
       case "schema::RangeExprAlias":
-      case "schema::Multirange":
-      case "schema::MultirangeExprAlias": {
+      case "schema::MultiRange":
+      case "schema::MultiRangeExprAlias": {
         const elementType = types.get(type.range_element_type_id!);
         if (!elementType) {
           throw new Error(

diff --git a/shared/common/schemaData/queries.ts b/shared/common/schemaData/queries.ts
@@ -83,8 +83,9 @@ select Type {
   ).id,
   constraintIds := [is ConsistencySubject].constraints.id,
   element_type_id := [is Array].element_type.id,
-  range_element_type_id := [is Range].element_type.id
-                             ?? [is Multirange].element_type.id,
+  range_element_type_id := [is Range].element_type.id${
+    versionGTE(version, [4, 0]) ? ` ?? [is MultiRange].element_type.id` : ""
+  },
   [is Tuple].element_types: {
     name,
     type_id := .type.id,

diff --git a/shared/studio/state/database.ts b/shared/studio/state/database.ts
@@ -54,7 +54,7 @@ import {SessionState, sessionStateCtx} from "./sessionState";
 
 export const dbCtx = createMobxContext<DatabaseState>();
 
-const SCHEMA_DATA_VERSION = 6;
+const SCHEMA_DATA_VERSION = 7;
 
 export interface StoredSchemaData {
   version: number;
@@ -239,8 +239,8 @@ export class DatabaseState extends Model({
             conn
               .query(
                 getIntrospectionQuery([
-                  schemaInfo.version.major,
-                  schemaInfo.version.minor,
+                  Number(schemaInfo.version.major),
+                  Number(schemaInfo.version.minor),
                 ])
               )
               .then(({result}) => {