sequel 4.30.0 → 4.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe7b61c71980b22f3aa98f3815a5852d11e0880d
-  data.tar.gz: f7b80005c8ad61d472e8f011e3532eb72c40f74b
+  metadata.gz: 7388e21a31fdf29fda8d3687cdf96011514b32f3
+  data.tar.gz: ea540316de1e370e88ad2c15bc2b53860f34f353
 SHA512:
-  metadata.gz: fe4a59d1e06d7f5267ff9f1201b052b06717e24b8d86b99db3cdfc0187b9056cf7bee88fae1da62a15215046c6babbce17aa97382269354941f6822eba4ba87e
-  data.tar.gz: 0750aa6e4143b4a074630060cef6033852930be6ab448f6d5a330b502f92bb7cbe86c26dd4d69c10356524c4a02a299becec6982077c5260f7bba329b81bd54d
+  metadata.gz: a674f18f2fe56030b484cddbd66e10fa221256609a6314d3f95f606dcd3092d39b96b41368eff9943f95094c7ef8702e1094fcf4d059a7fd3fee2cda8e1eb0de
+  data.tar.gz: 2ba7e438b33bf0601ac63eceaaf1858a91437bf4c35f4c95bd16c9a04e7fe990f975ed395b49d1ec4a42b56fe8a90506e74964421027aa3973105cccc3aa32e6

data/CHANGELOG

@@ -1,3 +1,21 @@
+=== 4.31.0 (2016-02-01)
+
+* Convert types in association_pks setters before saving them, instead of just before running queries (jeremyevans)
+
+* Use getField and getOID instead of field and oid in the jdbc/postgresql adapter to work around JRuby 9.0.5.0 regression (jeremyevans) (#1137)
+
+* Support using PostgreSQL-specific types in bound variables in the jdbc/postgresql adapter (jeremyevans)
+
+* Add support for running with --enable-frozen-string-literal on ruby 2.3 (jeremyevans)
+
+* Make Database#disconnect in the oracle adapter work correctly on newer versions of oci8 (jeremyevans)
+
+* Support parsing PostgreSQL arrays with explicit bounds (jeremyevans) (#1131)
+
+* Raise an error if attempting to use a migration file not containing a single migration (jeremyevans) (#1127)
+
+* Automatically set referenced key for self referential foriegn key constraint for simple non-autoincrementing primary key on MySQL (jeremyevans) (#1126)
+
 === 4.30.0 (2016-01-04)
 
 * Add Dataset#insert_conflict and #insert_ignore on SQLite for handling uniqueness violations (Sharpie) (#1121)

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008 Sharon Rosner
-Copyright (c) 2008-2015 Jeremy Evans
+Copyright (c) 2008-2016 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/bin/sequel

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen-string-literal: true
 
 require 'rubygems'
 require 'optparse'

data/doc/opening_databases.rdoc

@@ -240,6 +240,12 @@ The following additional options are supported:
            return a connection.
 :login_timeout :: Set the login timeout on the JDBC connection (in seconds).
 
+There are a few issues with specific jdbc drivers:
+
+jdbc-h2 :: jdbc-h2 versions greater than 1.3.175 have issues with ORDER BY not working correctly in some cases.
+jdbc-postgres :: jdbc-postgres 9.4.1204 has issues using PostgreSQL-specific types in bound variables.
+                 Use jdbc-postgres 9.4.1200 or below.
+
 === mysql 
 
 Requires: mysqlplus (or mysql if mysqlplus is not available)

data/doc/release_notes/4.31.0.txt

@@ -0,0 +1,57 @@
+= Improvements
+
+* Sequel now works with ruby 2.3's --enable-frozen-string-literal,
+  and all of the library files are set to use frozen string
+  literals by default.
+
+  A couple adapters and extensions depend on libraries that have
+  issues with frozen string literals.  Pull requests have been sent
+  to each of those dependencies.
+
+* The migrators will now raise an exception if a migration file
+  contains no migrations or more than one migration.
+
+* The jdbc/postgresql adapter now supports using PostgreSQL specific
+  types in bound variables.  Note that the current version of
+  jdbc-postgres (9.4.1204) has regressions that affect this, users
+  who need this support should stick with jdbc-postgres 9.4.1200 or
+  below.
+
+* The jdbc/postgresql adapter now works around a regression in Java
+  method lookup in JRuby 9.0.5.0
+
+* The setter methods added by the association_pks plugin now do type
+  casting immediately, instead of right before the data will be used.
+  This makes them more similar to column setter methods, and ensures
+  that future calls to the getters that use cached values will
+  return correctly typecast data.
+
+* The PostgreSQL array parser in the pg_array extension now handles
+  arrays with explicit bounds.  The explicit bounds are ignored, so
+  such values do not round trip, and there is currently no support for
+  creating arrays with explicit bounds.
+
+* Creating a table with a simple non-incrementing primary key and a
+  self-referential foreign key now works correctly on MySQL:
+
+    DB.create_table!(:table) do
+      Integer :id, :primary_key=>true
+      foreign_key :fk, :table
+    end
+
+* Database#disconnect in the oracle adapter now works correctly on
+  more recent versions of oci8 where #logoff can raise OCIException
+  instead of OCIInvalidHandle.
+
+= Backwards Compatibility
+
+* The pg_array extension no longer defines
+  Sequel::Postgres::PGArray::JSONCreator.  This should only affect
+  backwards compatibility if you were accessing the constant directly.
+  The :parser option to Sequel::Postgres::PGArray.register is also no
+  longer respected, but that should not affect backwards compatibility.
+
+* The Sequel::Model#convert_cpk_array private method that was added by
+  the association_pks plugin has been removed.
+  Sequel::Model#convert_pk_array handles both simple and composite
+  primary keys now.

data/lib/sequel.rb

@@ -1 +1,3 @@
+# frozen-string-literal: true
+
 require 'sequel/model'

data/lib/sequel/adapters/ado.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'win32ole'
 
 module Sequel

data/lib/sequel/adapters/ado/access.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/access'
 Sequel.require 'adapters/utils/split_alter_table'
 

data/lib/sequel/adapters/ado/mssql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/mssql'
 
 module Sequel

data/lib/sequel/adapters/amalgalite.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'amalgalite'
 Sequel.require 'adapters/shared/sqlite'
 

data/lib/sequel/adapters/cubrid.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'cubrid'
 Sequel.require 'adapters/shared/cubrid'
 

data/lib/sequel/adapters/do.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'data_objects'
 
 module Sequel

data/lib/sequel/adapters/do/mysql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::DataObjects.load_driver 'do_mysql'
 Sequel.require 'adapters/shared/mysql'
 

data/lib/sequel/adapters/do/postgres.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::DataObjects.load_driver 'do_postgres'
 Sequel.require 'adapters/shared/postgres'
 

data/lib/sequel/adapters/do/sqlite3.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::DataObjects.load_driver 'do_sqlite3'
 Sequel.require 'adapters/shared/sqlite'
 

data/lib/sequel/adapters/ibmdb.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'ibm_db'
 Sequel.require 'adapters/shared/db2'
 
@@ -245,7 +247,7 @@ module Sequel
           args = args.map{|v| v.nil? ? nil : prepared_statement_arg(v)}
           log_sql = "EXECUTE #{ps_name}"
           if ps.log_sql
-            log_sql << " ("
+            log_sql += " ("
             log_sql << sql
             log_sql << ")"
           end

data/lib/sequel/adapters/jdbc.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'java'
 Sequel.require 'adapters/utils/stored_procedures'
 

data/lib/sequel/adapters/jdbc/as400.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.ibm.as400.access.AS400JDBCDriver')
 Sequel.require 'adapters/jdbc/transactions'
 Sequel.require 'adapters/utils/emulate_offset_with_row_number'

data/lib/sequel/adapters/jdbc/cubrid.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('Java::cubrid.jdbc.driver.CUBRIDDriver')
 Sequel.require 'adapters/shared/cubrid'
 Sequel.require 'adapters/jdbc/transactions'

data/lib/sequel/adapters/jdbc/db2.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.ibm.db2.jcc.DB2Driver')
 Sequel.require 'adapters/shared/db2'
 Sequel.require 'adapters/jdbc/transactions'

data/lib/sequel/adapters/jdbc/derby.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.apache.derby.jdbc.EmbeddedDriver', :Derby)
 Sequel.require 'adapters/jdbc/transactions'
 

data/lib/sequel/adapters/jdbc/firebirdsql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.firebirdsql.jdbc.FBDriver')
 Sequel.require 'adapters/shared/firebird'
 Sequel.require 'adapters/jdbc/transactions'

data/lib/sequel/adapters/jdbc/h2.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.h2.Driver', :H2)
 
 module Sequel

data/lib/sequel/adapters/jdbc/hsqldb.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.hsqldb.jdbcDriver', :HSQLDB)
 Sequel.require 'adapters/jdbc/transactions'
 

data/lib/sequel/adapters/jdbc/informix-sqli.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.informix.jdbc.IfxDriver')
 Sequel.require 'adapters/shared/informix'
 

data/lib/sequel/adapters/jdbc/jdbcprogress.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.progress.sql.jdbc.JdbcProgressDriver')
 Sequel.require 'adapters/shared/progress'
 Sequel.require 'adapters/jdbc/transactions'

data/lib/sequel/adapters/jdbc/jtds.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('Java::net.sourceforge.jtds.jdbc.Driver', :JTDS)
 Sequel.require 'adapters/jdbc/mssql'
 

data/lib/sequel/adapters/jdbc/mssql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/mssql'
 
 module Sequel

data/lib/sequel/adapters/jdbc/mysql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.mysql.jdbc.Driver', :MySQL)
 Sequel.require 'adapters/shared/mysql'
 

data/lib/sequel/adapters/jdbc/oracle.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('Java::oracle.jdbc.driver.OracleDriver')
 Sequel.require 'adapters/shared/oracle'
 Sequel.require 'adapters/jdbc/transactions'

data/lib/sequel/adapters/jdbc/postgresql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.postgresql.Driver', :Postgres)
 Sequel.require 'adapters/shared/postgres'
 
@@ -138,6 +140,27 @@ module Sequel
           super || exception.message =~ /\A(This connection has been closed\.|FATAL: terminating connection due to administrator command|An I\/O error occurred while sending to the backend\.)\z/
         end
 
+        # For PostgreSQL-specific types, return the string that should be used
+        # as the PGObject value. Returns nil by default, loading pg_* extensions
+        # will override this to add support for specific types.
+        def bound_variable_arg(arg, conn)
+          nil
+        end
+
+        # If the given argument is a recognized PostgreSQL-specific type, create
+        # a PGObject instance with unknown type and the bound argument string value,
+        # and set that as the prepared statement argument.
+        def set_ps_arg(cps, arg, i)
+          if v = bound_variable_arg(arg, nil)
+            obj = org.postgresql.util.PGobject.new
+            obj.setType("unknown")
+            obj.setValue(v)
+            cps.setObject(i, obj)
+          else
+            super
+          end
+        end
+
         # Use setNull for nil arguments as the default behavior of setString
         # with nil doesn't appear to work correctly on PostgreSQL.
         def set_ps_arg_nil(cps, i)
@@ -193,7 +216,7 @@ module Sequel
         def type_convertor(map, meta, type, i)
           case type
           when *PG_SPECIFIC_TYPES
-            oid = meta.field(i).oid
+            oid = meta.getField(i).getOID
             if pr = db.oid_convertor_proc(oid)
               pr
             elsif type == ARRAY_TYPE

data/lib/sequel/adapters/jdbc/sqlanywhere.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/sqlanywhere'
 Sequel.require 'adapters/jdbc/transactions'
 

data/lib/sequel/adapters/jdbc/sqlite.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('org.sqlite.JDBC', :SQLite3)
 Sequel.require 'adapters/shared/sqlite'
 

data/lib/sequel/adapters/jdbc/sqlserver.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel::JDBC.load_driver('com.microsoft.sqlserver.jdbc.SQLServerDriver')
 Sequel.require 'adapters/jdbc/mssql'
 

data/lib/sequel/adapters/jdbc/transactions.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module JDBC
     module Transactions

data/lib/sequel/adapters/mock.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Mock
     # Connection class for Sequel's mock adapter.

data/lib/sequel/adapters/mysql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 begin
   require "mysqlplus"
 rescue LoadError

data/lib/sequel/adapters/mysql2.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'mysql2'
 Sequel.require %w'shared/mysql_prepared_statements', 'adapters'
 

data/lib/sequel/adapters/odbc.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'odbc'
 
 module Sequel

data/lib/sequel/adapters/odbc/db2.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/db2'
 
 Sequel.synchronize do

data/lib/sequel/adapters/odbc/mssql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/mssql'
 
 module Sequel

data/lib/sequel/adapters/odbc/progress.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/progress'
 
 Sequel.synchronize do

data/lib/sequel/adapters/oracle.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'oci8'
 Sequel.require 'adapters/shared/oracle'
 
@@ -57,7 +59,7 @@ module Sequel
 
       def disconnect_connection(c)
         c.logoff
-      rescue OCIInvalidHandle
+      rescue OCIException
         nil
       end
 
@@ -176,7 +178,7 @@ module Sequel
         args = cursor_bind_params(conn, cursor, opts[:arguments])
         log_sql = "EXECUTE #{name}"
         if ps.log_sql
-          log_sql << " ("
+          log_sql += " ("
           log_sql << sql
           log_sql << ")"
         end

data/lib/sequel/adapters/postgres.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 Sequel.require 'adapters/shared/postgres'
 
 begin 
@@ -375,7 +377,7 @@ module Sequel
                 end
                 nil
               else
-                b = ''
+                b = String.new
                 b << buf while buf = conn.get_copy_data
                 b
               end
@@ -466,7 +468,7 @@ module Sequel
               begin
                 channels = Array(channels)
                 channels.each do |channel|
-                  sql = "LISTEN "
+                  sql = "LISTEN ".dup
                   dataset.send(:identifier_append, sql, channel)
                   conn.execute(sql)
                 end
@@ -589,7 +591,7 @@ module Sequel
 
         log_sql = "EXECUTE #{ps_name}"
         if ps.log_sql
-          log_sql << " ("
+          log_sql += " ("
           log_sql << sql
           log_sql << ")"
         end