pgmodelgen 0.4.5 → 0.4.6

data/LICENSE.txt

@@ -1,20 +1,165 @@
-Copyright (c) 2013 Darwin
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2013 Björn Blomqvist
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/README.rdoc

@@ -1,6 +1,6 @@
 = pgmodelgen
 
-Description goes here.
+Rake task that generates/updates activerecord models based on current schema in the postgresql DB.
 
 == Contributing to pgmodelgen
  

data/lib/metadata_extractor.rb

@@ -0,0 +1,57 @@
+class MetadataExtractor
+  
+  def initialize(db_connection)
+    @db_connection = db_connection
+  end
+  
+  def metadata
+    {:schema => schemas, :db_name => db_name}
+  end
+  
+  private
+  
+  def schemas
+    toReturn = {}
+    schema_names.each do |schema_name|
+      toReturn[schema_name] = tables(schema_name)
+    end
+    
+    toReturn
+  end
+  
+  def schema_names
+    @db_connection.query("show search_path;").to_a.first['search_path'].split(/,/).delete_if{|value| value.match(/\$/) }
+  end
+  
+  def tables(schema_name)
+    to_return = {}
+    table_names(schema_name).each do |table_name|
+      to_return[table_name] = table(schema_name,table_name)
+    end
+    
+    to_return
+  end
+  
+  def table(schema_name, table_name) 
+    {:oid => oid(schema_name, table_name), :columns => columns(schema_name, table_name)}
+  end
+  
+  def oid(schema_name, table_name)
+    @db_connection.query("
+select
+  pg_class.oid as table_oid
+  from pg_class
+  join pg_namespace on pg_namespace.oid = pg_class.relnamespace
+  where (relkind = 'r') and pg_namespace.nspname = '#{schema_name}' and pg_class.relname = '#{table_name}' ").to_a.map{|row| row['table_oid'] }.first
+  end
+  
+  def table_names(schema_name)
+    @db_connection.query("
+select
+  pg_class.relname as table_name
+  from pg_class
+  join pg_namespace on pg_namespace.oid = pg_class.relnamespace
+  where (relkind = 'r') and pg_namespace.nspname = '#{schema_name}' ").to_a.map{|row| row['table_name'] }
+  end
+  
+end

data/lib/tasks/pgmodelgen.rake

@@ -1,5 +1,8 @@
 
 
+
+
+
 # TODO Seperate parsing of postgresql meta data from model generating, the value of the
 #      project would be much more. Also it would open up to suporting other dbs.
 
@@ -185,7 +188,7 @@ class PGGen
 
       FileUtils.makedirs(File.dirname(model_file_name))
 
-      value[:set] = "\tset_table_name \"#{key}\"\n" + value[:set].to_s
+      value[:set] = "\tself.table_name = \"#{key}\"\n" + value[:set].to_s
 
       first_part = "# encoding: utf-8\n\n"
       first_part += "class #{get_class_name_with_namespace(class_name)} < ActiveRecord::Base \n"
@@ -513,8 +516,8 @@ class PGGen
           columns = row['attribute_column_numbers'].gsub("{","").gsub("}","").split(',');
           match = get_default_value_src(columns.first,table_oid,connection).to_s.match("\'([a-zA-Z_]*)\'");
 
-          models[table_name][:set] += "\tset_primary_key \"#{get_attribute_name(columns.first,table_oid,connection)}\"\n"
-          models[table_name][:set] += "\tset_sequence_name \"#{match[1]}\"\n" if match
+          models[table_name][:set] += "\tself.primary_key = \"#{get_attribute_name(columns.first,table_oid,connection)}\"\n"
+          models[table_name][:set] += "\tself.sequence_name = \"#{match[1]}\"\n" if match
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgmodelgen
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- lib/metadata_extractor.rb
 - lib/pgmodelgen.rb
 - lib/pgmodelgen/railtie.rb
 - lib/tasks/pgmodelgen.rake
@@ -72,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2115245809043789605
+      hash: -4060115545326901215
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: