mode 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79719aeee1b231678a845b20822da9d23adfa88
-  data.tar.gz: 923422856ba88ce2e6b4a0c0036848982f1615d5
+  metadata.gz: 501bc9af067604c1d9f2832eabe69377aa852a32
+  data.tar.gz: 83462099c7828196e141d87af6092bb3cc652f40
 SHA512:
-  metadata.gz: 4f26aa68bd1871d9d9483dd9a48cdd3cdc064f5cfa8e9bb8cd46c5d3eb63ac09fa5933f2bc3680c07fbd20b4817f3819ca10b771fe55d0aab7f74238f5ad3374
-  data.tar.gz: 8a2a26041037d95ba48d6ab6f9077d5960364f7f21aa7c2a6e6f7f57d03134f1bfe1f8f2ab5c94f7e72bbd7b954568f64d214f35e304e4bbd73aeffa9d763dbc
+  metadata.gz: 3f4e66ca3d14ff6c8f39da90cc2f9a008e62ba87f017b7b04cffc7ab49b166e66c27e627a9f9debaba9dd95b5a4e5c927b6c80d0696471ef140d1b5765e63195
+  data.tar.gz: cd677664533e1b7cc87bb94af95b8a87c2b34a523559bc10707f93212367ce425fdce277bbf1a0df2dd31e990567e92abb7a7b0f035274d81acc91a0f2cc56e0

data/lib/mode/connector/data_sources/base.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'sequel/adapters/jdbc' if RUBY_PLATFORM == 'java'
 
 module Mode
   module Connector
@@ -82,7 +83,7 @@ module Mode
         def oracle?
           ['oracle', 'jdbc:oracle:thin', 'jdbc:oracle:oci8'].include?(adapter)
         end
-        
+
         def sqlserver?
           ['tiny_tds', 'jdbc:sqlserver', 'jdbc:jtds:sqlserver'].include?(adapter)
         end
@@ -188,4 +189,4 @@ module Mode
       end
     end
   end
-end
+end

data/lib/mode/connector/databases/rdbms.rb

@@ -15,7 +15,11 @@ module Mode
         #
         def columns
           columns = []
-          data_source.select(columns_query) do |column|
+
+          # TEMP: the hottest of fixes
+          query = data_source.mysql? ? mysql_columns_query : columns_query
+
+          data_source.select(query) do |column|
             columns << column
           end
           columns
@@ -63,7 +67,44 @@ module Mode
            ORDER BY c.table_name, c.table_schema, c.column_name
           }
         end
+
+        def mysql_columns_query
+          %{
+            SELECT c.table_name,
+                   c.table_schema,
+                   c.column_name,
+                   c.data_type,
+                   CASE WHEN c.is_nullable = 'NO'
+                        THEN FALSE
+                        ELSE TRUE
+                         END AS is_nullable,
+                   CASE WHEN kc.name IS NULL
+                        THEN FALSE
+                        ELSE TRUE
+                         END AS primary_key
+              FROM information_schema.columns c
+              LEFT JOIN (
+                     SELECT kc.column_name AS name,
+                            kc.table_catalog,
+                            kc.table_schema,
+                            kc.table_name
+                       FROM information_schema.table_constraints c
+                       LEFT JOIN information_schema.key_column_usage kc
+                         ON c.table_schema       = kc.table_schema
+                        AND c.table_name         = kc.table_name
+                        AND c.constraint_name    = kc.constraint_name
+                        AND c.constraint_catalog = kc.table_catalog
+                      WHERE c.constraint_type = 'PRIMARY KEY'
+                   ) kc
+                ON c.column_name   = kc.name
+               AND c.table_catalog = kc.table_catalog
+               AND c.table_schema  = kc.table_schema
+               AND c.table_name    = kc.table_name
+             WHERE c.table_catalog = '#{database_name}'
+             ORDER BY c.table_name, c.table_schema, c.column_name
+          }
+        end
       end
     end
   end
-end
+end

data/lib/mode/connector/registrar.rb

@@ -83,10 +83,10 @@ module Mode
         end
 
         # Gotta catch 'em all!
-        tables << current_table.dup
+        tables << current_table.dup unless current_table.nil?
 
         tables
       end
     end
   end
-end
+end

data/lib/mode/version.rb

@@ -1,3 +1,3 @@
 module Mode
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/mode.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # CLI
-  spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "terminal-table"
+  spec.add_runtime_dependency "thor", '~> 0.19.1'
 
   # Web UI
   spec.add_runtime_dependency "sinatra"
@@ -34,13 +34,16 @@ Gem::Specification.new do |spec|
   # Connectivity
   spec.add_runtime_dependency "sequel"
 
+  if RUBY_PLATFORM == 'java'
+    spec.add_runtime_dependency 'jdbc-mysql'
+    spec.add_runtime_dependency 'jdbc-postgres'
+    spec.add_runtime_dependency 'jdbc-jtds'
+  end
+
   # Concurrency & Processes
   spec.add_runtime_dependency "spoon"
   spec.add_runtime_dependency "rufus-scheduler"
 
-  # Web Management
-  # spec.add_runtime_dependency "launchy"
-
   # Development Dependencies
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Mode Analytics
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: terminal-table
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,17 +25,17 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -122,6 +122,48 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jdbc-mysql
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jdbc-postgres
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jdbc-jtds
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: spoon
   version_requirements: !ruby/object:Gem::Requirement