jungle_path 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f75a5f755ee775b5762ef2d8c064696c8cbbed8
-  data.tar.gz: a04114132b7366da76df710c9f1646baa8a107bf
+  metadata.gz: ee019b41cad42e01516a1c7310395b79037870ab
+  data.tar.gz: 86e255015d0974065a4b9e635389b04f4e4e4b34
 SHA512:
-  metadata.gz: 48b7c6aec25411319ddc11a0dfe14f244662dcd51411657ab6489c1bee5bf795cdcf4a4266021db93e8df9b3161bd5b285a376b23134d4a355d8474766946766
-  data.tar.gz: 213c0f79c406d2182a1c932c37fe6bc43c00855247d7294f526135d62c2fd9a0d9379ece05907055240d37ca3b26af518d4cead375e73dc77e7d65cf0773a204
+  metadata.gz: b99ff226ab3a0e4046375e4993048d3ca6f6f371bb6cf639d862e77f3347adf998b0a9d44507ce80123372e0b9f7943f2823a7ba4ceaaf6e4f91c9620d003aa2
+  data.tar.gz: d7fa508186b220b18a387871f485c9f97fe0202117bd259d201e1a35c15a10523f963ff8df5d7b61417453b56676f9cca561e89b05489a215f8a88dd282b428c

data/lib/jungle_path/db_access/io/db.rb

@@ -1,5 +1,6 @@
 module JunglePath
 	module DBAccess
+		require 'jungle_path/db_access/meta/table'
 		module IO
 			require 'jungle_path/db_access/io'
 			require 'jungle_path/db_access/io/select'
@@ -45,6 +46,22 @@ module JunglePath
 					@database_name = config.name
 				end
 
+				def drop_table? table_name
+					JunglePath::DBAccess::Meta::Table.drop? self, table_name
+				end
+
+				def table_exists? table_name
+					JunglePath::DBAccess::Meta::Table.exists? self, table_name
+				end
+
+				def create_table_like(from_table, to_table)
+					JunglePath::DBAccess::Meta::Table.create_like(self, from_table, to_table)
+				end
+
+				def copy_table_data(from_table, to_table)
+					JunglePath::DBAccess::Meta::Table.copy_data(self, from_table, to_table)
+				end
+
 				def reset_sequence_for_table(table_name)
 					#max = @db[table_name.to_sym].max(:id) + 1
 					#@db.run "alter sequence #{table_name}_id_seq restart with #{max}"

data/lib/jungle_path/db_access/meta.rb

@@ -0,0 +1,10 @@
+#require 'pry-byebug'
+module JunglePath
+	module DBAccess
+		module Meta
+			require 'jungle_path/db_access/meta/db'
+			require 'jungle_path/db_access/meta/schema'
+			require 'jungle_path/db_access/meta/table'
+		end
+	end
+end

data/lib/jungle_path/db_access/meta/db.rb

@@ -0,0 +1,79 @@
+# gen_db.rb -- drops and creates a postgresql database from the commandline dropdb/createdb commands.
+require 'jungle_path/db_access/io'
+
+module JunglePath
+  module DBAccess
+    module Meta
+      module DB
+        def self.create(config)
+          puts "JunglePath::DBAccess::Meta::DB.create: #{config.name}."
+          db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
+          sql = "create database #{config.name}"
+          db.run sql
+        end
+
+        def self.drop!(config)
+          puts "JunglePath::DBAccess::Meta::DB.drop: #{config.name}."
+          kill_connections! config
+          db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
+          sql = "drop database #{config.name}"
+          db.run sql
+        end
+
+        def self.drop?(config)
+          if exists?(config)
+            drop! config
+          end
+        end
+
+        def self.reset!(config)
+          drop? config
+          create config
+        end
+
+        def self.exists?(config) # todo: fix to also work for ms sql server.
+          puts "JunglePath::DBAccess::Meta::DB.exists? #{config.name}."
+          exists = false
+          db = JunglePath::DBAccess::IO.connection_from_config_unknown_database(config)
+          sql = sql_query_db_existence(config)
+          db.fetch(sql) do |row|
+            exists = true
+          end
+          exists
+        end
+
+        def self.rename(config_from, to_name)
+          puts "JunglePath::DBAccess::Meta::DB.rename: #{config_from.name} to #{to_name}."
+          kill_connections! config_from
+          db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config_from)
+          sql = "alter database #{config_from.name} rename to #{to_name}"
+          db.run sql
+        end
+
+        def self.rename?(config_from, to_name)
+          if exists?(config_from)
+            rename config_from, to_name
+          end
+        end
+
+        def self.kill_connections!(config)
+          db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
+          sql = "select pg_terminate_backend(pid) from pg_stat_activity where datname = '#{config.name}'"
+          db.run sql
+        end
+
+        private
+
+        def self.sql_query_db_existence(config)
+          if config.type == 'postgres'
+            "select datname from pg_database where datname = '#{config.name}'"
+          elsif config.type == 'tinytds'
+            "select * from master.sys.databases where name = '#{config.name}'"
+          else
+            throw "Unknown database type: #{config.type}."
+          end
+        end
+      end
+    end
+  end
+end

data/lib/jungle_path/db_access/meta/schema.rb

@@ -0,0 +1,54 @@
+# gen_schema.rb -- creates a database schema from a set of DBModel::Table (sub)classes.
+require 'logger'
+require 'sequel'
+require 'jungle_path/db_model'
+require 'jungle_path/db_access'
+
+# todo: fix ! vs "" vs ? method calls...
+module JunglePath
+	module DBAccess
+		module Meta
+		  module Schema
+		    def self.create(table_subclasses, db_config, logger=$stdout)
+		      puts "JunglePath::DBAccess::Meta::Schema.create..."
+		      db = JunglePath::DBAccess::IO.connection_from_config(db_config)
+		      db.loggers << Logger.new(logger)
+		      schema = JunglePath::DBModel::Schema.new(db)
+		      table_subclasses.each do |table|
+						if table.is_view?
+		          puts "create view: #{table.table_name}"
+		          db.run(table.view.create)
+		        else
+		          puts "create table: #{table.table_name}"
+		          schema.create_table table
+		        end
+		      end
+		    end
+
+		    def self.set_version schema_info_class, db_config, schema_initial_version
+		      # set starting version numnber
+		      db = JunglePath::DBAccess::IO::DB.new(db_config)
+		      db.schema.create_table schema_info_class
+		      if schema_initial_version
+		        schema_info = schema_info_class.new({version: schema_initial_version})
+		        db.insert._model(schema_info)
+		      end
+		    end
+
+		    def self.set_version_to_latest schema_info_class, db_config, migrations_path
+		      version = 0
+		      migration_files = Dir.glob(File.join(migrations_path, "*.rb"))
+		      migration_files.each do |file_name|
+		        puts file_name
+		        parts = File.basename(file_name).split('_')
+		        if parts.length > 0
+		          value = parts[0].to_i
+		          version = value if value > version
+		        end
+		      end
+		      set_version schema_info_class, db_config, version
+		    end
+		  end
+		end
+	end
+end

data/lib/jungle_path/db_access/meta/table.rb

@@ -0,0 +1,26 @@
+# table manipulation.
+# db.base is a Sequel database object.
+# db is can be a JunglePath::DBAccess::IO::DB object.
+module JunglePath
+  module DBAccess
+    module Meta
+      module Table
+				def drop? db, table_name
+					db.base.drop_table?(table_name.to_sym)
+				end
+
+				def exists? db, table_name
+					db.base.table_exists?(table_name.to_sym)
+				end
+
+				def create_like(db, from_table, to_table)
+					db.base.run("create table #{to_table} (like #{from_table} including indexes)")
+				end
+
+				def copy_data(db, from_table, to_table)
+					db.base.run("insert into #{to_table} select * from #{from_table}")
+				end
+			end
+		end
+	end
+end

data/lib/jungle_path/db_access/syntax.rb

@@ -0,0 +1,9 @@
+#require 'pry-byebug'
+module JunglePath
+	module DBAccess
+		module Syntax
+			require 'jungle_path/db_access/syntax/postgresql'
+			require 'jungle_path/db_access/syntax/sql_server'
+		end
+	end
+end

data/lib/jungle_path/db_access/syntax/postgresql.rb

@@ -0,0 +1,26 @@
+module JunglePath
+	module DBAccess
+		module Syntax
+			module Postgresql
+				def self.sql_true
+					"true"
+				end
+				def self.sql_allow_order_bys_in_sub_select
+					""
+				end
+				def self.left_bracket
+					""
+				end
+				def self.right_bracket
+					""
+				end
+				def self.convert_nvarchar_beg
+					""
+				end
+				def self.convert_nvarchar_end
+					"::text"
+				end
+			end
+		end
+	end
+end

data/lib/jungle_path/db_access/syntax/sql_server.rb

@@ -0,0 +1,26 @@
+module JunglePath
+	module DBAccess
+		module Syntax
+			module SqlServer
+				def self.sql_true
+					"1"
+				end
+				def self.sql_allow_order_bys_in_sub_select
+					"top 1000000000"
+				end
+				def self.left_bracket
+					"["
+				end
+				def self.right_bracket
+					"]"
+				end
+				def self.convert_nvarchar_beg
+					"convert(nvarchar, "
+				end
+				def self.convert_nvarchar_end
+					")"
+				end
+			end
+		end
+	end
+end

data/lib/jungle_path/gen.rb

@@ -1,5 +1,6 @@
 module JunglePath
 	module Gen
+		# Ruby code generation.
 		require 'jungle_path/api'
 		require 'jungle_path/controllers'
 		require 'jungle_path/db'

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.20'
+	VERSION = '0.0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Michael VanZant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,6 +135,13 @@ files:
 - lib/jungle_path/db_access/io/schema.rb
 - lib/jungle_path/db_access/io/select.rb
 - lib/jungle_path/db_access/io/update.rb
+- lib/jungle_path/db_access/meta.rb
+- lib/jungle_path/db_access/meta/db.rb
+- lib/jungle_path/db_access/meta/schema.rb
+- lib/jungle_path/db_access/meta/table.rb
+- lib/jungle_path/db_access/syntax.rb
+- lib/jungle_path/db_access/syntax/postgresql.rb
+- lib/jungle_path/db_access/syntax/sql_server.rb
 - lib/jungle_path/db_model.rb
 - lib/jungle_path/db_model/column.rb
 - lib/jungle_path/db_model/params.rb
@@ -149,8 +156,6 @@ files:
 - lib/jungle_path/gen.rb
 - lib/jungle_path/gen/api.rb
 - lib/jungle_path/gen/controllers.rb
-- lib/jungle_path/gen/db.rb
-- lib/jungle_path/gen/schema.rb
 - lib/jungle_path/gen/schema_tree.rb
 - lib/jungle_path/gen/schema_tree/filter.rb
 - lib/jungle_path/gen/schema_tree/match_columns.rb

data/lib/jungle_path/gen/db.rb

@@ -1,77 +0,0 @@
-# gen_db.rb -- drops and creates a postgresql database from the commandline dropdb/createdb commands.
-require 'jungle_path/db_access/io'
-
-module JunglePath
-  module Gen
-    module DB
-      def self.create(config)
-        puts "Gen::DB.create: #{config.name}."
-        db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
-        sql = "create database #{config.name}"
-        db.run sql
-      end
-
-      def self.drop!(config)
-        puts "Gen::DB.drop: #{config.name}."
-        kill_connections! config
-        db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
-        sql = "drop database #{config.name}"
-        db.run sql
-      end
-
-      def self.drop?(config)
-        if exists?(config)
-          drop! config
-        end
-      end
-
-      def self.reset!(config)
-        drop? config
-        create config
-      end
-
-      def self.exists?(config) # todo: fix to also work for ms sql server.
-        puts "Gen::DB.exists? #{config.name}."
-        exists = false
-        db = JunglePath::DBAccess::IO.connection_from_config_unknown_database(config)
-        sql = sql_query_db_existence(config)
-        db.fetch(sql) do |row|
-          exists = true
-        end
-        exists
-      end
-
-      def self.rename(config_from, to_name)
-        puts "GenDB.rename: #{config_from.name} to #{to_name}."
-        kill_connections! config_from
-        db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config_from)
-        sql = "alter database #{config_from.name} rename to #{to_name}"
-        db.run sql
-      end
-
-      def self.rename?(config_from, to_name)
-        if exists?(config_from)
-          rename config_from, to_name
-        end
-      end
-
-      def self.kill_connections!(config)
-        db = JunglePath::DBAccess::IO.connection_from_config_use_postgres_db(config)
-        sql = "select pg_terminate_backend(pid) from pg_stat_activity where datname = '#{config.name}'"
-        db.run sql
-      end
-
-      private
-
-      def self.sql_query_db_existence(config)
-        if config.type == 'postgres'
-          "select datname from pg_database where datname = '#{config.name}'"
-        elsif config.type == 'tinytds'
-          "select * from master.sys.databases where name = '#{config.name}'"
-        else
-          throw "Unknown database type: #{config.type}."
-        end
-      end
-    end
-  end
-end

data/lib/jungle_path/gen/schema.rb

@@ -1,52 +0,0 @@
-# gen_schema.rb -- creates a database schema from a set of DBModel::Table (sub)classes.
-require 'logger'
-require 'sequel'
-require 'jungle_path/db_model'
-require 'jungle_path/db_access'
-
-# todo: fix ! vs "" vs ? method calls...
-module JunglePath
-	module Gen
-	  module Schema
-	    def self.create(table_subclasses, db_config, logger=$stdout)
-	      puts "Gen::Schema.create..."
-	      db = JunglePath::DBAccess::IO.connection_from_config(db_config)
-	      db.loggers << Logger.new(logger)
-	      schema = JunglePath::DBModel::Schema.new(db)
-	      table_subclasses.each do |table|
-					if table.is_view?
-	          puts "create view: #{table.table_name}"
-	          db.run(table.view.create)
-	        else
-	          puts "create table: #{table.table_name}"
-	          schema.create_table table
-	        end
-	      end
-	    end
-
-	    def self.set_version schema_info_class, db_config, schema_initial_version
-	      # set starting version numnber
-	      db = JunglePath::DBAccess::IO::DB.new(db_config)
-	      db.schema.create_table schema_info_class
-	      if schema_initial_version
-	        schema_info = schema_info_class.new({version: schema_initial_version})
-	        db.insert._model(schema_info)
-	      end
-	    end
-
-	    def self.set_version_to_latest schema_info_class, db_config, migrations_path
-	      version = 0
-	      migration_files = Dir.glob(File.join(migrations_path, "*.rb"))
-	      migration_files.each do |file_name|
-	        puts file_name
-	        parts = File.basename(file_name).split('_')
-	        if parts.length > 0
-	          value = parts[0].to_i
-	          version = value if value > version
-	        end
-	      end
-	      set_version schema_info_class, db_config, version
-	    end
-	  end
-	end
-end