From 08969cdcaf8196a30a3c879f956a8386fe400695 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrew@databricks.com>
Date: Wed, 16 Mar 2016 13:21:50 -0700
Subject: [PATCH] Fix tests

---
 .../spark/sql/catalyst/identifiers.scala      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/identifiers.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/identifiers.scala
index 54599028888b6..87f4d1b007fe1 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/identifiers.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/identifiers.scala
@@ -24,7 +24,8 @@ package org.apache.spark.sql.catalyst
  * Format (unquoted): "name" or "db.name"
  * Format (quoted): "`name`" or "`db`.`name`"
  */
-private[sql] abstract class IdentifierWithDatabase(name: String) {
+sealed trait IdentifierWithDatabase {
+  val name: String
   def database: Option[String]
   def quotedString: String = database.map(db => s"`$db`.`$name`").getOrElse(s"`$name`")
   def unquotedString: String = database.map(db => s"$db.$name").getOrElse(name)
@@ -36,15 +37,16 @@ private[sql] abstract class IdentifierWithDatabase(name: String) {
  * Identifies a table in a database.
  * If `database` is not defined, the current database is used.
  */
-private[sql] case class TableIdentifier(
-    table: String,
-    database: Option[String])
-  extends IdentifierWithDatabase(table) {
+case class TableIdentifier(table: String, database: Option[String])
+  extends IdentifierWithDatabase {
+
+  override val name: String = table
 
   def this(name: String) = this(name, None)
+
 }
 
-private[sql] object TableIdentifier {
+object TableIdentifier {
   def apply(tableName: String): TableIdentifier = new TableIdentifier(tableName)
 }
 
@@ -53,14 +55,14 @@ private[sql] object TableIdentifier {
  * Identifies a function in a database.
  * If `database` is not defined, the current database is used.
  */
-private[sql] case class FunctionIdentifier(
-    funcName: String,
-    database: Option[String])
-  extends IdentifierWithDatabase(funcName) {
+case class FunctionIdentifier(funcName: String, database: Option[String])
+  extends IdentifierWithDatabase {
+
+  override val name: String = funcName
 
   def this(name: String) = this(name, None)
 }
 
-private[sql] object FunctionIdentifier {
+object FunctionIdentifier {
   def apply(funcName: String): FunctionIdentifier = new FunctionIdentifier(funcName)
 }