From b1e0469d2b085ecc6ff1628a2c707a89b78bb12c Mon Sep 17 00:00:00 2001
From: avogar <avogar@clickhouse.com>
Date: Fri, 23 Aug 2024 10:58:43 +0000
Subject: [PATCH] Check setting  in runtime

---
 src/DataTypes/DataTypeObject.cpp                | 17 +++++++++++++++--
 src/DataTypes/DataTypeObjectDeprecated.cpp      |  4 ----
 .../03230_json_alias_new_old_types.reference    |  2 ++
 .../03230_json_alias_new_old_types.sql          |  8 ++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 tests/queries/0_stateless/03230_json_alias_new_old_types.reference
 create mode 100644 tests/queries/0_stateless/03230_json_alias_new_old_types.sql

diff --git a/src/DataTypes/DataTypeObject.cpp b/src/DataTypes/DataTypeObject.cpp
index a56764f4e6e..62239372b28 100644
--- a/src/DataTypes/DataTypeObject.cpp
+++ b/src/DataTypes/DataTypeObject.cpp
@@ -1,10 +1,12 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeObject.h>
+#include <DataTypes/DataTypeObjectDeprecated.h>
 #include <DataTypes/Serializations/SerializationJSON.h>
 #include <DataTypes/Serializations/SerializationObjectTypedPath.h>
 #include <DataTypes/Serializations/SerializationObjectDynamicPath.h>
 #include <DataTypes/Serializations/SerializationSubObject.h>
 #include <Columns/ColumnObject.h>
+#include <Common/CurrentThread.h>
 
 #include <Parsers/IAST.h>
 #include <Parsers/ASTLiteral.h>
@@ -513,13 +515,24 @@ static DataTypePtr createObject(const ASTPtr & arguments, const DataTypeObject::
 
 static DataTypePtr createJSON(const ASTPtr & arguments)
 {
+    auto context = CurrentThread::getQueryContext();
+    if (!context)
+        context = Context::getGlobalContextInstance();
+
+    if (context->getSettingsRef().use_json_alias_for_old_object_type)
+    {
+        if (arguments && !arguments->children.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Experimental Object type doesn't support any arguments. If ypu want to use new JSON type, set setting allow_experimental_json_type = 1");
+
+        return std::make_shared<DataTypeObjectDeprecated>("JSON", false);
+    }
+
     return createObject(arguments, DataTypeObject::SchemaFormat::JSON);
 }
 
 void registerDataTypeJSON(DataTypeFactory & factory)
 {
-    if (!Context::getGlobalContextInstance()->getSettingsRef().use_json_alias_for_old_object_type)
-        factory.registerDataType("JSON", createJSON, DataTypeFactory::Case::Insensitive);
+    factory.registerDataType("JSON", createJSON, DataTypeFactory::Case::Insensitive);
 }
 
 }
diff --git a/src/DataTypes/DataTypeObjectDeprecated.cpp b/src/DataTypes/DataTypeObjectDeprecated.cpp
index 07f9c116e58..2ef3098811d 100644
--- a/src/DataTypes/DataTypeObjectDeprecated.cpp
+++ b/src/DataTypes/DataTypeObjectDeprecated.cpp
@@ -78,10 +78,6 @@ static DataTypePtr create(const ASTPtr & arguments)
 void registerDataTypeObjectDeprecated(DataTypeFactory & factory)
 {
     factory.registerDataType("Object", create);
-    if (Context::getGlobalContextInstance()->getSettingsRef().use_json_alias_for_old_object_type)
-        factory.registerSimpleDataType("JSON",
-            [] { return std::make_shared<DataTypeObjectDeprecated>("JSON", false); },
-            DataTypeFactory::Case::Insensitive);
 }
 
 }
diff --git a/tests/queries/0_stateless/03230_json_alias_new_old_types.reference b/tests/queries/0_stateless/03230_json_alias_new_old_types.reference
new file mode 100644
index 00000000000..91fd15697be
--- /dev/null
+++ b/tests/queries/0_stateless/03230_json_alias_new_old_types.reference
@@ -0,0 +1,2 @@
+{"a":42}	JSON
+{"a":42}	Object(\'json\')
diff --git a/tests/queries/0_stateless/03230_json_alias_new_old_types.sql b/tests/queries/0_stateless/03230_json_alias_new_old_types.sql
new file mode 100644
index 00000000000..97d64f2a606
--- /dev/null
+++ b/tests/queries/0_stateless/03230_json_alias_new_old_types.sql
@@ -0,0 +1,8 @@
+set allow_experimental_object_type=1;
+set allow_experimental_json_type=1;
+set use_json_alias_for_old_object_type=0;
+select '{"a" : 42}'::JSON as json, toTypeName(json);
+set use_json_alias_for_old_object_type=1;
+select '{"a" : 42}'::JSON as json, toTypeName(json);
+select '{"a" : 42}'::JSON(max_dynamic_paths=100) as json, toTypeName(json); -- {serverError BAD_ARGUMENTS}
+