embulk-input-datastore 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6387915cdeaf057d4c05886846d1b115e61ac244
-  data.tar.gz: a81ab9e7322ccc8896142442ea08a349db13030f
+  metadata.gz: 53505b8a02cac9d813abb07a6781f48efcada3b0
+  data.tar.gz: 971f8c945301c7d4be69a67a400f6eefead29179
 SHA512:
-  metadata.gz: eb51ca9695d27bf905e4843818793c2aa1e29f04163e0de5a0acd5fd82c1681c04199928e254cb852ebe310ed022f64cde844be977db71ebc5152fd832e1e840
-  data.tar.gz: 326f15894055be12836f6e065572788beb57649aa09ef6773a51cffd6f1d4ffde71d8ff6aafb1349df473fb80a2c1f28281228db0ecaf14851baff46fe3d76b8
+  metadata.gz: 081ca0244210c7fd2f3d36750fb0fa0ef7eef24d35ae0ef32ce588fecbdacb9c53a0eacf732ad325e8982876f55305f92b18b6947690360709477b5b1ba7e55a
+  data.tar.gz: 207f15f6cb3b6027a84e303d22d5415299af847f126a348837a7c82213cd77fb9367c44805acf98d7c940fbce636fa525ad7e9394f411af417bb6633b9d828bc

data/examples/datastore2stdout.yaml

@@ -6,3 +6,9 @@ in:
 
 out:
   type: stdout
+  #type: file
+  #path_prefix: out
+  #file_ext: json
+  #formatter:
+  #  type: single_value
+  #  column_name: "record"

data/gradle.properties

@@ -1 +1 @@
-version=0.1.1
+version=0.1.2

data/src/main/java/org/embulk/input/datastore/DatastoreInputPlugin.kt

@@ -8,6 +8,7 @@ import org.embulk.config.ConfigDiff
 import org.embulk.config.ConfigSource
 import org.embulk.config.TaskSource
 import org.embulk.spi.*
+import org.embulk.spi.json.JsonParser
 import org.embulk.spi.type.Types
 import org.msgpack.value.ValueFactory
 import java.io.FileInputStream
@@ -17,8 +18,13 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
     // number of run() method calls
     private val TASK_COUNT = 1
 
-    private val logger = if (doLogging) { Exec.getLogger(javaClass) } else { null }
+    private val logger = if (doLogging) {
+        Exec.getLogger(javaClass)
+    } else {
+        null
+    }
     private val b64encoder = Base64.getEncoder()
+    private val jsonParser = JsonParser()
 
     override fun transaction(config: ConfigSource,
                              control: InputPlugin.Control): ConfigDiff {
@@ -65,7 +71,7 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
                     logger?.debug(entity.toString())
 
 
-                    val json = when(entity) {
+                    val json = when (entity) {
                         is FullEntity<*> -> entityToJsonObject(entity)
                         is ProjectionEntity -> entityToJsonObject(entity)
                         else -> null
@@ -77,7 +83,7 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
                         logger?.error("Unexpected result type")
                     }
 
-                    pageBuilder.setJson(col, ValueFactory.newString(json))
+                    pageBuilder.setJson(col, jsonParser.parse(json))
                     pageBuilder.addRecord()
                 }
 

data/src/test/java/org/embulk/input/datastore/DatastoreInputPluginSpec.kt

@@ -113,4 +113,28 @@ object DatastoreInputPluginSpec : Spek({
             }
         }
     }
+
+    describe("getGQLResultMode()") {
+        val plugin = DatastoreInputPlugin(false)
+
+        val method = plugin::class.memberFunctions.find { it.name == "getGQLResultMode" }
+        val accesibleMethod = method!!.let {
+            it.isAccessible = true
+            it
+        }
+
+        on("SELECT * query") {
+            it("should returns FullEntity") {
+                val resultMode = accesibleMethod.call(plugin, "SELECT * FROM myKind") as Query.ResultType<*>
+                assertEquals(Query.ResultType.ENTITY, resultMode)
+            }
+        }
+
+        on("SELECT non-* query") {
+            it("should returns ProjecttionEntity") {
+                val resultMode = accesibleMethod.call(plugin, "SELECT myProp FROM myKind") as Query.ResultType<*>
+                assertEquals(Query.ResultType.PROJECTION_ENTITY, resultMode)
+            }
+        }
+    }
 })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-datastore
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - syucream
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,7 @@ files:
 - classpath/commons-codec-1.3.jar
 - classpath/commons-logging-1.1.1.jar
 - classpath/datastore-v1-proto-client-1.6.0.jar
-- classpath/embulk-input-datastore-0.1.1.jar
+- classpath/embulk-input-datastore-0.1.2.jar
 - classpath/error_prone_annotations-2.2.0.jar
 - classpath/gax-1.23.0.jar
 - classpath/gax-httpjson-0.40.0.jar