fluent-plugin-sql 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22da5fcea57030f5a458f011a543329737057a0
-  data.tar.gz: 9c334fb30a6ad62cc505b60006b91fbd3e2ea200
+  metadata.gz: 5b788febd35e3e1fa29da04d73983bdc2af8f35e
+  data.tar.gz: 5a15697f83fe24b1775028ab7b840c28979b63ed
 SHA512:
-  metadata.gz: d82f9b07974099025f990131f6d22337f71e1ef67cba5a61f634f0a476878a9294b1f87ac58124770b52aec57e9a30c03081ae8630a9f5d342f2c93005146b99
-  data.tar.gz: 738ea7e30cbb0ed9beecca8fa332388d2ae3b8750aa437aaa8bf63e522bf96d014f40eeb1afb99fdf38f81b52bcc596328348e1adc816e2011f0b5dd559cda77
+  metadata.gz: 24bb0cfd158c87f58f268de4e52c2c5f2f0c414f1659a7bd5d8a34f5c82b423cc4c779d3c08c2e58d280d87e8b4cebef19f0ae12800c12059fb6501dd615a581
+  data.tar.gz: 2d95ea0967c93ed7e0c3aa1f89bce899f5ea004be0c903b25ee067b617fd523621bdc922250bb952843ce6c3a6891af1e82540f535a936433924f7eba8009854

data/README.md

@@ -67,7 +67,7 @@ It stores last selected rows to a file (named *state\_file*) to not forget the l
 * **port** RDBMS port
 * **database** RDBMS database name
 * **adapter** RDBMS driver name. You should install corresponding gem before start (mysql2 gem for mysql2 adapter, pg gem for postgresql adapter, etc.)
-* **user** RDBMS login user name
+* **username** RDBMS login user name
 * **password** RDBMS login password
 * **tag_prefix** prefix of tags of events. actual tag will be this\_tag\_prefix.tables\_tag (optional)
 * **select_interval** interval to run SQLs (optional)
@@ -81,6 +81,7 @@ It stores last selected rows to a file (named *state\_file*) to not forget the l
 * **table** RDBM table name
 * **update_column**: see above description
 * **time_column** (optional): if this option is set, this plugin uses this column's value as the the event's time. Otherwise it uses current time.
+* **primary_key** (optional): if you want to get data from the table which doesn't have primary key like PostgreSQL's View, set this parameter.
 
 ## Input: Limitation
 
@@ -107,6 +108,7 @@ This plugin takes advantage of ActiveRecord underneath. For `host`, `port`, `dat
 
       <table>
         table table1
+        column_mapping 'timestamp:created_at,fluentdata1:dbcol1,fluentdata2:dbcol2,fluentdata3:dbcol3'
         # This is the default table because it has no "pattern" field
         # The logic is such that if all non-default <table> blocks
         # do not match, the default one is chosen.
@@ -136,7 +138,7 @@ This plugin takes advantage of ActiveRecord underneath. For `host`, `port`, `dat
 * **port** RDBMS port
 * **database** RDBMS database name
 * **adapter** RDBMS driver name. You should install corresponding gem before start (mysql2 gem for mysql2 adapter, pg gem for postgresql adapter, etc.)
-* **user** RDBMS login user name
+* **username** RDBMS login user name
 * **password** RDBMS login password
 * **socket** RDBMS socket path
 * **remove_tag_prefix** remove the given prefix from the events. See "tag_prefix" in "Input: Configuration". (optional)
@@ -144,5 +146,5 @@ This plugin takes advantage of ActiveRecord underneath. For `host`, `port`, `dat
 \<table\> sections:
 
 * **table** RDBM table name
-* **column_mapping**: Record to table schema mapping. The format is consists of `from:to` or `key` values are separated by `,`. For example, if set 'item_id:id,item_text:data,updated_at' to **column_mapping**, `item_id` field of record is stored into `id` column and `updated_at` field of record is stored into `updated_at` column.
+* **column_mapping**: [Required] Record to table schema mapping. The format is consists of `from:to` or `key` values are separated by `,`. For example, if set 'item_id:id,item_text:data,updated_at' to **column_mapping**, `item_id` field of record is stored into `id` column and `updated_at` field of record is stored into `updated_at` column.
 * **pattern**: the pattern to which the incoming event's tag (after it goes through `remove_tag_prefix`, if given). The patterns should follow the same syntax as [that of <match>](http://docs.fluentd.org/articles/config-file#match-pattern-how-you-control-the-event-flow-inside-fluentd). **Exactly one <table> element must NOT have this parameter so that it becomes the default table to store data**.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/fluent/plugin/in_sql.rb

@@ -46,6 +46,7 @@ module Fluent
       config_param :tag, :string, :default => nil
       config_param :update_column, :string, :default => nil
       config_param :time_column, :string, :default => nil
+      config_param :primary_key, :string, :default => nil
 
       def configure(conf)
         super
@@ -56,9 +57,12 @@ module Fluent
 
         # creates a model for this table
         table_name = @table
+        primary_key = @primary_key
         @model = Class.new(base_model) do
           self.table_name = table_name
           self.inheritance_column = '_never_use_'
+          self.primary_key = primary_key if primary_key
+
           #self.include_root_in_json = false
 
           def read_attribute_for_serialization(n)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd