cell 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 211c24ca29da9c3f29c89c221135320eabb7c60e021f850a4eb51297f113597d
-  data.tar.gz: 5aedded26588e26ebeab905b3689343a01ee39ddfb210048357419cc41947965
+  metadata.gz: adef1d445be3e9010b94ad4196ef202e2314af43bb6a982cd03acd1d375c0120
+  data.tar.gz: 3e1de2fdc80ad0c0079b2a245ac111eec1de4a80c58466fcf91c2114f4c21b06
 SHA512:
-  metadata.gz: 8c57fbc0cf50df6218a8fed7034c2c3f655198267caaf8e1606fddad9f2e0cc382d0269319a16f57969b06608d7370808949d06a1566b9daa63e53cbf21e6628
-  data.tar.gz: dbf21a4b50619ab148612ee7649d294a1c427214eb8d7b7edf9a44f4a76abad775e4ff59edf3863ec12787a83d23aa8e188021d0b2885a922f3a3e3cc8ab1f35
+  metadata.gz: cab98e74a799e6befc2dc1714db48ac75803eb2fb83a411b1790da9b1d6626f45fc6138ad6dd86df38afc3c543c1266031bdbf63f79169b3e3df9eafa7757949
+  data.tar.gz: 75be217db8a19cae1d8e1f3c6f4aea745b28332fecd9c4429003904305a6385b0d93e892ffc9e5c1e4aa32adf66ff7fd1151f8cddecfb60121c96af1d5146e48

data/lib/cell/clone_schema.rb

@@ -1,5 +1,6 @@
 require 'active_record/schema_migration'
 require 'cell/meta'
+require 'shellwords'
 
 module Cell
   module CloneSchema
@@ -7,13 +8,50 @@ module Cell
       ::ActiveRecord::Base.connection
     end
 
+    def self.configuration
+      Rails.configuration.database_configuration[Rails.env]
+    end
 
-    def self.clone_schema(src, dst)
-      connection.execute <<~SQL
-        SELECT public.clone_schema(#{connection.quote(src)}, #{connection.quote(dst)}, TRUE)
-      SQL
+    def self.postgres_cli_args(cmd)
+      fail ArgumentError unless [:psql, :pg_dump].include?(cmd)
+
+      conf = configuration
+
+      r = []
+      r << '--host'     << conf['host'] if conf['host']
+      r << '--port'     << conf['port'] if conf['port']
+      r << '--dbname'   << conf['database'] if conf['database']
+      r << '--username' << conf['username'] if conf['username']
+      r << '--password' << conf['password'] if conf['password']
+      # psql doesn't accept --encoding
+      r << '--encoding' << conf['encoding'] if conf['encoding'] unless cmd == :psql
+
+      r
     end
 
+    def self.psql_cmd
+      cmd = ["psql"] + postgres_cli_args(:psql).map{|s| Shellwords.escape(s)}
+      cmd.join(" ")
+    end
+
+    def self.pg_dump_cmd(schema_name)
+      cmd = ["pg_dump"] + postgres_cli_args(:pg_dump).map{|s| Shellwords.escape(s)}
+      cmd << "--schema" << Shellwords.escape(schema_name)
+      cmd.join(" ")
+    end
+
+    def self.filter_cmd(src, dst)
+      # This is slightly dumb, but better than trying to do it in DDL
+      "sed -e 's/#{src}/#{dst}/g'"
+    end
+
+    def self.clone_schema(src, dst)
+      clone_cmd = "#{pg_dump_cmd(src)} | #{filter_cmd(src, dst)} | #{psql_cmd}"
+      result = %x(#{clone_cmd})
+      unless $?.success?
+        fail ActiveRecord::StatementInvalid, result
+      end
+    end
 
     def self.copy_schema_migrations_to(dst)
       Cell::Meta.with_schema(dst, exclusive: true) do
@@ -25,214 +63,5 @@ module Cell
           SELECT * from schema_migrations
       SQL
     end
-
-
-    def self.install_function!
-      @created ||= begin
-        connection.execute(function_definition)
-        true
-      end
-    end
-
-
-    def self.function_definition
-      FUNCTION_DEFINITION
-    end
   end
 end
-
-unless Cell::CloneSchema.const_defined?(:FUNCTION_DEFINITION)
-  # The following function was written by Melvin Davidson, originally based on the work of '3manuek',
-  #   posted at: https://wiki.postgresql.org/wiki/Clone_schema
-
-  Cell::CloneSchema.const_set :FUNCTION_DEFINITION, <<~PGSQL
-    -- Function: clone_schema(text, text)
-
-    -- DROP FUNCTION clone_schema(text, text);
-
-    CREATE OR REPLACE FUNCTION public.clone_schema(
-        source_schema text,
-        dest_schema text,
-        include_recs boolean)
-      RETURNS void AS
-    $BODY$
-
-    --  This function will clone all sequences, tables, data, views & functions from any existing schema to a new one
-    -- SAMPLE CALL:
-    -- SELECT clone_schema('public', 'new_schema', TRUE);
-
-    DECLARE
-      src_oid          oid;
-      tbl_oid          oid;
-      func_oid         oid;
-      object           text;
-      buffer           text;
-      srctbl           text;
-      default_         text;
-      column_          text;
-      qry              text;
-      dest_qry         text;
-      v_def            text;
-      seqval           bigint;
-      sq_last_value    bigint;
-      sq_max_value     bigint;
-      sq_start_value   bigint;
-      sq_increment_by  bigint;
-      sq_min_value     bigint;
-      sq_cache_value   bigint;
-      sq_log_cnt       bigint;
-      sq_is_called     boolean;
-      sq_is_cycled     boolean;
-      sq_cycled        char(10);
-
-    BEGIN
-
-    -- Check that source_schema exists
-      SELECT oid INTO src_oid
-        FROM pg_namespace
-       WHERE nspname = quote_ident(source_schema);
-      IF NOT FOUND
-        THEN
-        RAISE NOTICE 'source schema % does not exist!', source_schema;
-        RETURN ;
-      END IF;
-
-      -- Check that dest_schema does not yet exist
-      PERFORM nspname
-        FROM pg_namespace
-       WHERE nspname = quote_ident(dest_schema);
-      IF FOUND
-        THEN
-        RAISE NOTICE 'dest schema % already exists!', dest_schema;
-        RETURN ;
-      END IF;
-
-      EXECUTE 'CREATE SCHEMA ' || quote_ident(dest_schema) ;
-
-      -- Create sequences
-      -- TODO: Find a way to make this sequence's owner is the correct table.
-      FOR object IN
-        SELECT sequence_name::text
-          FROM information_schema.sequences
-         WHERE sequence_schema = quote_ident(source_schema)
-      LOOP
-        EXECUTE 'CREATE SEQUENCE ' || quote_ident(dest_schema) || '.' || quote_ident(object);
-        srctbl := quote_ident(source_schema) || '.' || quote_ident(object);
-
-        EXECUTE 'SELECT last_value, max_value, start_value, increment_by, min_value, cache_value, log_cnt, is_cycled, is_called
-                  FROM ' || quote_ident(source_schema) || '.' || quote_ident(object) || ';'
-                  INTO sq_last_value, sq_max_value, sq_start_value, sq_increment_by, sq_min_value, sq_cache_value, sq_log_cnt, sq_is_cycled, sq_is_called ;
-
-        IF sq_is_cycled
-          THEN
-            sq_cycled := 'CYCLE';
-        ELSE
-            sq_cycled := 'NO CYCLE';
-        END IF;
-
-        EXECUTE 'ALTER SEQUENCE '   || quote_ident(dest_schema) || '.' || quote_ident(object)
-                || ' INCREMENT BY ' || sq_increment_by
-                || ' MINVALUE '     || sq_min_value
-                || ' MAXVALUE '     || sq_max_value
-                || ' START WITH '   || sq_start_value
-                || ' RESTART '      || sq_min_value
-                || ' CACHE '        || sq_cache_value
-                || sq_cycled || ' ;' ;
-
-        buffer := quote_ident(dest_schema) || '.' || quote_ident(object);
-        IF include_recs
-            THEN
-                EXECUTE 'SELECT setval( ''' || buffer || ''', ' || sq_last_value || ', ' || sq_is_called || ');' ;
-        ELSE
-                EXECUTE 'SELECT setval( ''' || buffer || ''', ' || sq_start_value || ', ' || sq_is_called || ');' ;
-        END IF;
-
-      END LOOP;
-
-    -- Create tables
-      FOR object IN
-        SELECT TABLE_NAME::text
-          FROM information_schema.tables
-         WHERE table_schema = quote_ident(source_schema)
-           AND table_type = 'BASE TABLE'
-
-      LOOP
-        buffer := quote_ident(dest_schema) || '.' || quote_ident(object);
-        EXECUTE 'CREATE TABLE ' || buffer || ' (LIKE ' || quote_ident(source_schema) || '.' || quote_ident(object)
-            || ' INCLUDING ALL)';
-
-        IF include_recs
-          THEN
-          -- Insert records from source table
-          EXECUTE 'INSERT INTO ' || buffer || ' SELECT * FROM ' || quote_ident(source_schema) || '.' || quote_ident(object) || ';';
-        END IF;
-
-        FOR column_, default_ IN
-          SELECT column_name::text,
-                 REPLACE(column_default::text, source_schema, dest_schema)
-            FROM information_schema.COLUMNS
-           WHERE table_schema = dest_schema
-             AND TABLE_NAME = object
-             AND column_default LIKE 'nextval(%' || quote_ident(source_schema) || '%::regclass)'
-        LOOP
-          EXECUTE 'ALTER TABLE ' || buffer || ' ALTER COLUMN ' || column_ || ' SET DEFAULT ' || default_;
-        END LOOP;
-
-      END LOOP;
-
-    --  add FK constraint
-      FOR qry IN
-        SELECT 'ALTER TABLE ' || quote_ident(dest_schema) || '.' || quote_ident(rn.relname)
-                              || ' ADD CONSTRAINT ' || quote_ident(ct.conname) || ' ' || pg_get_constraintdef(ct.oid) || ';'
-          FROM pg_constraint ct
-          JOIN pg_class rn ON rn.oid = ct.conrelid
-         WHERE connamespace = src_oid
-           AND rn.relkind = 'r'
-           AND ct.contype = 'f'
-
-        LOOP
-          EXECUTE qry;
-
-        END LOOP;
-
-
-    -- Create views
-      FOR object IN
-        SELECT table_name::text,
-               view_definition
-          FROM information_schema.views
-         WHERE table_schema = quote_ident(source_schema)
-
-      LOOP
-        buffer := dest_schema || '.' || quote_ident(object);
-        SELECT view_definition INTO v_def
-          FROM information_schema.views
-         WHERE table_schema = quote_ident(source_schema)
-           AND table_name = quote_ident(object);
-
-        EXECUTE 'CREATE OR REPLACE VIEW ' || buffer || ' AS ' || v_def || ';' ;
-
-      END LOOP;
-
-    -- Create functions
-      FOR func_oid IN
-        SELECT oid
-          FROM pg_proc
-         WHERE pronamespace = src_oid
-
-      LOOP
-        SELECT pg_get_functiondef(func_oid) INTO qry;
-        SELECT replace(qry, source_schema, dest_schema) INTO dest_qry;
-        EXECUTE dest_qry;
-
-      END LOOP;
-
-      RETURN;
-
-    END;
-
-    $BODY$
-      LANGUAGE plpgsql VOLATILE
-      COST 100;
-  PGSQL
-end

data/lib/cell/ext/migration.rb

@@ -134,7 +134,6 @@ module Cell
 
       # This is our super-special initialization function.
       def initialize_cell!
-        CloneSchema.install_function!
         execute "CREATE SCHEMA #{connection.quote_schema_name(prototype_schema)}"
       end
 

data/lib/cell/schema.rb

@@ -40,7 +40,7 @@ module Cell
     end
 
     def self.prepended(cls)
-      cls.after_create_commit  :create_schema!
+      cls.after_create :create_schema!
       cls.after_update_commit  :update_schema!, if: :cell_id_changed?
       cls.after_destroy_commit :destroy_schema!
     end

data/lib/cell/version.rb

@@ -1,3 +1,3 @@
 module Cell
-  VERSION = '0.2.1'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cell
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - bin/setup
 - bin/test
 - cell.gemspec
+- lib/.DS_Store
 - lib/cell.rb
 - lib/cell/clone_schema.rb
 - lib/cell/console.rb