Add optional options parameter to define_*_table() functions

This way users can keep using the simpler versions of the function in
more cases.

Author: joto

docs/flex.md

@@ -28,11 +28,12 @@ following fields:
 
 The following functions are defined:
 
-* `osm2pgsql.define_node_table(name, columns)`: Define a node table.
-* `osm2pgsql.define_way_table(name, columns)`: Define a way table.
-* `osm2pgsql.define_relation_table(name, columns)`: Define a relation table.
-* `osm2pgsql.define_area_table(name, columns)`: Define an area table.
-* `osm2pgsql.define_table()`: Define a table. This is the more flexible
+* `osm2pgsql.define_node_table(name, columns[, options])`: Define a node table.
+* `osm2pgsql.define_way_table(name, columns[, options])`: Define a way table.
+* `osm2pgsql.define_relation_table(name, columns[, options])`: Define a relation
+  table.
+* `osm2pgsql.define_area_table(name, columns[, options])`: Define an area table.
+* `osm2pgsql.define_table(options)`: Define a table. This is the more flexible
   function behind all the other `define_*_table()` functions. It gives you
   more control than the more convenient other functions.
 * `osm2pgsql.mark_way(id)`: Mark the OSM way with the specified id. This way

flex-config/with-schema.lua

@@ -2,16 +2,11 @@
 -- This configuration for the flex output shows how to define a table in
 -- a PostgreSQL schema.
 
-local dtable = osm2pgsql.define_table{
-    name = "data",
-    schema = "myschema",
-    ids = { type = 'way', id_column = 'way_id' },
-    columns = {
+local dtable = osm2pgsql.define_way_table('data', {
         { column = 'attrs', type = 'hstore' },
         { column = 'tags',  type = 'hstore' },
         { column = 'geom',  type = 'geometry' },
-    }
-}
+    }, { schema = 'myschema' })
 
 function osm2pgsql.process_way(object)
     dtable:add_row({

src/init.lua

@@ -5,28 +5,28 @@
 
 local math = require('math')
 
-local _define_table_impl = function (_type, _name, _columns)
-    return osm2pgsql.define_table{
-        name = _name,
-        ids = { type = _type, id_column = _type .. '_id' },
-        columns = _columns,
-    }
+local _define_table_impl = function(_type, _name, _columns, _options)
+    _options = _options or {}
+    _options.name = _name
+    _options.ids = { type = _type, id_column = _type .. '_id' }
+    _options.columns = _columns
+    return osm2pgsql.define_table(_options)
 end
 
-function osm2pgsql.define_node_table(_name, _columns)
-    return _define_table_impl('node', _name, _columns)
+function osm2pgsql.define_node_table(_name, _columns, _options)
+    return _define_table_impl('node', _name, _columns, _options)
 end
 
-function osm2pgsql.define_way_table(_name, _columns)
-    return _define_table_impl('way', _name, _columns)
+function osm2pgsql.define_way_table(_name, _columns, _options)
+    return _define_table_impl('way', _name, _columns, _options)
 end
 
-function osm2pgsql.define_relation_table(_name, _columns)
-    return _define_table_impl('relation', _name, _columns)
+function osm2pgsql.define_relation_table(_name, _columns, _options)
+    return _define_table_impl('relation', _name, _columns, _options)
 end
 
-function osm2pgsql.define_area_table(_name, _columns)
-    return _define_table_impl('area', _name, _columns)
+function osm2pgsql.define_area_table(_name, _columns, _options)
+    return _define_table_impl('area', _name, _columns, _options)
 end
 
 function osm2pgsql.mark_way(id)