Fix #11: dsl parser detects functions upper, lower, to_tsvector…

… only if they ends with brace `(`
caiiiycuk · Jan 23, 2023 · f3348b0 · f3348b0
1 parent d15e57c
commit f3348b0
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 3 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -7,7 +7,7 @@ object Build extends Build {
   lazy val project = Project("root", file("."), settings = Seq(
     name := "postgresql-to-sqlite",
     organization := "com.github.caiiiycuk",
-    version := "0.0.1-SNAPSHOT",
+    version := "1.0.1",
     scalaVersion := "2.11.12",
 
     libraryDependencies ++= Seq(

diff --git a/src/main/scala/com/github/caiiiycuk/pg2sqlite/dsl/DSL.scala b/src/main/scala/com/github/caiiiycuk/pg2sqlite/dsl/DSL.scala
@@ -32,10 +32,10 @@ class DSL(line: String) {
       partials match {
         case head :: _ if head.startsWith("constraint") =>
           None
-        case head :: _ if head.startsWith("to_tsvector") =>
+        case head :: _ if head.startsWith("to_tsvector(") =>
           val name = columnDefenition.takeBraces.head.tokens.last
           Some(Column(name, None))
-        case head :: _ if head.startsWith("lower") || head.startsWith("upper") =>
+        case head :: _ if head.startsWith("lower(") || head.startsWith("upper(") =>
           val name = columnDefenition.takeBraces.head.tokens.head
           Some(Column(name, None))
         case head :: sqlType :: _ =>

diff --git a/src/test/scala/com/github/caiiiycuk/pg2sqlite/dsl/DumperTest.scala b/src/test/scala/com/github/caiiiycuk/pg2sqlite/dsl/DumperTest.scala
@@ -0,0 +1,57 @@
+package com.github.caiiiycuk.pg2sqlite.dsl
+
+import com.github.caiiiycuk.pg2sqlite.iterator.Line
+import com.github.caiiiycuk.pg2sqlite.{Connection, DumpInserter}
+import org.scalatest.{BeforeAndAfter, FlatSpec, Matchers}
+
+import java.io.File
+
+class DumperTest extends FlatSpec with Matchers with BeforeAndAfter {
+
+  val dbFile = new File("test.db")
+
+  private def makeConnection() = {
+    if (dbFile.exists()) {
+      dbFile.delete()
+    }
+
+    Connection.sqlite(dbFile)
+  }
+
+  after {
+    new File("test.db").delete()
+  }
+
+  "dumper" should "generate db from test-case of issue#11" in {
+    val connection = makeConnection()
+    val inserter = new DumpInserter(connection)
+    val dump =
+      """
+        |CREATE TYPE product_type AS ENUM (
+        |    'Material',
+        |    'Digital'
+        |);
+        |
+        |CREATE TABLE product (
+        |    client_id integer NOT NULL,
+        |    order_product integer,
+        |    upper_price integer NOT NULL,
+        |    lower_price integer NOT NULL,
+        |    type product_type NOT NULL,
+        |    product_id integer NOT NULL--,
+        |    CONSTRAINT product_check CHECK (((lower_price > upper_price) AND (upper_price <= 200))),
+        |    CONSTRAINT product_order_product_check CHECK ((order_product > 0)),
+        |    CONSTRAINT product_upper_price_check CHECK ((upper_price >= 0))
+        |);
+        |""".stripMargin
+        .split("\n")
+        .zipWithIndex
+        .map {
+          case (text, num) =>
+            Line(num, text)
+        }
+
+    inserter.insert(dump.iterator)
+    connection.close
+  }
+}