Skip schema checking if schema is not defined

takezoe · Sep 10, 2016 · 3027a73 · 3027a73
1 parent 614282f
commit 3027a73
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/main/scala/com/github/takezoe/scala/jdbc/validation/DeleteValidator.scala b/src/main/scala/com/github/takezoe/scala/jdbc/validation/DeleteValidator.scala
@@ -13,7 +13,9 @@ class DeleteValidator(c: blackbox.Context, delete: Delete, schema: Map[String, T
     val tableName = delete.getTable.getName
 
     schema.get(tableName) match {
-      case None => c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      case None => if(schema.nonEmpty){
+        c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      }
       case Some(tableDef) => {
         val select = new SelectModel()
         val tableModel = new TableModel()

diff --git a/src/main/scala/com/github/takezoe/scala/jdbc/validation/InsertValidator.scala b/src/main/scala/com/github/takezoe/scala/jdbc/validation/InsertValidator.scala
@@ -11,7 +11,9 @@ class InsertValidator(c: blackbox.Context, insert: Insert, schema: Map[String, T
     val tableName = insert.getTable.getName
 
     schema.get(tableName) match {
-      case None => c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      case None => if(schema.nonEmpty){
+        c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      }
       case Some(tableDef) => insert.getColumns.asScala.foreach { column =>
         if(!tableDef.columns.exists(_.name == column.getColumnName)){
           c.error(c.enclosingPosition, "Column " + column.getColumnName + " does not exist in " + tableDef.name + ".")

diff --git a/src/main/scala/com/github/takezoe/scala/jdbc/validation/SelectVisitor.scala b/src/main/scala/com/github/takezoe/scala/jdbc/validation/SelectVisitor.scala
@@ -137,7 +137,9 @@ class SelectModel {
               case Some(t) => if(!t.columns.exists(_.name == column.name)){
                 c.error(c.enclosingPosition, "Column " + column.fullName + " does not exist.")
               }
-              case None => c.error(c.enclosingPosition, "Table " + name + " does not exist.")
+              case None => if(schema.nonEmpty){
+                c.error(c.enclosingPosition, "Table " + name + " does not exist.")
+              }
             }
           }
           case Right(select) => {

diff --git a/src/main/scala/com/github/takezoe/scala/jdbc/validation/UpdateValidator.scala b/src/main/scala/com/github/takezoe/scala/jdbc/validation/UpdateValidator.scala
@@ -14,7 +14,9 @@ class UpdateValidator(c: blackbox.Context, update: Update, schema: Map[String, T
     val tableName = update.getTables.asScala.head.getName
 
     schema.get(tableName) match {
-      case None => c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      case None => if(schema.nonEmpty){
+        c.error(c.enclosingPosition, "Table " + tableName + " does not exist.")
+      }
       case Some(tableDef) => update.getColumns.asScala.foreach { column =>
         if(!tableDef.columns.exists(_.name == column.getColumnName)){
           c.error(c.enclosingPosition, "Column " + column.getColumnName + " does not exist in " + tableDef.name + ".")