fix: version update (#247)

Author: sattvikc

CHANGELOG.md

@@ -7,7 +7,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-## [7.3.0] 
+## [8.0.0]
 
 - Adds tables and queries for Bulk Import
 - Optimize getUserIdMappingWithEitherSuperTokensUserIdOrExternalUserId query

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "7.3.0"
+version = "8.0.0"
 
 repositories {
     mavenCentral()

pluginInterfaceSupported.json

@@ -1,6 +1,6 @@
 {
   "_comment": "contains a list of plugin interfaces branch names that this core supports",
   "versions": [
-    "6.4"
+    "7.0"
   ]
 }

src/main/java/io/supertokens/storage/postgresql/queries/SessionQueries.java

@@ -151,31 +151,36 @@ public static SessionInfo getSessionInfo_Transaction(Start start, Connection con
             return null;
         }
 
-        QUERY = "SELECT external_user_id " +
+        QUERY = "SELECT external_user_id, 0 as o " +
                 "FROM " + getConfig(start).getUserIdMappingTable() + " um2 " +
                 "WHERE um2.app_id = ? AND um2.supertokens_user_id IN (" +
-                    "SELECT primary_or_recipe_user_id " + 
+                    "SELECT primary_or_recipe_user_id " +
                     "FROM " + getConfig(start).getUsersTable() + " " +
                     "WHERE app_id = ? AND user_id IN (" +
-                        "SELECT um1.supertokens_user_id as user_id " +
-                        "FROM " + getConfig(start).getUserIdMappingTable() + " um1 " +
-                        "WHERE um1.app_id = ? AND um1.external_user_id = ? " +
-                        "UNION ALL " +
-                        "SELECT ? " +
-                        "LIMIT 1" +
+                        "SELECT user_id FROM (" +
+                            "SELECT um1.supertokens_user_id as user_id, 0 as o1 " +
+                            "FROM " + getConfig(start).getUserIdMappingTable() + " um1 " +
+                            "WHERE um1.app_id = ? AND um1.external_user_id = ? " +
+                            "UNION " +
+                            "SELECT ?, 1 as o1 " +
+                            "ORDER BY o1 ASC " +
+                        ") uid1" +
                     ")" +
                 ") " +
-                "UNION ALL " +
-                "SELECT primary_or_recipe_user_id " +
+                "UNION " +
+                "SELECT primary_or_recipe_user_id, 1 as o " +
                 "FROM " + getConfig(start).getUsersTable() + " " +
                 "WHERE app_id = ? AND user_id IN (" +
-                    "SELECT um1.supertokens_user_id as user_id " +
-                    "FROM " + getConfig(start).getUserIdMappingTable() + " um1 " +
-                    "WHERE um1.app_id = ? AND um1.external_user_id = ? " +
-                    "UNION ALL " +
-                    "SELECT ? " +
-                    "LIMIT 1" +
+                    "SELECT user_ID FROM (" +
+                        "SELECT um1.supertokens_user_id as user_id, 0 as o2 " +
+                        "FROM " + getConfig(start).getUserIdMappingTable() + " um1 " +
+                        "WHERE um1.app_id = ? AND um1.external_user_id = ? " +
+                        "UNION " +
+                        "SELECT ?, 1 as o2 " +
+                        "ORDER BY o2 ASC " +
+                    ") uid2 " +
                 ") " +
+                "ORDER BY o ASC " +
                 "LIMIT 1";
 
         String finalUserId = execute(con, QUERY, pst -> {