revert some changes

Author: cloud-fan

sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala

@@ -1251,13 +1251,15 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
         CatalogColumn(ic.identifier.getText, null, nullable = true, Option(ic.STRING).map(string))
       }
 
+      val sql = Option(source(ctx.query))
       val tableDesc = CatalogTable(
         identifier = visitTableIdentifier(ctx.tableIdentifier),
         tableType = CatalogTableType.VIEW,
         schema = schema,
         storage = CatalogStorageFormat.empty,
         properties = Option(ctx.tablePropertyList).map(visitPropertyKeyValues).getOrElse(Map.empty),
-        viewOriginalText = Option(source(ctx.query)),
+        viewOriginalText = sql,
+        viewText = sql,
         comment = Option(ctx.STRING).map(string))
 
       CreateViewCommand(

sql/core/src/main/scala/org/apache/spark/sql/execution/command/views.scala

@@ -28,9 +28,8 @@ import org.apache.spark.sql.catalyst.plans.logical.{LogicalPlan, Project}
 
 
 /**
- * Create or replace a view with given query plan. This command will convert the query plan to
- * canonicalized SQL string, and store it as view text in metastore, if we need to create a
- * permanent view.
+ * Create Hive view on non-hive-compatible tables by specifying schema ourselves instead of
+ * depending on Hive meta-store.
  *
  * @param tableDesc the catalog table
  * @param child the logical plan that represents the view; this is used to generate a canonicalized
@@ -60,8 +59,8 @@ case class CreateViewCommand(
   require(tableDesc.tableType == CatalogTableType.VIEW,
     "The type of the table to created with CREATE VIEW must be 'CatalogTableType.VIEW'.")
   if (!isTemporary) {
-    require(tableDesc.viewOriginalText.isDefined,
-      "The table to created with CREATE VIEW must have 'viewOriginalText'.")
+    require(tableDesc.viewText.isDefined,
+      "The table to created with CREATE VIEW must have 'viewText'.")
   }
 
   if (allowExisting && replace) {
@@ -179,8 +178,9 @@ case class CreateViewCommand(
           }
         }
 
+        val viewText = tableDesc.viewText.get
         val viewName = quote(tableDesc.identifier.table)
-        s"SELECT $viewOutput FROM (${tableDesc.viewOriginalText.get}) $viewName"
+        s"SELECT $viewOutput FROM ($viewText) $viewName"
       }
 
     // Validate the view SQL - make sure we can parse it and analyze it.