prick 0.49.0 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78522ab44a921e407fe85e69b54adb1ee7eedf7b100eb1a55dc216838a89900f
-  data.tar.gz: 753d69e339b607c2e97695aa6364d19b019af7725bf2f4c190b067003c933fd4
+  metadata.gz: 7c804f1ec2c646b27750010611bac31acad4eb530500c6f77d8044b5cb703973
+  data.tar.gz: eca5f60a7af6a5e455e97541c69b373e466a9d7c7b72347d891ede3758631272
 SHA512:
-  metadata.gz: 88ed1e7b0e9d0b4a7ea7f609ce706101467ea0879e057906e9ac07edceb6e863061ced5e0cfbd7c58f07c207317b01c237ae7c6fd6795b433ee16af853764295
-  data.tar.gz: 2b95d9d37502e2b423e090a2af6d7070aab77e1689b751af736aa628c6570fe91ef19b75544c449cae777c8c4504c3d7fbab863f9d3c6907a75d4f540dd172a9
+  metadata.gz: 7b5d8d62790b80d92ce16ce3a55348c5475de293aa0fec503a60668d583693c1a9c2218fdfb4f90d0be62b14ee2cc8011fa73fb29c870b03fb3374c7a50b4b57
+  data.tar.gz: aab1dc22c44a1ba6bfe66f851e307b5a0c729702c9177cdfab1a91686afccb1a5e6337c6d8e3de6ab7b08ddd43cde46e243cc4f43cadf8cec3e7b9d329888032

data/PLAN

@@ -0,0 +1,9 @@
+
+Prick should be split up in sub-tools
+
+* build process
+* database administration
+* user administration
+* backup/restore
+* release tool
+* fox tool

data/exe/prick

@@ -96,7 +96,7 @@ SPEC = %(
       'set database' subcommand
 
   create.prick! -- (Re-)initialize the prick schema
-      Create the prick schema. The database and owner are created if needed
+      (Re-)create the prick schema
 
   create.migration! -f,force -o,file=FILE -- VERSION @ Create migration
       Create a migration from VERSION to the current and write it to
@@ -262,6 +262,7 @@ def require_db(database = Prick.state&.database, exist: true)
       conn = PgConn.new(database)
     end
     conn.schema.exist?("prick") or Prick.error "Database '#{database}' is not a Prick database"
+
     conn.close if close_conn # Close session explicitly so we can drop database if required
   else
     !dba.rdbms.exist?(database) or Prick.error "Database '#{database}' exists"
@@ -414,14 +415,11 @@ begin
           require_db(database, exist: false)
           Prick::SubCommand.create_database(database, username, environment)
         when :prick!
-          clean_pg_meta_cache
-          database, username, environment = parse_database_args(state, args)
-          if Prick::SubCommand.exist_database?(database)
-            Prick::SubCommand.clean(database, exclude: [])
-            Prick::SubCommand.init_database(database, username, environment)
-          else
-            Prick::SubCommand.create_database(database, username, environment)
-          end
+          conn = PgConn.new(database, username)
+          conn.transaction {
+            conn.schema.drop("prick", cascade: true) if conn.schema.exist?("prick")
+            Prick::SubCommand.build_prick(conn, environment)
+          }
         when :migration!
           # clean_pg_meta_cache # FIXME ?
           require_db

data/lib/prick/builder/batch.rb

@@ -33,7 +33,7 @@ module Prick
 
     class SqlBatch < BuildBatch
       def execute
-#       puts "#execute"
+#       puts "#execute #{nodes.inspect}"
         super {
           file = nil
           node = nil

data/lib/prick/builder/builder.rb

@@ -156,7 +156,7 @@ module Prick
         @batches
       end
 
-      def execute(conn, create_schemas: schemas)
+      def execute(conn, create_schemas: schemas, state: true)
         # Load pool
         load_pool if pool.nil?
 
@@ -164,23 +164,19 @@ module Prick
         create_batches if batches.nil?
 
         # Register build in database
-        Prick.state.save_build_begin
+        Prick.state.save_build_begin if state
 
         # Create schemas
         conn.exec create_schemas.map { |schema| "create schema #{schema}" } if !single
 
         # Execute batch groups
         t0 = Time.now
-#       for batch in batches
-#         puts "Executing #{batch.class} batch"
-#         batch.execute
-#       end
         batches.each(&:execute)
         t1 = Time.now
 
         # Register build result in database
         dt = t1 - t0
-        Prick.state.save_build_end(true, dt)
+        Prick.state.save_build_end(true, dt) if state
       end
 
       def dump

data/lib/prick/subcommand/prick-build.rb

@@ -47,7 +47,7 @@ module Prick::SubCommand
 #             builder.pool.delete_schema("prick") if super_conn.schema.exist?("prick")
 #             super_conn.rdbms.empty!(database, public: false, exclude: ["prick"])
               super_conn.rdbms.empty!(database, public: false)
-              Prick::SubCommand::init_database(database, username)
+              Prick::SubCommand::create_prick(database, username)
             else
               # Find all schemas
               refresh_schemas = conn.schema.list
@@ -87,17 +87,9 @@ module Prick::SubCommand
           builder.execute conn
         end
 
-#     rescue Prick::Error => ex
-#       $stderr.puts ex.message
-#       exit 1
-
       rescue ::Command::Error => ex
         $stderr.puts ex.message
         exit 1
-
-      ensure
-        super_conn&.terminate
-        conn&.terminate
       end
     end
   end

data/lib/prick/subcommand/prick-create.rb

@@ -1,7 +1,5 @@
 module Prick
   module SubCommand
-    PRICK_BUILD_FILES = %w(tables.sql views.sql functions.sql) # FIXME FIXME FIXME HARDCODED
-
     def self.exist_database?(database)
       State.connection.rdbms.exist? database
     end
@@ -21,17 +19,19 @@ module Prick
       super_conn.rdbms.create database, owner: username
 
       # Initialize prick schema
-      init_database database, username, environment
+      create_prick database, username, environment
     end
 
     # Setup prick schema. Used when we rebuild the prick schema without
     # disconnecting users
-    def self.init_database(database, username, environment)
-      # Setup Prick schema. Note that this is hardcoded, the prick build file
-      # is ignored
-      conn = PgConn.new(database, username) # Can't use Prick.state.connection on a new database
+    def self.build_prick(conn, environment)
+      # Create schema
       conn.schema.create("prick")
-      PRICK_BUILD_FILES.each { |file| conn.exec(IO.read("#{SCHEMA_PRICK_DIR}/#{file}")) }
+
+      # Run prick/build.yml
+      Prick::SubCommand.run(
+          conn.database, conn.username, "schema/prick/build.yml",
+          conn: conn, state: false, seeds: false, auth: false)
 
       # Add initial build record
       state = Prick.state # shorthand
@@ -43,10 +43,15 @@ module Prick
           rev: state.rev(kind: :short),
           clean: state.clean?,
           environment: environment || Prick::DEFAULT_ENVIRONMENT,
-          built_at: nil,
+          built_at: Time.now,
           success: nil
     end
 
+    def self.create_prick(database, username, environment)
+      conn = PgConn.new(database, username)
+      build_prick(conn, environment)
+    end
+
     def self.create_migration(username, from_version, force: false, file: nil)
       constrain from_version, PrickVersion
       Git.clean? or raise "Won't migrate: Repository is dirty"

data/lib/prick/subcommand/prick-fox.rb

@@ -19,55 +19,3 @@ module Prick::SubCommand
   end
 end
 
-__END__
-
-
-    Timer.on! if timer
-    time "Prick::Command#build" do
-      begin
-        super_conn = PgConn.new
-        conn = nil
-        builder = nil
-
-        time "Load build object" do
-          if super_conn.rdbms.exist? database
-            conn = PgConn.new(database, username)
-            super_conn.rdbms.empty!(database)
-          else
-            super_conn.rdbms.create database, owner: username
-            conn = PgConn.new(database, username)
-          end
-
-          builder = Prick::Build::Builder.new(conn, builddir)
-          builder.pool.delete_schema(builder.pool.after_schema(schema)) if schema
-        end
-
-        case dump
-          when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
-          when :allnodes; builder.nodes.map &:dump
-          when :batches; builder.dump
-          when nil;
-        else
-          Prick.error "Illegal dump type: #{dump.inspect}"
-        end && exit
-
-        time "Execute build object" do
-          builder.execute conn
-        end
-
-      rescue Prick::Error => ex
-        $stderr.puts ex.message
-        exit 1
-
-      rescue ::Command::Error => ex
-        $stderr.puts ex.message
-        exit 1
-
-      ensure
-        super_conn&.terminate
-        conn&.terminate
-      end
-    end
-  end
-end
-

data/lib/prick/subcommand/prick-run.rb

@@ -3,111 +3,102 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.run(database, username, path, seeds: true, auth: true, step: false, timer: nil, dump: nil, schema: nil)
+
+  # An explicit :conn option is needed when running in a transaction
+  def self.run(
+      database, username, path,
+      conn: nil, seeds: true, auth: true, step: false, timer: nil, dump: nil, state: true, schema: nil)
 
     Timer.on! if timer
 
     Timer.time "Prick::Command#build" do
-      begin
-        super_conn = State.connection # Used to create new databases (doesn't make a
-                                      # difference right now as the database user is
-                                      # a superuser anyway
-        conn = nil
-        builder = nil
-
-        constrain super_conn.rdbms.exist?(database), true # FIXME Same problem as below. Also in other commands
-
-        Timer.time "Load build object" do
-          if super_conn.rdbms.exist? database # FIXME Why create database? Setup should have done this
-            exist = true
-          else
-            super_conn.rdbms.create database, owner: username
-            exist = false
-          end
-          conn = Prick.state.connection
-
-          # Parse
-          builder = Prick::Build::Builder.new(
-              conn, path,
-              single: true, load_pool: false, seeds: seeds, auth: auth, step: step)
-
-          # Register if a build file is referenced and normalize path to
-          # include build.yml of directories
-          if File.directory?(path)
-            path = File.join(path, "build.yml")
-            is_build_file = true
-          elsif File.basename(path) == "build.yml"
-            is_build_file = true
-          else
-            is_build_file = false
-          end
+      super_conn = State.connection # Used to create new databases (doesn't make a
+                                    # difference right now as the database
+                                    # user is a superuser because we need to
+                                    # be able to set some superuser-only
+                                    # options on functions)
+      builder = nil
+
+      constrain super_conn.rdbms.exist?(database), true # FIXME Same problem as below. Also in other commands
+
+      Timer.time "Load build object" do
+        if super_conn.rdbms.exist? database # FIXME Why create database? Setup should have done this
+          exist = true
+        else
+          super_conn.rdbms.create database, owner: username
+          exist = false
+        end
 
-          # Read schema from build file if possible and decide if schema should
-          # be dropped beforehand
-          if is_build_file
-            if builder.root.has_schema
-              !schema or Prick.error "Can't use --schema when doing a schema build"
-              is_schema_rebuild = true
-              schema = build_node.schema
-            else
-              is_schema_rebuild = false
-            end
+        conn ||= Prick.state.connection
+
+        # Parse
+        builder = Prick::Build::Builder.new(
+            conn, path,
+            single: true, load_pool: false, seeds: seeds, auth: auth, step: step)
+
+        # Register if a build file is referenced and normalize path to
+        # include build.yml of directories
+        if File.directory?(path)
+          path = File.join(path, "build.yml")
+          is_build_file = true
+        elsif File.basename(path) == "build.yml"
+          is_build_file = true
+        else
+          is_build_file = false
+        end
+
+        # Read schema from build file if possible and decide if schema should
+        # be dropped beforehand
+        if is_build_file
+          if builder.root.has_schema
+            !schema or Prick.error "Can't use --schema when doing a schema build"
+            is_schema_rebuild = true
+            schema = build_node.schema
           else
             is_schema_rebuild = false
           end
+        else
+          is_schema_rebuild = false
+        end
 
-          # Infer schema from path
-          if !schema
-            abspath = File.realpath(path)
-            schemapath = File.realpath(Prick.state.schema_dir)
-            if abspath =~ /^#{schemapath}\/([^\/]+)(?:\/.*)$/
-              schema = $1
-            else
-              Prick.error "Can't find schema" # No default schema to avoid unintended runs
-            end
+        # Infer schema from path
+        if !schema
+          abspath = File.realpath(path)
+          schemapath = File.realpath(Prick.state.schema_dir)
+          if abspath =~ /^#{schemapath}\/([^\/]+)(?:\/.*)$/
+            schema = $1
+          else
+            Prick.error "Can't find schema" # No default schema to avoid unintended runs
           end
+        end
 
-          # Write back schema to builder
-          builder.root.schema = schema
+        # Write back schema to builder
+        builder.root.schema = schema
 
-          # Drop schema if needed
-          if is_schema_rebuild
-            conn.schema.drop schema, cascade: true
-          end
+        # Drop schema if needed
+        if is_schema_rebuild
+          conn.schema.drop schema, cascade: true
+        end
 
-          # Create schema if absent
-          if !conn.schema.exist?(schema)
-            conn.schema.create(schema)
-          end
+        # Create schema if absent
+        if !conn.schema.exist?(schema)
+          conn.schema.create(schema)
         end
+      end
 
-        if dump
-          builder.load_pool
-          case dump
-            when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
-            when :allnodes; builder.nodes.map &:dump
-            when :batches; builder.dump
-          else
-            Prick.error "Illegal dump type: #{dump.inspect}"
-          end
+      if dump
+        builder.load_pool
+        case dump
+          when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
+          when :allnodes; builder.nodes.map &:dump
+          when :batches; builder.dump
         else
-          Timer.time "Execute build object" do
-            builder.execute conn
-          end
+          Prick.error "Illegal dump type: #{dump.inspect}"
+        end
+      else
+        Timer.time "Execute build object" do
+          builder.execute conn, state: state
         end
-
-#     FIXME
-#     rescue Prick::Error => ex
-#       $stderr.puts ex.message
-#       exit 1
-#
-#     rescue ::Command::Error => ex
-#       $stderr.puts ex.message
-#       exit 1
-
-      ensure
-        super_conn&.terminate
-        conn&.terminate
       end
     end
   end

data/lib/prick/subcommand/prick-set.rb

@@ -17,7 +17,7 @@ module Prick::SubCommand
       Prick.state.environment = environment
       Prick.state.save_state
     else
-      puts Prick.state.environment
+      puts Prick.state.environment # FIXME ?
     end
   end
 
@@ -38,7 +38,7 @@ module Prick::SubCommand
       Prick.state.environment = environment
       Prick.state.save_state
     else
-      puts Prick.state.database
+      puts Prick.state.database # FIXME ?
     end
   end
 

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.49.0"
+  VERSION = "0.50.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.50.0
 platform: ruby
 authors:
 - Claus Rasmussen
@@ -188,6 +188,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - Gemfile
+- PLAN
 - README.md
 - Rakefile
 - TODO